From 66fa305e8e8d01cd328c87c79c29d1a8e1988aed Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Mon, 13 Jan 2020 19:36:54 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 reference/html/README.html                  | 4 +++-
 reference/html/index.html                   | 4 +++-
 reference/html/kubernetes-awareness.html    | 4 +++-
 reference/html/spring-cloud-kubernetes.html | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/reference/html/README.html b/reference/html/README.html
index 1683347c..6d7fa2d4 100644
--- a/reference/html/README.html
+++ b/reference/html/README.html
@@ -1390,7 +1390,9 @@ as the code of the project relies on the
 communicate by using <code>http</code> protocol to the REST API of the Kubernetes Server.</p>
 </div>
 <div class="paragraph">
-<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>.</p>
+<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>. Please be aware that when <code>spring-cloud-kubernetes-config</code> is on the classpath,
+<code>spring.cloud.kubernetes.enabled</code> should be set in <code>bootstrap.{properties|yml}</code> (or the profile specific one)  otherwise it should be in <code>application.{properties|yml}</code> (or the profile specific one).
+Also note that these properties: <code>spring.cloud.kubernetes.config.enabled</code> and <code>spring.cloud.kubernetes.secrets.enabled</code> only take effect when set in <code>bootstrap.{properties|yml}</code></p>
 </div>
 <div class="sect2">
 <h3 id="kubernetes-profile-autoconfiguration"><a class="anchor" href="#kubernetes-profile-autoconfiguration"></a><a class="link" href="#kubernetes-profile-autoconfiguration">7.1. Kubernetes Profile Autoconfiguration</a></h3>
diff --git a/reference/html/index.html b/reference/html/index.html
index 1683347c..6d7fa2d4 100644
--- a/reference/html/index.html
+++ b/reference/html/index.html
@@ -1390,7 +1390,9 @@ as the code of the project relies on the
 communicate by using <code>http</code> protocol to the REST API of the Kubernetes Server.</p>
 </div>
 <div class="paragraph">
-<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>.</p>
+<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>. Please be aware that when <code>spring-cloud-kubernetes-config</code> is on the classpath,
+<code>spring.cloud.kubernetes.enabled</code> should be set in <code>bootstrap.{properties|yml}</code> (or the profile specific one)  otherwise it should be in <code>application.{properties|yml}</code> (or the profile specific one).
+Also note that these properties: <code>spring.cloud.kubernetes.config.enabled</code> and <code>spring.cloud.kubernetes.secrets.enabled</code> only take effect when set in <code>bootstrap.{properties|yml}</code></p>
 </div>
 <div class="sect2">
 <h3 id="kubernetes-profile-autoconfiguration"><a class="anchor" href="#kubernetes-profile-autoconfiguration"></a><a class="link" href="#kubernetes-profile-autoconfiguration">7.1. Kubernetes Profile Autoconfiguration</a></h3>
diff --git a/reference/html/kubernetes-awareness.html b/reference/html/kubernetes-awareness.html
index 688445e4..5153cedb 100644
--- a/reference/html/kubernetes-awareness.html
+++ b/reference/html/kubernetes-awareness.html
@@ -118,7 +118,9 @@ as the code of the project relies on the
 communicate by using <code>http</code> protocol to the REST API of the Kubernetes Server.</p>
 </div>
 <div class="paragraph">
-<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>.</p>
+<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>. Please be aware that when <code>spring-cloud-kubernetes-config</code> is on the classpath,
+<code>spring.cloud.kubernetes.enabled</code> should be set in <code>bootstrap.{properties|yml}</code> (or the profile specific one)  otherwise it should be in <code>application.{properties|yml}</code> (or the profile specific one).
+Also note that these properties: <code>spring.cloud.kubernetes.config.enabled</code> and <code>spring.cloud.kubernetes.secrets.enabled</code> only take effect when set in <code>bootstrap.{properties|yml}</code></p>
 </div>
 <div class="sect2">
 <h3 id="_kubernetes_profile_autoconfiguration"><a class="link" href="#_kubernetes_profile_autoconfiguration">Kubernetes Profile Autoconfiguration</a></h3>
diff --git a/reference/html/spring-cloud-kubernetes.html b/reference/html/spring-cloud-kubernetes.html
index 1683347c..6d7fa2d4 100644
--- a/reference/html/spring-cloud-kubernetes.html
+++ b/reference/html/spring-cloud-kubernetes.html
@@ -1390,7 +1390,9 @@ as the code of the project relies on the
 communicate by using <code>http</code> protocol to the REST API of the Kubernetes Server.</p>
 </div>
 <div class="paragraph">
-<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>.</p>
+<p>To disable the integration with Kubernetes you can set <code>spring.cloud.kubernetes.enabled</code> to <code>false</code>. Please be aware that when <code>spring-cloud-kubernetes-config</code> is on the classpath,
+<code>spring.cloud.kubernetes.enabled</code> should be set in <code>bootstrap.{properties|yml}</code> (or the profile specific one)  otherwise it should be in <code>application.{properties|yml}</code> (or the profile specific one).
+Also note that these properties: <code>spring.cloud.kubernetes.config.enabled</code> and <code>spring.cloud.kubernetes.secrets.enabled</code> only take effect when set in <code>bootstrap.{properties|yml}</code></p>
 </div>
 <div class="sect2">
 <h3 id="kubernetes-profile-autoconfiguration"><a class="anchor" href="#kubernetes-profile-autoconfiguration"></a><a class="link" href="#kubernetes-profile-autoconfiguration">7.1. Kubernetes Profile Autoconfiguration</a></h3>