diff --git a/1.3.x/multi/multi__spring_cloud_context_application_context_services.html b/1.3.x/multi/multi__spring_cloud_context_application_context_services.html index 9cf251d1..c6f26670 100644 --- a/1.3.x/multi/multi__spring_cloud_context_application_context_services.html +++ b/1.3.x/multi/multi__spring_cloud_context_application_context_services.html @@ -10,7 +10,8 @@ the box it is responsible for loading configuration properties from the external sources, and also decrypting properties in the local external configuration files. The two contexts share an Environment which is the source of external properties for any Spring -application. Bootstrap properties are added with high precedence, so +application. Bootstrap properties (not bootstrap.properties but properties + that are loaded during the bootstrap phase) are added with high precedence, so they cannot be overridden by local configuration, by default.

The bootstrap context uses a different convention for locating external configuration than the main application context, so instead of application.yml (or .properties) you use bootstrap.yml, diff --git a/1.3.x/single/spring-cloud-commons.html b/1.3.x/single/spring-cloud-commons.html index 91d48d34..9bbc8af3 100644 --- a/1.3.x/single/spring-cloud-commons.html +++ b/1.3.x/single/spring-cloud-commons.html @@ -10,7 +10,8 @@ the box it is responsible for loading configuration properties from the external sources, and also decrypting properties in the local external configuration files. The two contexts share an Environment which is the source of external properties for any Spring -application. Bootstrap properties are added with high precedence, so +application. Bootstrap properties (not bootstrap.properties but properties + that are loaded during the bootstrap phase) are added with high precedence, so they cannot be overridden by local configuration, by default.

The bootstrap context uses a different convention for locating external configuration than the main application context, so instead of application.yml (or .properties) you use bootstrap.yml, diff --git a/1.3.x/spring-cloud-commons.xml b/1.3.x/spring-cloud-commons.xml index 22808907..57e088d5 100644 --- a/1.3.x/spring-cloud-commons.xml +++ b/1.3.x/spring-cloud-commons.xml @@ -42,7 +42,8 @@ the box it is responsible for loading configuration properties from the external sources, and also decrypting properties in the local external configuration files. The two contexts share an Environment which is the source of external properties for any Spring -application. Bootstrap properties are added with high precedence, so +application. Bootstrap properties (not bootstrap.properties but properties + that are loaded during the bootstrap phase) are added with high precedence, so they cannot be overridden by local configuration, by default. The bootstrap context uses a different convention for locating external configuration than the main application context, so instead