Merge branch '1.5.x'

8 years ago · b6e09e8311
1 changed files with 1 additions and 2 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
@ -1635,8 +1635,7 @@ Spring Boot's logging configuration entirely by using a value of `none`.
				@@ -1635,8 +1635,7 @@ Spring Boot's logging configuration entirely by using a value of `none`.

 NOTE: Since logging is initialized *before* the `ApplicationContext` is created, it is
 not possible to control logging from `@PropertySources` in Spring `@Configuration` files.
-System properties and the conventional Spring Boot external configuration files work
-fine.)
+The only way to change the logging system or disable it entirely is via System properties.

 Depending on your logging system, the following files are loaded: