Merge branch '2.3.x' into 2.4.x

Closes gh-25603

Author: wilkinsona

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorProperties.java

@@ -117,7 +117,7 @@ public enum IncludeStacktrace {
 		ALWAYS,
 
 		/**
-		 * Add error attribute when the appropriate request parameter is "true".
+		 * Add stacktrace attribute when the appropriate request parameter is not "false".
 		 */
 		ON_PARAM,
 
@@ -145,7 +145,7 @@ public enum IncludeAttribute {
 		ALWAYS,
 
 		/**
-		 * Add error attribute when the appropriate request parameter is "true".
+		 * Add error attribute when the appropriate request parameter is not "false".
 		 */
 		ON_PARAM