diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/appendix-application-properties.adoc
index bcedd945cf..723ff99ad5 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/appendix-application-properties.adoc
+++ b/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[]
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
index 989d488640..1ee1b536f8 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
@@ -2827,6 +2827,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`.