Merge branch '1.3.x'

docs/src/main/asciidoc/spring-cloud-sleuth.adoc

@@ -864,6 +864,19 @@ If you want to find Zipkin through service discovery, you can pass the Zipkin's
 spring.zipkin.baseUrl: http://zipkinserver/
 ----
 
+To disable this feature just set `spring.zipkin.discoveryClientEnabled` to `false.
+
+When the Discovery Client feature is enabled, Sleuth uses
+`LoadBalancerClient` to find the URL of the Zipkin Server. It means
+that you can set up the load balancing configuration e.g. via Ribbon.
+
+[source,yaml]
+----
+zipkinserver:
+  ribbon:
+    ListOfServers: host1,host2
+----
+
 If you have web, rabbit, or kafka together on the classpath, you might need to pick the means by which you would like to send spans to zipkin.
 To do so, set `web`, `rabbit`, or `kafka` to the `spring.zipkin.sender.type` property.
 The following example shows setting the sender type for `web`: