Merge branch '5.3.x'

src/docs/asciidoc/web/webflux-functional.adoc

@@ -145,7 +145,7 @@ val string = request.awaitBody<String>()
 
 
 The following example extracts the body to a `Flux<Person>` (or a `Flow<Person>` in Kotlin),
-where `Person` objects are decoded from someserialized form, such as JSON or XML:
+where `Person` objects are decoded from some serialized form, such as JSON or XML:
 
 [source,java,role="primary"]
 .Java

src/docs/asciidoc/web/webflux-websocket.adoc

@@ -353,7 +353,7 @@ into the attributes of the `WebSocketSession`.
 
 
 [[webflux-websocket-server-config]]
-=== Server Configation
+=== Server Configuration
 [.small]#<<web.adoc#websocket-server-runtime-configuration, Same as in the Servlet stack>>#
 
 The `RequestUpgradeStrategy` for each server exposes configuration specific to the

src/docs/asciidoc/web/webflux.adoc

@@ -650,7 +650,7 @@ a proxy at the boundary of trust should be configured to remove untrusted forwar
 from the outside. You can also configure the `ForwardedHeaderTransformer` with
 `removeOnly=true`, in which case it removes but does not use the headers.
 
-NOTE: In 5.1 `ForwardedHeaderFilter` was deprecated and superceded by
+NOTE: In 5.1 `ForwardedHeaderFilter` was deprecated and superseded by
 `ForwardedHeaderTransformer` so forwarded headers can be processed earlier, before the
 exchange is created. If the filter is configured anyway, it is taken out of the list of
 filters, and `ForwardedHeaderTransformer` is used instead.
@@ -2279,7 +2279,7 @@ The following example gets the value of the `Accept-Encoding` and `Keep-Alive` h
 		//...
 	}
 ----
-<1> Get the value of the `Accept-Encoging` header.
+<1> Get the value of the `Accept-Encoding` header.
 <2> Get the value of the `Keep-Alive` header.
 
 [source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"]
@@ -2292,7 +2292,7 @@ The following example gets the value of the `Accept-Encoding` and `Keep-Alive` h
 		//...
 	}
 ----
-<1> Get the value of the `Accept-Encoging` header.
+<1> Get the value of the `Accept-Encoding` header.
 <2> Get the value of the `Keep-Alive` header.
 
 Type conversion is applied automatically if the target method parameter type is not

src/docs/asciidoc/web/webmvc.adoc

@@ -533,7 +533,7 @@ resolve exceptions thrown during request processing. Those exception resolvers a
 customizing the logic to address exceptions. See <<mvc-exceptionhandlers>> for more details.
 
 For HTTP caching support, handlers can use the `checkNotModified` methods of `WebRequest`,
-along with further options for annoated controllers as described in
+along with further options for annotated controllers as described in
 <<mvc-caching-etag-lastmodified,HTTP Caching for Controllers>>.
 
 You can customize individual `DispatcherServlet` instances by adding Servlet
@@ -693,7 +693,7 @@ The following table lists the available `HandlerExceptionResolver` implementatio
 |===
 
 
-[[mvc-excetionhandlers-handling]]
+[[mvc-exceptionhandlers-handling]]
 ==== Chain of Resolvers
 
 You can form an exception resolver chain by declaring multiple `HandlerExceptionResolver`

src/docs/asciidoc/web/websocket.adoc

@@ -1987,7 +1987,7 @@ Note that this incurs a small performance overhead, so you should enable it only
 
 
 
-[[websocket-stomp-appplication-context-events]]
+[[websocket-stomp-application-context-events]]
 === Events
 
 Several `ApplicationContext` events are published and can be
@@ -2030,7 +2030,7 @@ implement their own reconnecting logic.
 [[websocket-stomp-interceptors]]
 === Interception
 
-<<websocket-stomp-appplication-context-events>> provide notifications for the lifecycle
+<<websocket-stomp-application-context-events>> provide notifications for the lifecycle
 of a STOMP connection but not for every client message. Applications can also register a
 `ChannelInterceptor` to intercept any message and in any part of the processing chain.
 The following example shows how to intercept inbound messages from clients:
@@ -2424,7 +2424,7 @@ through any other application instances.
 === Monitoring
 
 When you use `@EnableWebSocketMessageBroker` or `<websocket:message-broker>`, key
-infrastructure components automatically gather statisticss and counters that provide
+infrastructure components automatically gather statistics and counters that provide
 important insight into the internal state of the application. The configuration
 also declares a bean of type `WebSocketMessageBrokerStats` that gathers all
 available information in one place and by default logs it at the `INFO` level once