Merge branch '2.1.x' into 2.2.x

Closes gh-19091
spring-projects · Nov 21, 2019 · 58bfbb9 · 58bfbb9
2 parents 0b4dcf9 + c81cbb2
commit 58bfbb9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/...re/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java b/...re/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
@@ -220,8 +220,7 @@ public static class Async {
 
 		/**
 		 * Amount of time before asynchronous request handling times out. If this value is
-		 * not set, the default timeout of the underlying implementation is used, e.g. 10
-		 * seconds on Tomcat with Servlet 3.
+		 * not set, the default timeout of the underlying implementation is used.
 		 */
 		private Duration requestTimeout;