Sync docs from master to gh-pages

multi/multi__sending_spans_to_zipkin.html

@@ -8,8 +8,7 @@ that you can set up the load balancing configuration e.g. via Ribbon.</p><pre cl
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  ribbon</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    ListOfServers</span>: host1,host2</pre><p>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 <code class="literal">web</code>, <code class="literal">rabbit</code>, or <code class="literal">kafka</code> to the <code class="literal">spring.zipkin.sender.type</code> property.
-The following example shows setting the sender type for <code class="literal">web</code>:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring.zipkin.sender.type</span>: web</pre><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Important"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="images/important.png"></td><th align="left">Important</th></tr><tr><td align="left" valign="top"><p>If you have Kafka on the classpath, you need to set
-<code class="literal">spring.zipkin.kafka.enabled</code> to <code class="literal">true</code> apart from setting the sender type.</p></td></tr></table></div><p>To customize the <code class="literal">RestTemplate</code> that sends spans to Zipkin via HTTP, you can register
+The following example shows setting the sender type for <code class="literal">web</code>:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring.zipkin.sender.type</span>: web</pre><p>To customize the <code class="literal">RestTemplate</code> that sends spans to Zipkin via HTTP, you can register
 the <code class="literal">ZipkinRestTemplateCustomizer</code> bean.</p><pre class="programlisting"><em><span class="hl-annotation" style="color: gray">@Configuration</span></em>
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">class</span> MyConfig {
 	<em><span class="hl-annotation" style="color: gray">@Bean</span></em> ZipkinRestTemplateCustomizer myCustomizer() {

single/spring-cloud-sleuth.html

@@ -671,8 +671,7 @@ that you can set up the load balancing configuration e.g. via Ribbon.</p><pre cl
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">  ribbon</span>:
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">    ListOfServers</span>: host1,host2</pre><p>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 <code class="literal">web</code>, <code class="literal">rabbit</code>, or <code class="literal">kafka</code> to the <code class="literal">spring.zipkin.sender.type</code> property.
-The following example shows setting the sender type for <code class="literal">web</code>:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring.zipkin.sender.type</span>: web</pre><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Important"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="images/important.png"></td><th align="left">Important</th></tr><tr><td align="left" valign="top"><p>If you have Kafka on the classpath, you need to set
-<code class="literal">spring.zipkin.kafka.enabled</code> to <code class="literal">true</code> apart from setting the sender type.</p></td></tr></table></div><p>To customize the <code class="literal">RestTemplate</code> that sends spans to Zipkin via HTTP, you can register
+The following example shows setting the sender type for <code class="literal">web</code>:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-attribute">spring.zipkin.sender.type</span>: web</pre><p>To customize the <code class="literal">RestTemplate</code> that sends spans to Zipkin via HTTP, you can register
 the <code class="literal">ZipkinRestTemplateCustomizer</code> bean.</p><pre class="programlisting"><em><span class="hl-annotation" style="color: gray">@Configuration</span></em>
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">class</span> MyConfig {
 	<em><span class="hl-annotation" style="color: gray">@Bean</span></em> ZipkinRestTemplateCustomizer myCustomizer() {

spring-cloud-sleuth.xml

@@ -1503,10 +1503,6 @@ that you can set up the load balancing configuration e.g. via Ribbon.</simpara>
 To do so, set <literal>web</literal>, <literal>rabbit</literal>, or <literal>kafka</literal> to the <literal>spring.zipkin.sender.type</literal> property.
 The following example shows setting the sender type for <literal>web</literal>:</simpara>
 <programlisting language="yaml" linenumbering="unnumbered">spring.zipkin.sender.type: web</programlisting>
-<important>
-<simpara>If you have Kafka on the classpath, you need to set
-<literal>spring.zipkin.kafka.enabled</literal> to <literal>true</literal> apart from setting the sender type.</simpara>
-</important>
 <simpara>To customize the <literal>RestTemplate</literal> that sends spans to Zipkin via HTTP, you can register
 the <literal>ZipkinRestTemplateCustomizer</literal> bean.</simpara>
 <programlisting language="java" linenumbering="unnumbered">@Configuration