Merge branch '5.3.x'

# Conflicts:
#	spring-web/src/main/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategy.java

Author: sbrannen

spring-web/src/main/java/org/springframework/http/ContentDisposition.java

@@ -576,7 +576,7 @@ private static String escapeQuotationsInFilename(String filename) {
 			}
 			escaped = (!escaped && c == '\\');
 		}
-		// Remove backslash at the end..
+		// Remove backslash at the end.
 		if (escaped) {
 			sb.deleteCharAt(sb.length() - 1);
 		}

spring-web/src/main/java/org/springframework/http/HttpCookie.java

@@ -21,7 +21,7 @@
 
 /**
  * Represents an HTTP cookie as a name-value pair consistent with the content of
- * the "Cookie" request header. The {@link ResponseCookie} sub-class has the
+ * the "Cookie" request header. The {@link ResponseCookie} subclass has the
  * additional attributes expected in the "Set-Cookie" response header.
  *
  * @author Rossen Stoyanchev

spring-web/src/main/java/org/springframework/http/HttpHeaders.java

@@ -1605,7 +1605,7 @@ protected List<String> getETagValuesAsList(String headerName) {
 	}
 
 	/**
-	 * Retrieve a combined result from the field values of multi-valued headers.
+	 * Retrieve a combined result from the field values of multivalued headers.
 	 * @param headerName the header name
 	 * @return the combined result
 	 * @since 4.3

spring-web/src/main/java/org/springframework/http/ReactiveHttpInputMessage.java

@@ -22,7 +22,7 @@
 import org.springframework.core.io.buffer.DataBuffer;
 
 /**
- * An "reactive" HTTP input message that exposes the input as {@link Publisher}.
+ * A "reactive" HTTP input message that exposes the input as {@link Publisher}.
  *
  * <p>Typically implemented by an HTTP request on the server-side or a response
  * on the client-side.

spring-web/src/main/java/org/springframework/http/ResponseCookie.java

@@ -193,7 +193,7 @@ public static ResponseCookieBuilder from(final String name, final String value)
 	/**
 	 * Factory method to obtain a builder for a server-defined cookie. Unlike
 	 * {@link #from(String, String)} this option assumes input from a remote
-	 * server, which can be handled more leniently, e.g. ignoring a empty domain
+	 * server, which can be handled more leniently, e.g. ignoring an empty domain
 	 * name with double quotes.
 	 * @param name the cookie name
 	 * @param value the cookie value

spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpRequestDecorator.java

@@ -32,7 +32,7 @@
 
 /**
  * Wraps another {@link ClientHttpRequest} and delegates all methods to it.
- * Sub-classes can override specific methods selectively.
+ * Subclasses can override specific methods selectively.
  *
  * @author Rossen Stoyanchev
  * @since 5.0

spring-web/src/main/java/org/springframework/http/client/reactive/ClientHttpResponseDecorator.java

@@ -27,7 +27,7 @@
 
 /**
  * Wraps another {@link ClientHttpResponse} and delegates all methods to it.
- * Sub-classes can override specific methods selectively.
+ * Subclasses can override specific methods selectively.
  *
  * @author Rossen Stoyanchev
  * @since 5.0

spring-web/src/main/java/org/springframework/http/codec/CodecConfigurer.java

@@ -44,7 +44,7 @@
  * <li>Catch-all readers or writers, e.g. String with any media type.
  * </ol>
  *
- * <p>Typed and object readers are further sub-divided and ordered as follows:
+ * <p>Typed and object readers are further subdivided and ordered as follows:
  * <ol>
  * <li>Default HTTP reader and writer registrations.
  * <li>Custom readers and writers.

spring-web/src/main/java/org/springframework/http/codec/HttpMessageWriter.java

@@ -76,7 +76,7 @@ default List<MediaType> getWritableMediaTypes(ResolvableType elementType) {
 	boolean canWrite(ResolvableType elementType, @Nullable MediaType mediaType);
 
 	/**
-	 * Write an given stream of object to the output message.
+	 * Write a given stream of object to the output message.
 	 * @param inputStream the objects to write
 	 * @param elementType the type of objects in the stream which must have been
 	 * previously checked via {@link #canWrite(ResolvableType, MediaType)}

spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java

@@ -115,7 +115,7 @@ public void setMaxInMemorySize(int maxInMemorySize) {
 	 * Configure the maximum amount of disk space allowed for file parts.
 	 * <p>By default this is set to -1, meaning that there is no maximum.
 	 * <p>Note that this property is ignored when
-	 * {@linkplain #setStreaming(boolean) streaming} is enabled, , or when
+	 * {@linkplain #setStreaming(boolean) streaming} is enabled, or when
 	 * {@link #setMaxInMemorySize(int) maxInMemorySize} is set to -1.
 	 */
 	public void setMaxDiskUsagePerPart(long maxDiskUsagePerPart) {