Merge branch '5.3.x'

# Conflicts:
#	spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java

Author: sbrannen

spring-webmvc/src/main/java/org/springframework/web/servlet/FrameworkServlet.java

@@ -638,7 +638,7 @@ protected WebApplicationContext findWebApplicationContext() {
 	 * {@link org.springframework.web.context.ConfigurableWebApplicationContext}
 	 * interface. Can be overridden in subclasses.
 	 * <p>Do not forget to register this servlet instance as application listener on the
-	 * created context (for triggering its {@link #onRefresh callback}, and to call
+	 * created context (for triggering its {@link #onRefresh callback}), and to call
 	 * {@link org.springframework.context.ConfigurableApplicationContext#refresh()}
 	 * before returning the context instance.
 	 * @param parent the parent ApplicationContext to use, or {@code null} if none

spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerAdapter.java

@@ -40,7 +40,7 @@
  * <p>Note: {@code HandlerAdapter} implementors may implement the {@link
  * org.springframework.core.Ordered} interface to be able to specify a sorting
  * order (and thus a priority) for getting applied by the {@code DispatcherServlet}.
- * Non-Ordered instances get treated as lowest priority.
+ * Non-Ordered instances get treated as the lowest priority.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller
@@ -50,15 +50,15 @@
 public interface HandlerAdapter {
 
 	/**
-	 * Given a handler instance, return whether or not this {@code HandlerAdapter}
+	 * Given a handler instance, return whether this {@code HandlerAdapter}
 	 * can support it. Typical HandlerAdapters will base the decision on the handler
 	 * type. HandlerAdapters will usually only support one handler type each.
 	 * <p>A typical implementation:
 	 * <p>{@code
 	 * return (handler instanceof MyHandler);
 	 * }
 	 * @param handler the handler object to check
-	 * @return whether or not this object can use the given handler
+	 * @return whether this object can use the given handler
 	 */
 	boolean supports(Object handler);
 

spring-webmvc/src/main/java/org/springframework/web/servlet/HandlerMapping.java

@@ -45,7 +45,7 @@
  *
  * <p>Note: Implementations can implement the {@link org.springframework.core.Ordered}
  * interface to be able to specify a sorting order and thus a priority for getting
- * applied by DispatcherServlet. Non-Ordered instances get treated as lowest priority.
+ * applied by DispatcherServlet. Non-Ordered instances get treated as the lowest priority.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller

spring-webmvc/src/main/java/org/springframework/web/servlet/ModelAndView.java

@@ -58,7 +58,7 @@ public class ModelAndView {
 	@Nullable
 	private HttpStatusCode status;
 
-	/** Indicates whether or not this instance has been cleared with a call to {@link #clear()}. */
+	/** Indicates whether this instance has been cleared with a call to {@link #clear()}. */
 	private boolean cleared = false;
 
 
@@ -216,7 +216,7 @@ public View getView() {
 	}
 
 	/**
-	 * Indicate whether or not this {@code ModelAndView} has a view, either
+	 * Indicate whether this {@code ModelAndView} has a view, either
 	 * as a view name or as a direct {@link View} instance.
 	 */
 	public boolean hasView() {

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DefaultServletHandlerConfigurer.java

@@ -90,7 +90,7 @@ public void enable(@Nullable String defaultServletName) {
 	 * Return a handler mapping instance ordered at {@link Ordered#LOWEST_PRECEDENCE}
 	 * containing the {@link DefaultServletHttpRequestHandler} instance mapped
 	 * to {@code "/**"}; or {@code null} if default servlet handling was not
-	 * been enabled.
+	 * enabled.
 	 * @since 4.3.12
 	 */
 	@Nullable

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java

@@ -1094,7 +1094,7 @@ protected ExceptionHandlerExceptionResolver createExceptionHandlerExceptionResol
 	/**
 	 * Register a {@link ViewResolverComposite} that contains a chain of view resolvers
 	 * to use for view resolution.
-	 * By default this resolver is ordered at 0 unless content negotiation view
+	 * By default, this resolver is ordered at 0 unless content negotiation view
 	 * resolution is used in which case the order is raised to
 	 * {@link org.springframework.core.Ordered#HIGHEST_PRECEDENCE
 	 * Ordered.HIGHEST_PRECEDENCE}.
@@ -1152,7 +1152,7 @@ protected final Map<String, CorsConfiguration> getCorsConfigurations() {
 	}
 
 	/**
-	 * Override this method to configure cross origin requests processing.
+	 * Override this method to configure cross-origin requests processing.
 	 * @since 4.2
 	 * @see CorsRegistry
 	 */

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java

@@ -105,7 +105,7 @@ default void addResourceHandlers(ResourceHandlerRegistry registry) {
 	}
 
 	/**
-	 * Configure "global" cross origin request processing. The configured CORS
+	 * Configure "global" cross-origin request processing. The configured CORS
 	 * mappings apply to annotated controllers, functional endpoints, and static
 	 * resources.
 	 * <p>Annotated controllers can further declare more fine-grained config via

spring-webmvc/src/main/java/org/springframework/web/servlet/function/RequestPredicates.java

@@ -335,14 +335,14 @@ public interface Visitor {
 		void method(Set<HttpMethod> methods);
 
 		/**
-		 * Receive notification of an path predicate.
+		 * Receive notification of a path predicate.
 		 * @param pattern the path pattern that makes up the predicate
 		 * @see RequestPredicates#path(String)
 		 */
 		void path(String pattern);
 
 		/**
-		 * Receive notification of an path extension predicate.
+		 * Receive notification of a path extension predicate.
 		 * @param extension the path extension that makes up the predicate
 		 * @see RequestPredicates#pathExtension(String)
 		 */

spring-webmvc/src/main/java/org/springframework/web/servlet/function/ServerRequest.java

@@ -267,7 +267,7 @@ default String pathVariable(String name) {
 	 * also with conditional POST/PUT/DELETE requests.
 	 * <p><strong>Note:</strong> you can use either
 	 * this {@code #checkNotModified(Instant)} method; or
-	 * {@link #checkNotModified(String)}. If you want enforce both
+	 * {@link #checkNotModified(String)}. If you want to enforce both
 	 * a strong entity tag and a Last-Modified value,
 	 * as recommended by the HTTP specification,
 	 * then you should use {@link #checkNotModified(Instant, String)}.
@@ -301,7 +301,7 @@ default Optional<ServerResponse> checkNotModified(Instant lastModified) {
 	 * also with conditional POST/PUT/DELETE requests.
 	 * <p><strong>Note:</strong> you can use either
 	 * this {@link #checkNotModified(Instant)} method; or
-	 * {@code #checkNotModified(String)}. If you want enforce both
+	 * {@code #checkNotModified(String)}. If you want to enforce both
 	 * a strong entity tag and a Last-Modified value,
 	 * as recommended by the HTTP specification,
 	 * then you should use {@link #checkNotModified(Instant, String)}.

spring-webmvc/src/main/java/org/springframework/web/servlet/function/support/RouterFunctionMapping.java

@@ -150,8 +150,8 @@ public void afterPropertiesSet() throws Exception {
 	}
 
 	/**
-	 * Detect a all {@linkplain RouterFunction router functions} in the
-	 * current application context.
+	 * Detect all {@linkplain RouterFunction router functions} in the current
+	 * application context.
 	 */
 	private void initRouterFunctions() {
 		List<RouterFunction<?>> routerFunctions = obtainApplicationContext()