Merge branch '2.2.x' into 2.3.x

Closes gh-24407

Author: philwebb

spring-boot-project/spring-boot-docs/src/docs/asciidoc/appendix-application-properties.adoc

@@ -14,66 +14,96 @@ Also, you can define your own properties.
 
 
 
-== Core properties
-
+[[common-application-properties-core]]
+== Core properties [[core-properties]]
 include::config-docs/core.adoc[]
 
-== Cache properties
 
+
+[[common-application-properties-cache]]
+== Cache properties [[cache-properties]]
 include::config-docs/cache.adoc[]
 
-== Mail properties
 
+
+[[common-application-properties-mail]]
+== Mail properties [[mail-properties]]
 include::config-docs/mail.adoc[]
 
-== JSON properties
 
+
+[[common-application-properties-json]]
+== JSON properties [[json-properties]]
 include::config-docs/json.adoc[]
 
-== Data properties
 
+
+[[common-application-properties-data]]
+== Data properties [[data-properties]]
 include::config-docs/data.adoc[]
 
-== Transaction properties
 
+
+[[common-application-properties-transaction]]
+== Transaction properties [[transaction-properties]]
 include::config-docs/transaction.adoc[]
 
-== Data migration properties
 
+
+[[common-application-properties-data-migration]]
+== Data migration properties [[data-migration-properties]]
 include::config-docs/data-migration.adoc[]
 
-== Integration properties
 
+
+[[common-application-properties-integration]]
+== Integration properties [[integration-properties]]
 include::config-docs/integration.adoc[]
 
-== Web properties
 
+
+[[common-application-properties-web]]
+== Web properties [[web-properties]]
 include::config-docs/web.adoc[]
 
-== Templating properties
 
+
+[[common-application-properties-templating]]
+== Templating properties [[templating-properties]]
 include::config-docs/templating.adoc[]
 
-== Server properties
 
+
+[[common-application-properties-server]]
+== Server properties [[server-properties]]
 include::config-docs/server.adoc[]
 
-== Security properties
 
+
+[[common-application-properties-security]]
+== Security properties [[security-properties]]
 include::config-docs/security.adoc[]
 
-== RSocket properties
 
+
+[[common-application-properties-rsocket]]
+== RSocket properties [[rsocket-properties]]
 include::config-docs/rsocket.adoc[]
 
-== Actuator properties
 
+
+[[common-application-properties-actuator]]
+== Actuator properties [[actuator-properties]]
 include::config-docs/actuator.adoc[]
 
-== Devtools properties
 
+
+[[common-application-properties-devtools]]
+== Devtools properties [[devtools-properties]]
 include::config-docs/devtools.adoc[]
 
-== Testing properties
 
+
+[[common-application-properties-testing]]
+== Testing properties [[testing-properties]]
 include::config-docs/testing.adoc[]

spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc

@@ -2481,6 +2481,10 @@ If you have this problem, you can reorder the classpath in the IDE to place the
 By default, Spring Boot provides an `/error` mapping that handles all errors in a sensible way, and it is registered as a "`global`" error page in the servlet container.
 For machine clients, it produces a JSON response with details of the error, the HTTP status, and the exception message.
 For browser clients, there is a "`whitelabel`" error view that renders the same data in HTML format (to customize it, add a `View` that resolves to `error`).
+
+There are a number of `server.error` properties that can be set if you want to customize the default error handling behavior.
+See the <<appendix-application-properties.adoc#common-application-properties-server, "`Server Properties`">> section of the Appendix.  
+
 To replace the default behavior completely, you can implement `ErrorController` and register a bean definition of that type or add a bean of type `ErrorAttributes` to use the existing mechanism but replace the contents.
 
 TIP: The `BasicErrorController` can be used as a base class for a custom `ErrorController`.