diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java index 0846796b84..41ac4f6eaa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java @@ -61,7 +61,7 @@ public abstract class AbstractViewResolverProperties { private Charset charset = DEFAULT_CHARSET; /** - * White list of view names that can be resolved. + * The view names that can be resolved. */ private String[] viewNames; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java index 92985cd6c7..2c5b618708 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/TomcatWebServerFactoryCustomizer.java @@ -183,8 +183,7 @@ public class TomcatWebServerFactoryCustomizer if (StringUtils.hasLength(remoteIpHeader)) { valve.setRemoteIpHeader(remoteIpHeader); } - // The internal proxies default to a white list of "safe" internal IP - // addresses + // The internal proxies default to a list of "safe" internal IP addresses valve.setInternalProxies(remoteIpProperties.getInternalProxies()); try { valve.setHostHeader(remoteIpProperties.getHostHeader()); 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 723b3f609e..10c638ac84 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 @@ -13,6 +13,7 @@ NOTE: Property contributions can come from additional jar files on your classpat Also, you can define your own properties. + == Core properties include::config-docs/core.adoc[]