diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java
index 062666ece7f..22c52661111 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java
@@ -24,13 +24,20 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * Configuration properties for OAuth2 Client.
  *
  * @author Dave Syer
+ * @author Stephane Nicoll
  * @since 1.3.0
  */
 @ConfigurationProperties("spring.oauth2.client")
 public class OAuth2ClientProperties {
 
+	/**
+	 * OAuth2 client id.
+	 */
 	private String clientId;
 
+	/**
+	 * OAuth2 client secret. A random secret is generated by default.
+	 */
 	private String clientSecret = UUID.randomUUID().toString();
 
 	private boolean defaultSecret = true;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java
index ad3762ee5bb..560efb8c7df 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java
@@ -36,7 +36,7 @@ public class OAuth2SsoProperties {
 	private String loginPath = DEFAULT_LOGIN_PATH;
 
 	/**
-	 * The filter order to apply if not providing an explicit WebSecurityConfigurerAdapter
+	 * Filter order to apply if not providing an explicit WebSecurityConfigurerAdapter
 	 * (in which case the order can be provided there instead).
 	 */
 	private Integer filterOrder;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
index e6749d15e8c..a9df6c8a09f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
@@ -598,6 +598,9 @@ public class ServerProperties implements EmbeddedServletContainerCustomizer, Ord
 		 */
 		private Integer workerThreads;
 
+		/**
+		 * Allocate buffers outside the Java heap.
+		 */
 		private Boolean directBuffers;
 
 		/**
diff --git a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index c2149738632..c2c3701448b 100644
--- a/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -109,6 +109,11 @@ content into your application; rather pick only the properties that you need.
 	server.undertow.access-log-enabled=false # if access logging is enabled
 	server.undertow.access-log-pattern=common # log pattern of the access log
 	server.undertow.access-log-dir=logs # access logs directory
+	server.undertow.buffer-size= # size of each buffer in bytes
+    server.undertow.buffers-per-region= # number of buffer per region
+    server.undertow.direct-buffers=false # allocate buffers outside the Java heap
+    server.undertow.io-threads= # number of I/O threads to create for the worker
+    server.undertow.worker-threads= # number of worker threads
 
 	# SPRING MVC ({sc-spring-boot-autoconfigure}/web/WebMvcProperties.{sc-ext}[WebMvcProperties])
 	spring.mvc.locale= # set fixed locale, e.g. en_UK
@@ -199,7 +204,8 @@ content into your application; rather pick only the properties that you need.
 	# GROOVY TEMPLATES ({sc-spring-boot-autoconfigure}/groovy/template/GroovyTemplateAutoConfiguration.{sc-ext}[GroovyTemplateAutoConfiguration])
 	spring.groovy.template.cache=true
 	spring.groovy.template.charset=UTF-8
-	spring.groovy.template.configuration.*= # See Groovy's TemplateConfiguration
+	spring.groovy.template.check-template-location=true # check that the templates location exists
+	spring.groovy.template.configuration.*= # See GroovyMarkupConfigurer
 	spring.groovy.template.content-type=text/html
 	spring.groovy.template.enabled=true # enable MVC view resolution
 	spring.groovy.template.prefix=classpath:/templates/
@@ -267,6 +273,14 @@ content into your application; rather pick only the properties that you need.
 	security.sessions=stateless # always / never / if_required / stateless
 	security.ignored= # Comma-separated list of paths to exclude from the default secured paths
 
+	# OAuth2 client ({sc-spring-boot-autoconfigure}/security/oauth2/OAuth2ClientProperties.{sc-ext}[OAuth2ClientProperties]
+	spring.oauth2.client.client-id= # OAuth2 client id
+    spring.oauth2.client.client-secret= # OAuth2 client secret. A random secret is generated by default
+
+    # OAuth2 SSO ({sc-spring-boot-autoconfigure}/security/oauth2/client/OAuth2SsoProperties.{sc-ext}[OAuth2SsoProperties]
+    spring.oauth2.sso.filter-order= # Filter order to apply if not providing an explicit WebSecurityConfigurerAdapter
+    spring.oauth2.sso.login-path= # Path to the login page, i.e. the one that triggers the redirect to the OAuth2 Authorization Server
+
 	# DATASOURCE ({sc-spring-boot-autoconfigure}/jdbc/DataSourceAutoConfiguration.{sc-ext}[DataSourceAutoConfiguration] & {sc-spring-boot-autoconfigure}/jdbc/DataSourceProperties.{sc-ext}[DataSourceProperties])
 	spring.datasource.name= # name of the data source
 	spring.datasource.initialize=true # populate using data.sql
@@ -401,7 +415,7 @@ content into your application; rather pick only the properties that you need.
 	spring.data.elasticsearch.repositories.enabled=true # if spring data repository support is enabled
 
 	# DATA REST ({spring-data-rest-javadoc}/core/config/RepositoryRestConfiguration.{dc-ext}[RepositoryRestConfiguration])
-	spring.data.rest.base-uri= # base URI against which the exporter should calculate its links
+	spring.data.rest.base-path= # base path against which the exporter should calculate its links
 
 	# FLYWAY ({sc-spring-boot-autoconfigure}/flyway/FlywayProperties.{sc-ext}[FlywayProperties])
 	flyway.*= # Any public property available on the auto-configured `Flyway` object
@@ -681,6 +695,7 @@ content into your application; rather pick only the properties that you need.
 	spring.metrics.export.send-latest=true # flag to switch off any available optimizations based on not exporting unchanged metric values
 	spring.metrics.export.includes= # list of patterns for metric names to include
 	spring.metrics.export.excludes= # list of patterns for metric names to exclude. Applied after the includes
+	spring.metrics.export.redis.aggregate-key-pattern= # pattern that tells the aggregator what to do with the keys from the source repository
 	spring.metrics.export.redis.prefix=spring.metrics # prefix for redis repository if active
 	spring.metrics.export.redis.key=keys.spring.metrics # key for redis repository export (if active)
 	spring.metrics.export.triggers.*= # specific trigger properties per MetricWriter bean name