Sync docs from master to gh-pages

reference/html/appendix.html

@@ -285,6 +285,11 @@ Also, you can define your own properties.
 <td class="tableblock halign-left valign-top"><p class="tableblock">Causes <code>RibbonLoadBalancerClient</code> to be used by default.</p></td>
 </tr>
 <tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">spring.cloud.loadbalancer.zone</p></td>
+<td class="tableblock halign-left valign-top"></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
+<tr>
 <td class="tableblock halign-left valign-top"><p class="tableblock">spring.cloud.refresh.enabled</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
 <td class="tableblock halign-left valign-top"><p class="tableblock">Enables autoconfiguration for the refresh scope and associated features.</p></td>

reference/html/index.html

@@ -1515,6 +1515,18 @@ You can also override <code>DiscoveryClient</code>-specific zone setup by settin
 </tr>
 </table>
 </div>
+<div class="admonitionblock warning">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-warning" title="Warning"></i>
+</td>
+<td class="content">
+For the time being, only Eureka Discovery Client is instrumented to set the LoadBalancer zone. For other discovery client, set the <code>spring.cloud.loadbalancer.zone</code> property. More instrumentations coming shortly.
+</td>
+</tr>
+</table>
+</div>
 <div class="admonitionblock note">
 <table>
 <tr>
@@ -1548,11 +1560,12 @@ We suggest passing a <code>DiscoveryClientServiceInstanceListSupplier</code> del
     @Bean
     public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
             ReactiveDiscoveryClient discoveryClient, Environment environment,
+            LoadBalancerProperties loadBalancerProperties,
             ApplicationContext context) {
         DiscoveryClientServiceInstanceListSupplier firstDelegate = new DiscoveryClientServiceInstanceListSupplier(
                 discoveryClient, environment);
         ZonePreferenceServiceInstanceListSupplier delegate = new ZonePreferenceServiceInstanceListSupplier(firstDelegate,
-                environment);
+                loadBalancerProperties);
         ObjectProvider&lt;LoadBalancerCacheManager&gt; cacheManagerProvider = context
                 .getBeanProvider(LoadBalancerCacheManager.class);
         if (cacheManagerProvider.getIfAvailable() != null) {
@@ -1561,8 +1574,7 @@ We suggest passing a <code>DiscoveryClientServiceInstanceListSupplier</code> del
         }
         return delegate;
     }
-
-}</code></pre>
+    }</code></pre>
 </div>
 </div>
 </div>
@@ -1624,11 +1636,10 @@ public class MyConfiguration {
 </div>
 </div>
 <div class="paragraph">
-<p>You can use this feature to instantiate different implementations of <code>ServiceInstanceListSupplier</code> or <code>ReactorLoadBalancer</code>,
-either written by you, or provided by us as alternatives (for example <code>ZonePreferenceServiceInstanceListSupplier</code>) to override the default setup.</p>
+<p>You can use this feature to instantiate different implementations of <code>ServiceInstanceListSupplier</code> or <code>ReactorLoadBalancer</code>, either written by you, or provided by us as alternatives (for example <code>ZonePreferenceServiceInstanceListSupplier</code>) to override the default setup.</p>
 </div>
 <div class="paragraph">
-<p>You can see an example of a custom cofiguration <a href="#zoned-based-custom-loadbalancer-configuration">here</a>.</p>
+<p>You can see an example of a custom configuration <a href="#zoned-based-custom-loadbalancer-configuration">here</a>.</p>
 </div>
 <div class="admonitionblock note">
 <table>

reference/html/spring-cloud-commons.html

@@ -1515,6 +1515,18 @@ You can also override <code>DiscoveryClient</code>-specific zone setup by settin
 </tr>
 </table>
 </div>
+<div class="admonitionblock warning">
+<table>
+<tr>
+<td class="icon">
+<i class="fa icon-warning" title="Warning"></i>
+</td>
+<td class="content">
+For the time being, only Eureka Discovery Client is instrumented to set the LoadBalancer zone. For other discovery client, set the <code>spring.cloud.loadbalancer.zone</code> property. More instrumentations coming shortly.
+</td>
+</tr>
+</table>
+</div>
 <div class="admonitionblock note">
 <table>
 <tr>
@@ -1548,11 +1560,12 @@ We suggest passing a <code>DiscoveryClientServiceInstanceListSupplier</code> del
     @Bean
     public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier(
             ReactiveDiscoveryClient discoveryClient, Environment environment,
+            LoadBalancerProperties loadBalancerProperties,
             ApplicationContext context) {
         DiscoveryClientServiceInstanceListSupplier firstDelegate = new DiscoveryClientServiceInstanceListSupplier(
                 discoveryClient, environment);
         ZonePreferenceServiceInstanceListSupplier delegate = new ZonePreferenceServiceInstanceListSupplier(firstDelegate,
-                environment);
+                loadBalancerProperties);
         ObjectProvider&lt;LoadBalancerCacheManager&gt; cacheManagerProvider = context
                 .getBeanProvider(LoadBalancerCacheManager.class);
         if (cacheManagerProvider.getIfAvailable() != null) {
@@ -1561,8 +1574,7 @@ We suggest passing a <code>DiscoveryClientServiceInstanceListSupplier</code> del
         }
         return delegate;
     }
-
-}</code></pre>
+    }</code></pre>
 </div>
 </div>
 </div>
@@ -1624,11 +1636,10 @@ public class MyConfiguration {
 </div>
 </div>
 <div class="paragraph">
-<p>You can use this feature to instantiate different implementations of <code>ServiceInstanceListSupplier</code> or <code>ReactorLoadBalancer</code>,
-either written by you, or provided by us as alternatives (for example <code>ZonePreferenceServiceInstanceListSupplier</code>) to override the default setup.</p>
+<p>You can use this feature to instantiate different implementations of <code>ServiceInstanceListSupplier</code> or <code>ReactorLoadBalancer</code>, either written by you, or provided by us as alternatives (for example <code>ZonePreferenceServiceInstanceListSupplier</code>) to override the default setup.</p>
 </div>
 <div class="paragraph">
-<p>You can see an example of a custom cofiguration <a href="#zoned-based-custom-loadbalancer-configuration">here</a>.</p>
+<p>You can see an example of a custom configuration <a href="#zoned-based-custom-loadbalancer-configuration">here</a>.</p>
 </div>
 <div class="admonitionblock note">
 <table>