From 0686b105c5e8ddecdffbbfb1c79d9eb2fcad1ec3 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Fri, 19 May 2017 22:13:56 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 spring-cloud-config.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-config.html b/spring-cloud-config.html
index ea0666e2..18e6d1fb 100644
--- a/spring-cloud-config.html
+++ b/spring-cloud-config.html
@@ -1304,8 +1304,9 @@ on the search path, so properties files are loaded from each search
 location <strong>and</strong> a subdirectory with the same name as the label (the
 labelled properties take precedence in the Spring Environment). Thus
 the default behaviour with no placeholders is the same as adding a
-search location ending with <code>/{label}/. For example `file:/tmp/config</code>
-is the same as <code>file:/tmp/config,file:/tmp/config/{label}</code></p>
+search location ending with <code>/{label}/</code>. For example <code>file:/tmp/config</code>
+is the same as <code>file:/tmp/config,file:/tmp/config/{label}</code>. This behavior can be
+disabled by setting <code>spring.cloud.config.server.native.addLabelLocations=false</code>.</p>
 </div>
 </div>
 <div class="sect3">