From f9c5cde6487702e58fcab3379f91c747d88de14e Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Tue, 24 Jul 2018 09:47:12 +0000
Subject: [PATCH] Sync docs from master to gh-pages

---
 multi/multi__span_lifecycle.html | 2 +-
 single/spring-cloud-sleuth.html  | 2 +-
 spring-cloud-sleuth.xml          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/multi/multi__span_lifecycle.html b/multi/multi__span_lifecycle.html
index 4f4b7153d..f68933a72 100644
--- a/multi/multi__span_lifecycle.html
+++ b/multi/multi__span_lifecycle.html
@@ -22,7 +22,7 @@ Your names have to be explicit and concrete. Big names lead to latency issues an
 situation might be as follows:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><span class="strong"><strong>AOP</strong></span>: If there was already a span created before an aspect was reached, you might not want to create a new span.</li><li class="listitem"><span class="strong"><strong>Hystrix</strong></span>: Executing a Hystrix command is most likely a logical part of the current processing.
 It is in fact merely a technical implementation detail that you would not necessarily want to reflect in tracing as a separate being.</li></ul></div><p>To continue a span, you can use <code class="literal">brave.Tracer</code>, as shown in the following example:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// let's assume that we're in a thread Y and we've received</span>
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// the `initialSpan` from thread X</span>
-Span continuedSpan = <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">this</span>.tracer.joinSpan(newSpan.context());
+Span continuedSpan = <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">this</span>.tracer.toSpan(newSpan.context());
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">try</span> {
 	<span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// ...</span>
 	<span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// You can tag a span</span>
diff --git a/single/spring-cloud-sleuth.html b/single/spring-cloud-sleuth.html
index ccd9440e6..056cff6c0 100644
--- a/single/spring-cloud-sleuth.html
+++ b/single/spring-cloud-sleuth.html
@@ -538,7 +538,7 @@ Your names have to be explicit and concrete. Big names lead to latency issues an
 situation might be as follows:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><span class="strong"><strong>AOP</strong></span>: If there was already a span created before an aspect was reached, you might not want to create a new span.</li><li class="listitem"><span class="strong"><strong>Hystrix</strong></span>: Executing a Hystrix command is most likely a logical part of the current processing.
 It is in fact merely a technical implementation detail that you would not necessarily want to reflect in tracing as a separate being.</li></ul></div><p>To continue a span, you can use <code class="literal">brave.Tracer</code>, as shown in the following example:</p><pre class="programlisting"><span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// let's assume that we're in a thread Y and we've received</span>
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// the `initialSpan` from thread X</span>
-Span continuedSpan = <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">this</span>.tracer.joinSpan(newSpan.context());
+Span continuedSpan = <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">this</span>.tracer.toSpan(newSpan.context());
 <span xmlns:d="http://docbook.org/ns/docbook" class="hl-keyword">try</span> {
 	<span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// ...</span>
 	<span xmlns:d="http://docbook.org/ns/docbook" class="hl-comment">// You can tag a span</span>
diff --git a/spring-cloud-sleuth.xml b/spring-cloud-sleuth.xml
index 28396e1b4..fe4d871d4 100644
--- a/spring-cloud-sleuth.xml
+++ b/spring-cloud-sleuth.xml
@@ -1210,7 +1210,7 @@ It is in fact merely a technical implementation detail that you would not necess
 <simpara>To continue a span, you can use <literal>brave.Tracer</literal>, as shown in the following example:</simpara>
 <programlisting language="java" linenumbering="unnumbered">// let's assume that we're in a thread Y and we've received
 // the `initialSpan` from thread X
-Span continuedSpan = this.tracer.joinSpan(newSpan.context());
+Span continuedSpan = this.tracer.toSpan(newSpan.context());
 try {
 	// ...
 	// You can tag a span