From a0d3d47409daf42cee490ee1eca3e55d11bf2d8b Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Tue, 5 Jun 2018 11:39:37 +0000
Subject: [PATCH] Sync docs from 1.3.x to gh-pages

---
 ...lti__spring_cloud_context_application_context_services.html | 3 ++-
 1.3.x/single/spring-cloud-commons.html                         | 3 ++-
 1.3.x/spring-cloud-commons.xml                                 | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

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 <code class="literal">Environment</code>
 which is the source of external properties for any Spring
-application. Bootstrap properties are added with high precedence, so
+application. Bootstrap properties (not <code class="literal">bootstrap.properties</code> but properties
+ that are loaded during the bootstrap phase) are added with high precedence, so
 they cannot be overridden by local configuration, by default.</p><p>The bootstrap context uses a different convention for locating
 external configuration than the main application context, so instead
 of <code class="literal">application.yml</code> (or <code class="literal">.properties</code>) you use <code class="literal">bootstrap.yml</code>,
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 <code class="literal">Environment</code>
 which is the source of external properties for any Spring
-application. Bootstrap properties are added with high precedence, so
+application. Bootstrap properties (not <code class="literal">bootstrap.properties</code> but properties
+ that are loaded during the bootstrap phase) are added with high precedence, so
 they cannot be overridden by local configuration, by default.</p><p>The bootstrap context uses a different convention for locating
 external configuration than the main application context, so instead
 of <code class="literal">application.yml</code> (or <code class="literal">.properties</code>) you use <code class="literal">bootstrap.yml</code>,
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 <literal>Environment</literal>
 which is the source of external properties for any Spring
-application. Bootstrap properties are added with high precedence, so
+application. Bootstrap properties (not <literal>bootstrap.properties</literal> but properties
+ that are loaded during the bootstrap phase) are added with high precedence, so
 they cannot be overridden by local configuration, by default.</simpara>
 <simpara>The bootstrap context uses a different convention for locating
 external configuration than the main application context, so instead