Merge branch '2.3.x'

Closes gh-24259

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/error/ErrorAttributeOptions.java

@@ -49,8 +49,7 @@ public boolean isIncluded(Include include) {
 
 	/**
 	 * Get all options for including attributes in the error response.
-	 * @return {@code true} if the {@code Include} attribute is included in the error
-	 * response, {@code false} otherwise
+	 * @return the options
 	 */
 	public Set<Include> getIncludes() {
 		return this.includes;