From f5aeed3b34dbac312669fce1044c068660bc067f Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Wed, 29 Jan 2020 01:21:39 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 reference/html/index.html                | 8 ++++++--
 reference/html/spring-cloud-commons.html | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/reference/html/index.html b/reference/html/index.html
index b03c4292..8347c27c 100644
--- a/reference/html/index.html
+++ b/reference/html/index.html
@@ -326,8 +326,12 @@ Thus, sibling contexts (in particular) do not need to have the same profiles or
 <div class="sect2">
 <h3 id="customizing-bootstrap-properties"><a class="anchor" href="#customizing-bootstrap-properties"></a><a class="link" href="#customizing-bootstrap-properties">1.3. Changing the Location of Bootstrap Properties</a></h3>
 <div class="paragraph">
-<p>You can specify the <code>bootstrap.yml</code> (or <code>.properties</code>) location by setting <code>spring.cloud.bootstrap.name</code> (default: <code>bootstrap</code>) or <code>spring.cloud.bootstrap.location</code> (default: empty)&#8201;&#8212;&#8201;for example, in system properties.
-Those properties behave like the <code>spring.config.*</code> variants with the same name.
+<p>The <code>bootstrap.yml</code> (or <code>.properties</code>) location can be specified by setting <code>spring.cloud.bootstrap.name</code> (default: <code>bootstrap</code>), <code>spring.cloud.bootstrap.location</code> (default: empty) or <code>spring.cloud.bootstrap.additional-location</code> (default: empty)&#8201;&#8212;&#8201;for example, in System properties.</p>
+</div>
+<div class="paragraph">
+<p>Those properties behave like the <code>spring.config.*</code> variants with the same name.
+With <code>spring.cloud.bootstrap.location</code> the default locations are replaced and only the specified ones are used.
+To add locations to the list of default ones, <code>spring.cloud.bootstrap.additional-location</code> could be used.
 In fact, they are used to set up the bootstrap <code>ApplicationContext</code> by setting those properties in its <code>Environment</code>.
 If there is an active profile (from <code>spring.profiles.active</code> or through the <code>Environment</code> API in the context you are building), properties in that profile get loaded as well, the same as in a regular Spring Boot app&#8201;&#8212;&#8201;for example, from <code>bootstrap-development.properties</code> for a <code>development</code> profile.</p>
 </div>
diff --git a/reference/html/spring-cloud-commons.html b/reference/html/spring-cloud-commons.html
index b03c4292..8347c27c 100644
--- a/reference/html/spring-cloud-commons.html
+++ b/reference/html/spring-cloud-commons.html
@@ -326,8 +326,12 @@ Thus, sibling contexts (in particular) do not need to have the same profiles or
 <div class="sect2">
 <h3 id="customizing-bootstrap-properties"><a class="anchor" href="#customizing-bootstrap-properties"></a><a class="link" href="#customizing-bootstrap-properties">1.3. Changing the Location of Bootstrap Properties</a></h3>
 <div class="paragraph">
-<p>You can specify the <code>bootstrap.yml</code> (or <code>.properties</code>) location by setting <code>spring.cloud.bootstrap.name</code> (default: <code>bootstrap</code>) or <code>spring.cloud.bootstrap.location</code> (default: empty)&#8201;&#8212;&#8201;for example, in system properties.
-Those properties behave like the <code>spring.config.*</code> variants with the same name.
+<p>The <code>bootstrap.yml</code> (or <code>.properties</code>) location can be specified by setting <code>spring.cloud.bootstrap.name</code> (default: <code>bootstrap</code>), <code>spring.cloud.bootstrap.location</code> (default: empty) or <code>spring.cloud.bootstrap.additional-location</code> (default: empty)&#8201;&#8212;&#8201;for example, in System properties.</p>
+</div>
+<div class="paragraph">
+<p>Those properties behave like the <code>spring.config.*</code> variants with the same name.
+With <code>spring.cloud.bootstrap.location</code> the default locations are replaced and only the specified ones are used.
+To add locations to the list of default ones, <code>spring.cloud.bootstrap.additional-location</code> could be used.
 In fact, they are used to set up the bootstrap <code>ApplicationContext</code> by setting those properties in its <code>Environment</code>.
 If there is an active profile (from <code>spring.profiles.active</code> or through the <code>Environment</code> API in the context you are building), properties in that profile get loaded as well, the same as in a regular Spring Boot app&#8201;&#8212;&#8201;for example, from <code>bootstrap-development.properties</code> for a <code>development</code> profile.</p>
 </div>