pulsar-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mme...@apache.org
Subject [incubator-pulsar] branch asf-site updated: Updated site at revision cb4e6f8
Date Thu, 02 Aug 2018 03:07:32 GMT
This is an automated email from the ASF dual-hosted git repository.

mmerli pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 4e2a890  Updated site at revision cb4e6f8
4e2a890 is described below

commit 4e2a89083908474c71df612a163ea29117c74a85
Author: jenkins <builds@apache.org>
AuthorDate: Thu Aug 2 03:07:25 2018 +0000

    Updated site at revision cb4e6f8
---
 .../docs/latest/adaptors/KafkaWrapper/index.html   |  15 +-
 .../docs/latest/adaptors/PulsarSpark/index.html    |  19 +-
 .../docs/latest/adaptors/PulsarStorm/index.html    |  17 +-
 content/docs/latest/admin-api/brokers/index.html   |   9 +-
 content/docs/latest/admin-api/clusters/index.html  |   9 +-
 .../docs/latest/admin-api/namespaces/index.html    |   9 +-
 .../admin-api/non-persistent-topics/index.html     |  33 +--
 content/docs/latest/admin-api/overview/index.html  |  27 ++-
 .../latest/admin-api/partitioned-topics/index.html |   9 +-
 .../docs/latest/admin-api/permissions/index.html   |   9 +-
 .../latest/admin-api/persistent-topics/index.html  | 117 ++++++-----
 content/docs/latest/admin-api/tenants/index.html   |   9 +-
 content/docs/latest/admin/Dashboard/index.html     |   9 +-
 .../docs/latest/admin/GeoReplication/index.html    |   9 +-
 .../docs/latest/admin/LoadDistribution/index.html  |   9 +-
 content/docs/latest/admin/Proxy/index.html         |   9 +-
 content/docs/latest/admin/Stats/index.html         |   9 +-
 .../latest/admin/ZooKeeperBookKeeper/index.html    |   9 +-
 content/docs/latest/clients/Cpp/index.html         |  19 +-
 content/docs/latest/clients/Java/index.html        |  29 ++-
 content/docs/latest/clients/Python/index.html      |  19 +-
 content/docs/latest/clients/WebSocket/index.html   |  17 +-
 content/docs/latest/clients/go/index.html          |  19 +-
 .../docs/latest/cookbooks/Encryption/index.html    |  23 +-
 .../latest/cookbooks/PartitionedTopics/index.html  |  29 ++-
 .../latest/cookbooks/RetentionExpiry/index.html    |  27 ++-
 .../docs/latest/cookbooks/compaction/index.html    |  21 +-
 .../cookbooks/message-deduplication/index.html     |  25 ++-
 .../docs/latest/cookbooks/message-queue/index.html |  31 ++-
 .../cookbooks/non-persistent-messaging/index.html  |   9 +-
 .../latest/cookbooks/tiered-storage/index.html     |  17 +-
 .../docs/latest/deployment/Kubernetes/index.html   |  13 +-
 .../docs/latest/deployment/Monitoring/index.html   |   9 +-
 .../docs/latest/deployment/aws-cluster/index.html  |  23 +-
 content/docs/latest/deployment/cluster/index.html  |  21 +-
 content/docs/latest/deployment/dcos/index.html     |   9 +-
 content/docs/latest/deployment/instance/index.html |  21 +-
 content/docs/latest/functions/api/index.html       |   9 +-
 .../docs/latest/functions/deployment/index.html    |   9 +-
 .../docs/latest/functions/guarantees/index.html    |   9 +-
 content/docs/latest/functions/metrics/index.html   |   9 +-
 content/docs/latest/functions/overview/index.html  |   9 +-
 .../docs/latest/functions/quickstart/index.html    |   9 +-
 .../docs/latest/getting-started/Clients/index.html |   9 +-
 .../ConceptsAndArchitecture/index.html             |  15 +-
 .../latest/getting-started/LocalCluster/index.html |  17 +-
 .../latest/getting-started/Pulsar-2.0/index.html   |  17 +-
 .../docs/latest/getting-started/docker/index.html  |  19 +-
 content/docs/latest/io/overview/index.html         |   9 +-
 content/docs/latest/io/quickstart/index.html       |   9 +-
 .../docs/latest/project/BinaryProtocol/index.html  |  13 +-
 content/docs/latest/project/Codebase/index.html    |   9 +-
 content/docs/latest/project/CompileCpp/index.html  |  19 +-
 .../latest/project/ModularLoadManager/index.html   |   9 +-
 .../docs/latest/project/SimulationTools/index.html |  11 +-
 .../docs/latest/project/schema-storage/index.html  |  17 +-
 content/docs/latest/reference/CliTools/index.html  |  31 ++-
 .../docs/latest/reference/Configuration/index.html |   9 +-
 content/docs/latest/reference/RestApi/index.html   |   9 +-
 content/docs/latest/security/athenz/index.html     |   9 +-
 .../docs/latest/security/authorization/index.html  | 126 ++++++-----
 content/docs/latest/security/encryption/index.html |  23 +-
 content/docs/latest/security/extending/index.html  |  13 +-
 content/docs/latest/security/openssl.cnf           | 152 ++++++++++++++
 content/docs/latest/security/overview/index.html   |   9 +-
 .../security/{tls => tls-transport}/index.html     | 231 ++++++++++++++-------
 content/docs/latest/security/tls/index.html        | 206 ++++++++----------
 content/ja/adaptors/PulsarSpark/index.html         |  14 +-
 content/ja/adaptors/PulsarStorm/index.html         |  10 +-
 content/ja/admin/AdminInterface/index.html         |  20 +-
 content/ja/admin/Authz/index.html                  |  26 ++-
 content/ja/admin/ClustersBrokers/index.html        |  18 +-
 content/ja/admin/PropertiesNamespaces/index.html   |  12 +-
 content/ja/advanced/PartitionedTopics/index.html   |  20 +-
 content/ja/advanced/RetentionExpiry/index.html     |  20 +-
 content/ja/clients/Cpp/index.html                  |  10 +-
 content/ja/clients/Java/index.html                 |  12 +-
 content/ja/clients/Python/index.html               |  12 +-
 content/ja/clients/WebSocket/index.html            |  14 +-
 content/ja/deployment/InstanceSetup/index.html     |  10 +-
 content/ja/deployment/Kubernetes/index.html        |   8 +-
 .../ConceptsAndArchitecture/index.html             |   4 +-
 content/ja/getting-started/LocalCluster/index.html |   8 +-
 content/ja/project/BinaryProtocol/index.html       |   8 +-
 content/ja/project/SimulationTools/index.html      |   4 +-
 content/ja/reference/CliTools/index.html           |  30 ++-
 content/staging/docs/en/client-libraries-cpp.html  |  44 +++-
 .../docs/en/client-libraries-cpp/index.html        |  44 +++-
 content/staging/docs/en/client-libraries-go.html   |  10 +-
 .../staging/docs/en/client-libraries-go/index.html |  10 +-
 .../staging/docs/en/client-libraries-python.html   |   2 +-
 .../docs/en/client-libraries-python/index.html     |   2 +-
 content/staging/docs/en/client-libraries.html      |   2 +-
 .../staging/docs/en/client-libraries/index.html    |   2 +-
 content/staging/swagger/swagger.json               |  38 ++--
 95 files changed, 1613 insertions(+), 563 deletions(-)

diff --git a/content/docs/latest/adaptors/KafkaWrapper/index.html b/content/docs/latest/adaptors/KafkaWrapper/index.html
index 76c70bd..8760f1b 100644
--- a/content/docs/latest/adaptors/KafkaWrapper/index.html
+++ b/content/docs/latest/adaptors/KafkaWrapper/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1195,6 +1202,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1439,6 +1448,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1683,6 +1694,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/adaptors/PulsarSpark/index.html b/content/docs/latest/adaptors/PulsarSpark/index.html
index 4dc895f..a30d928 100644
--- a/content/docs/latest/adaptors/PulsarSpark/index.html
+++ b/content/docs/latest/adaptors/PulsarSpark/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1072,6 +1079,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/adaptors/PulsarSpark/">Spark Streaming Pulsar receiver</a></li>
           
           
@@ -1316,6 +1325,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/adaptors/PulsarSpark/">Spark Streaming Pulsar receiver</a></li>
           
           
@@ -1526,6 +1537,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
@@ -1604,8 +1617,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1693,6 +1704,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/adaptors/PulsarStorm/index.html b/content/docs/latest/adaptors/PulsarStorm/index.html
index 272bc15..3059cf5 100644
--- a/content/docs/latest/adaptors/PulsarStorm/index.html
+++ b/content/docs/latest/adaptors/PulsarStorm/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1076,6 +1083,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/adaptors/PulsarStorm/">Pulsar adaptor for Apache Storm</a></li>
           
           
@@ -1282,6 +1291,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
@@ -1360,8 +1371,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1449,6 +1458,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/admin-api/brokers/index.html b/content/docs/latest/admin-api/brokers/index.html
index 9ab3a14..2ee96ae 100644
--- a/content/docs/latest/admin-api/brokers/index.html
+++ b/content/docs/latest/admin-api/brokers/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin-api/clusters/index.html b/content/docs/latest/admin-api/clusters/index.html
index e292e0f..20fdb74 100644
--- a/content/docs/latest/admin-api/clusters/index.html
+++ b/content/docs/latest/admin-api/clusters/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin-api/namespaces/index.html b/content/docs/latest/admin-api/namespaces/index.html
index 0fca752..39656a1 100644
--- a/content/docs/latest/admin-api/namespaces/index.html
+++ b/content/docs/latest/admin-api/namespaces/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin-api/non-persistent-topics/index.html b/content/docs/latest/admin-api/non-persistent-topics/index.html
index fe4b49a..ee283f1 100644
--- a/content/docs/latest/admin-api/non-persistent-topics/index.html
+++ b/content/docs/latest/admin-api/non-persistent-topics/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1147,12 +1154,12 @@ persisting messages.</p>
 
 <h4 id="rest-api">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/stats</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/stats</code></pre></div>
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">nonPersistentTopics</span><span class="o">().</span><span class="na">getStats</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"non-persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">nonPersistentTopics</span><span class="o">().</span><span class="na">getStats</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="get-internal-stats">Get internal stats</h3>
@@ -1185,12 +1192,12 @@ persisting messages.</p>
 
 <h4 id="rest-api-1">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/internalStats</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/internalStats</code></pre></div>
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">nonPersistentTopics</span><span class="o">().</span><span class="na">getInternalStats</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"non-persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">nonPersistentTopics</span><span class="o">().</span><span class="na">getInternalStats</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="create-partitioned-topic">Create partitioned topic</h3>
@@ -1206,7 +1213,7 @@ persisting messages.</p>
 
 <h4 id="rest-api-2">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method put">PUT</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/partitions</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method put">PUT</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/partitions</code></pre></div>
 
 <h4 id="java-2">Java</h4>
 
@@ -1245,7 +1252,7 @@ persisting messages.</p>
 
 <h4 id="rest-api-3">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/partitions</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/partitions</code></pre></div>
 
 <h4 id="java-3">Java</h4>
 
@@ -1267,14 +1274,14 @@ persisting messages.</p>
 
 <h4 id="rest-api-4">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method put">PUT</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/unload</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method put">PUT</code><code class="url">/admin/v2/non-persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/unload</code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/non-persistent/:tenant/:namespace/:destination/unload">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/non-persistent/:tenant/:namespace/:topic/unload">More info</a></p>
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-tenantmy-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">nonPersistentTopics</span><span class="o">().</span><span class="na">unload</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"non-persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">nonPersistentTopics</span><span class="o">().</span><span class="na">unload</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
       </section>
diff --git a/content/docs/latest/admin-api/overview/index.html b/content/docs/latest/admin-api/overview/index.html
index 18be5f7..80a6f28 100644
--- a/content/docs/latest/admin-api/overview/index.html
+++ b/content/docs/latest/admin-api/overview/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1262,9 +1271,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1461,6 +1470,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1705,6 +1716,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1792,6 +1805,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
@@ -1870,8 +1885,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1959,6 +1972,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/admin-api/partitioned-topics/index.html b/content/docs/latest/admin-api/partitioned-topics/index.html
index 02b54ac..ff376ac 100644
--- a/content/docs/latest/admin-api/partitioned-topics/index.html
+++ b/content/docs/latest/admin-api/partitioned-topics/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin-api/permissions/index.html b/content/docs/latest/admin-api/permissions/index.html
index 1846648..df59c7a 100644
--- a/content/docs/latest/admin-api/permissions/index.html
+++ b/content/docs/latest/admin-api/permissions/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin-api/persistent-topics/index.html b/content/docs/latest/admin-api/persistent-topics/index.html
index 4c33f35..63be469 100644
--- a/content/docs/latest/admin-api/persistent-topics/index.html
+++ b/content/docs/latest/admin-api/persistent-topics/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1061,10 +1068,10 @@
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">role</span> <span class="o">=</span> <span class="s">"test-role"</span><span class="o">;</span>
 <span class="n">Set</span><span class="o">&lt;</span><span class="n">AuthAction</span><span class="o">&gt;</span> <span class="n">actions</span>  <span class="o">=</span> <span class="n">Sets</span><span class="o">.</span><span class="na">newHashSet</span><span class="o">(</span><span class="n">AuthAction</span><span class="o">.</span><span class="na">produce</span><span class="o">,</span> <span class="n">AuthAction</span><span class="o">.</span><span class="na">consume</span><span class [...]
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">grantPermission</span><span class="o">(</span><span class="n">destination</span><span class="o">,</span> <span class="n">role</span><span class="o">,</span> <span class="n">actions</span><span class="o">);</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">grantPermission</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">role</span><span class="o">,</span> <span class="n">actions</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="get-permission">Get permission</h3>
@@ -1088,12 +1095,12 @@
 
 <div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/namespaces/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/permissions</code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/namespaces/:tenant:namespace/permissions">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/namespaces/:tenant/:namespace/permissions">More info</a></p>
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getPermissions</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getPermissions</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="revoke-permission">Revoke permission</h3>
@@ -1118,15 +1125,15 @@
 
 <h4 id="rest-api-3">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method delete">DELETE</code><code class="url">/admin/v2/namespaces/<span class="endpoint">:tenant</span><span class="endpoint">:namespace</span>/permissions/<span class="endpoint">:role</span></code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method delete">DELETE</code><code class="url">/admin/v2/namespaces/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/permissions/<span class="endpoint">:role</span></code></pre></div>
 
 <p><a href="../../reference/RestApi#/admin/namespaces/:tenant/:namespace/permissions/:role">More info</a></p>
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">role</span> <span class="o">=</span> <span class="s">"test-role"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">revokePermissions</span><span class="o">(</span><span class="n">destination</span><span class="o">,</span> <span class="n">role</span><span class="o">);</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">revokePermissions</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">role</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="delete-topic">Delete topic</h3>
@@ -1143,14 +1150,14 @@
 
 <h4 id="rest-api-4">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method delete">DELETE</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span></code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method delete">DELETE</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span></code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic">More info</a></p>
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">delete</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">delete</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="unload-topic">Unload topic</h3>
@@ -1167,14 +1174,14 @@
 
 <h4 id="rest-api-5">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method put">PUT</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/unload</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method put">PUT</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/unload</code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/unload">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/unload">More info</a></p>
 
 <h4 id="java-5">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">unload</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">unload</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="get-stats">Get stats</h3>
@@ -1304,14 +1311,14 @@
 
 <h4 id="rest-api-6">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/stats</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/stats</code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant:namespace/:destination/stats">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/stats">More info</a></p>
 
 <h4 id="java-6">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getStats</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getStats</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="get-internal-stats">Get internal stats</h3>
@@ -1436,14 +1443,14 @@
 
 <h4 id="rest-api-7">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/internalStats</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/internalStats</code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/internalStats">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/internalStats">More info</a></p>
 
 <h4 id="java-7">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getInternalStats</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getInternalStats</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="peek-messages">Peek messages</h3>
@@ -1463,16 +1470,16 @@ msg-payload
 
 <h4 id="rest-api-8">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/subscription/<span class="endpoint">:subName</span>/position/<span class="endpoint">:messagePosition</span></code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/subscription/<span class="endpoint">:subName</span>/position/<span class="endpoint">:messagePosition</span></code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/position/:messagePosition">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition">More info</a></p>
 
 <h4 id="java-8">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">subName</span> <span class="o">=</span> <span class="s">"my-subscription"</span><span class="o">;</span>
 <span class="kt">int</span> <span class="n">numMessages</span> <span class="o">=</span> <span class="mi">1</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">peekMessages</span><span class="o">(</span><span class="n">destination</span><span class="o">,</span> <span class="n">subName</span><span class="o">,</span> <span class="n">numMessages</span><span class="o">);</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">peekMessages</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">subName</span><span class="o">,</span> <span class="n">numMessages</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="skip-messages">Skip messages</h3>
@@ -1488,16 +1495,16 @@ msg-payload
 
 <h4 id="rest-api-9">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method post">POST</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/subscription/<span class="endpoint">:subName</span>/skip/<span class="endpoint">:numMessages</span></code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method post">POST</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/subscription/<span class="endpoint">:subName</span>/skip/<span class="endpoint">:numMessages</span></code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/skip/:numMessages">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/subscription/:subName/skip/:numMessages">More info</a></p>
 
 <h4 id="java-9">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">subName</span> <span class="o">=</span> <span class="s">"my-subscription"</span><span class="o">;</span>
 <span class="kt">int</span> <span class="n">numMessages</span> <span class="o">=</span> <span class="mi">1</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">skipMessages</span><span class="o">(</span><span class="n">destination</span><span class="o">,</span> <span class="n">subName</span><span class="o">,</span> <span class="n">numMessages</span><span class="o">);</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">skipMessages</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">subName</span><span class="o">,</span> <span class="n">numMessages</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="skip-all-messages">Skip all messages</h3>
@@ -1513,15 +1520,15 @@ msg-payload
 
 <h4 id="rest-api-10">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method post">POST</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/subscription/<span class="endpoint">:subName</span>/skip_all</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method post">POST</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/subscription/<span class="endpoint">:subName</span>/skip_all</code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/skip_all">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/subscription/:subName/skip_all">More info</a></p>
 
 <h4 id="java-10">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">subName</span> <span class="o">=</span> <span class="s">"my-subscription"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">skipAllMessages</span><span class="o">(</span><span class="n">destination</span><span class="o">,</span> <span class="n">subName</span><span class="o">);</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">skipAllMessages</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">subName</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="reset-cursor">Reset cursor</h3>
@@ -1537,21 +1544,21 @@ msg-payload
 
 <h4 id="rest-api-11">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method post">POST</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/subscription/<span class="endpoint">:subName</span>/resetcursor/<span class="endpoint">:timestamp</span></code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method post">POST</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/subscription/<span class="endpoint">:subName</span>/resetcursor/<span class="endpoint">:timestamp</span></code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/resetcursor/:timestamp">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/subscription/:subName/resetcursor/:timestamp">More info</a></p>
 
 <h4 id="java-11">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">subName</span> <span class="o">=</span> <span class="s">"my-subscription"</span><span class="o">;</span>
 <span class="kt">long</span> <span class="n">timestamp</span> <span class="o">=</span> <span class="mi">2342343L</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">skipAllMessages</span><span class="o">(</span><span class="n">destination</span><span class="o">,</span> <span class="n">subName</span><span class="o">,</span> <span class="n">timestamp</span><span class="o">);</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">skipAllMessages</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">subName</span><span class="o">,</span> <span class="n">timestamp</span><span class="o">);</span>
 </code></pre></div></div>
 
-<h3 id="lookup-of-topic">Lookup of topic</h3>
+<h3 id="lookup-topic">Lookup topic</h3>
 
-<p>It locates broker url which is serving the given topic.</p>
+<p>It locates the broker url which is serving the given topic.</p>
 
 <h4 id="pulsar-admin-12">pulsar-admin</h4>
 
@@ -1563,12 +1570,12 @@ msg-payload
 
 <h4 id="rest-api-12">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/lookup/v2/destination/persistent/<span class="endpoint">:tenant</span><span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span></code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/lookup/v2/topic/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span></code></pre></div>
 
 <h4 id="java-12">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">lookup</span><span class="o">().</span><span class="na">lookupDestination</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">lookup</span><span class="o">().</span><span class="na">lookupTopic</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="get-bundle">Get bundle</h3>
@@ -1585,12 +1592,12 @@ msg-payload
 
 <h4 id="rest-api-13">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/lookup/v2/destination/<span class="endpoint">:destination_domain</span>/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/bundle</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/lookup/v2/topic/<span class="endpoint">:topic_domain</span>/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/bundle</code></pre></div>
 
 <h4 id="java-13">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">lookup</span><span class="o">().</span><span class="na">getBundleRange</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">lookup</span><span class="o">().</span><span class="na">getBundleRange</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="get-subscriptions">Get subscriptions</h3>
@@ -1607,14 +1614,14 @@ msg-payload
 
 <h4 id="rest-api-14">REST API</h4>
 
-<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:destination</span>/subscriptions</code></pre></div>
+<div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/v2/persistent/<span class="endpoint">:tenant</span>/<span class="endpoint">:namespace</span>/<span class="endpoint">:topic</span>/subscriptions</code></pre></div>
 
-<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscriptions">More info</a></p>
+<p><a href="../../reference/RestApi#/admin/persistent/:tenant/:namespace/:topic/subscriptions">More info</a></p>
 
 <h4 id="java-14">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getSubscriptions</span><span class="o">(</span><span class="n">destination</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getSubscriptions</span><span class="o">(</span><span class="n">topic</span><span class="o">);</span>
 </code></pre></div></div>
 
 <h3 id="unsubscribe">Unsubscribe</h3>
@@ -1636,9 +1643,9 @@ msg-payload
 
 <h4 id="java-15">Java</h4>
 
-<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-tenant/my-namespace/my-topic"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">subscriptionName</span> <span class="o">=</span> <span class="s">"my-subscription"</span><span class="o">;</span>
-<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">deleteSubscription</span><span class="o">(</span><span class="n">destination</span><span class="o">,</span> <span class="n">subscriptionName</span><span class="o">);</span>
+<span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">deleteSubscription</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">subscriptionName</span><span class="o">);</span>
 </code></pre></div></div>
 
       </section>
diff --git a/content/docs/latest/admin-api/tenants/index.html b/content/docs/latest/admin-api/tenants/index.html
index aca99e8..60a64c8 100644
--- a/content/docs/latest/admin-api/tenants/index.html
+++ b/content/docs/latest/admin-api/tenants/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin/Dashboard/index.html b/content/docs/latest/admin/Dashboard/index.html
index 9f3285d..2fcb989 100644
--- a/content/docs/latest/admin/Dashboard/index.html
+++ b/content/docs/latest/admin/Dashboard/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin/GeoReplication/index.html b/content/docs/latest/admin/GeoReplication/index.html
index 856adc9..e1184cf 100644
--- a/content/docs/latest/admin/GeoReplication/index.html
+++ b/content/docs/latest/admin/GeoReplication/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin/LoadDistribution/index.html b/content/docs/latest/admin/LoadDistribution/index.html
index 675081f..807bcff 100644
--- a/content/docs/latest/admin/LoadDistribution/index.html
+++ b/content/docs/latest/admin/LoadDistribution/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin/Proxy/index.html b/content/docs/latest/admin/Proxy/index.html
index 217acca..68396c0 100644
--- a/content/docs/latest/admin/Proxy/index.html
+++ b/content/docs/latest/admin/Proxy/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin/Stats/index.html b/content/docs/latest/admin/Stats/index.html
index ec99171..92a1b0b 100644
--- a/content/docs/latest/admin/Stats/index.html
+++ b/content/docs/latest/admin/Stats/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/admin/ZooKeeperBookKeeper/index.html b/content/docs/latest/admin/ZooKeeperBookKeeper/index.html
index 4b79dc6..92c6a96 100644
--- a/content/docs/latest/admin/ZooKeeperBookKeeper/index.html
+++ b/content/docs/latest/admin/ZooKeeperBookKeeper/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/clients/Cpp/index.html b/content/docs/latest/clients/Cpp/index.html
index f908c43..1cf8ac7 100644
--- a/content/docs/latest/clients/Cpp/index.html
+++ b/content/docs/latest/clients/Cpp/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,9 +1005,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1026,6 +1033,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
@@ -1148,9 +1157,9 @@
           
           
           
+          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
-          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
           
@@ -1278,9 +1287,9 @@
           
           
           
-          <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
+          <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
           
@@ -1453,6 +1462,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/clients/Java/index.html b/content/docs/latest/clients/Java/index.html
index ed33aa9..4e14ab7 100644
--- a/content/docs/latest/clients/Java/index.html
+++ b/content/docs/latest/clients/Java/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,9 +1005,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1026,6 +1033,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
@@ -1148,9 +1157,9 @@
           
           
           
+          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
-          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
           
@@ -1292,6 +1301,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
@@ -1370,8 +1381,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1459,6 +1468,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1546,9 +1557,9 @@
           
           
           
-          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
+          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
           
@@ -1705,6 +1716,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1792,9 +1805,9 @@
           
           
           
-          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
+          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
           
@@ -1951,6 +1964,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/clients/Python/index.html b/content/docs/latest/clients/Python/index.html
index a7366aa..4d34e49 100644
--- a/content/docs/latest/clients/Python/index.html
+++ b/content/docs/latest/clients/Python/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,9 +1005,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1026,6 +1033,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
@@ -1148,9 +1157,9 @@
           
           
           
+          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
-          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
           
@@ -1334,6 +1343,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Python/">The Pulsar Python client</a></li>
           
           
@@ -1406,9 +1417,9 @@
           
           
           
+          <li><a href="/docs/latest/cookbooks/message-queue/">Using Pulsar as a message queue</a></li>
           
           
-          <li><a href="/docs/latest/cookbooks/message-queue/">Using Pulsar as a message queue</a></li>
           
           
           
diff --git a/content/docs/latest/clients/WebSocket/index.html b/content/docs/latest/clients/WebSocket/index.html
index 5b0d087..0c3f19d 100644
--- a/content/docs/latest/clients/WebSocket/index.html
+++ b/content/docs/latest/clients/WebSocket/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1100,6 +1107,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/WebSocket/">Pulsar's WebSocket API</a></li>
           
           
@@ -1344,6 +1353,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/WebSocket/">Pulsar's WebSocket API</a></li>
           
           
@@ -1568,6 +1579,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Python/">The Pulsar Python client</a></li>
           
           
@@ -1640,9 +1653,9 @@
           
           
           
+          <li><a href="/docs/latest/cookbooks/message-queue/">Using Pulsar as a message queue</a></li>
           
           
-          <li><a href="/docs/latest/cookbooks/message-queue/">Using Pulsar as a message queue</a></li>
           
           
           
diff --git a/content/docs/latest/clients/go/index.html b/content/docs/latest/clients/go/index.html
index a4f4029..1492ffb 100644
--- a/content/docs/latest/clients/go/index.html
+++ b/content/docs/latest/clients/go/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,9 +1005,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1026,6 +1033,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
@@ -1148,9 +1157,9 @@
           
           
           
+          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
-          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
           
@@ -1449,6 +1458,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1693,6 +1704,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/cookbooks/Encryption/index.html b/content/docs/latest/cookbooks/Encryption/index.html
index c1f681a..18ca402 100644
--- a/content/docs/latest/cookbooks/Encryption/index.html
+++ b/content/docs/latest/cookbooks/Encryption/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1197,6 +1204,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1443,6 +1452,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1556,9 +1567,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1697,6 +1708,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1810,9 +1823,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1838,9 +1851,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -1951,6 +1964,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/cookbooks/PartitionedTopics/index.html b/content/docs/latest/cookbooks/PartitionedTopics/index.html
index 64d6b8c..c5c0499 100644
--- a/content/docs/latest/cookbooks/PartitionedTopics/index.html
+++ b/content/docs/latest/cookbooks/PartitionedTopics/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1062,6 +1069,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
@@ -1306,6 +1315,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
@@ -1486,6 +1497,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1604,8 +1617,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1703,6 +1714,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1816,9 +1829,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1957,6 +1970,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2070,9 +2085,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -2098,9 +2113,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -2211,6 +2226,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/cookbooks/RetentionExpiry/index.html b/content/docs/latest/cookbooks/RetentionExpiry/index.html
index 47e590c..763a81c 100644
--- a/content/docs/latest/cookbooks/RetentionExpiry/index.html
+++ b/content/docs/latest/cookbooks/RetentionExpiry/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1352,6 +1361,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
@@ -1596,6 +1607,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
@@ -1840,6 +1853,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
@@ -2060,9 +2075,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -2088,9 +2103,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -2201,6 +2216,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/cookbooks/compaction/index.html b/content/docs/latest/cookbooks/compaction/index.html
index 7f48657..e0c2266 100644
--- a/content/docs/latest/cookbooks/compaction/index.html
+++ b/content/docs/latest/cookbooks/compaction/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1328,9 +1337,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1469,6 +1478,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1713,6 +1724,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/cookbooks/message-deduplication/index.html b/content/docs/latest/cookbooks/message-deduplication/index.html
index ebb4424..7767ce8 100644
--- a/content/docs/latest/cookbooks/message-deduplication/index.html
+++ b/content/docs/latest/cookbooks/message-deduplication/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1278,9 +1287,9 @@
           
           
           
-          <li><a href="/docs/latest/getting-started/ConceptsAndArchitecture/">Pulsar concepts and architecture</a></li>
           
           
+          <li><a href="/docs/latest/getting-started/ConceptsAndArchitecture/">Pulsar concepts and architecture</a></li>
           
           
           
@@ -1461,6 +1470,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1574,9 +1585,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1602,9 +1613,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -1715,6 +1726,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/cookbooks/message-queue/index.html b/content/docs/latest/cookbooks/message-queue/index.html
index 37e57ce..32e4e8f 100644
--- a/content/docs/latest/cookbooks/message-queue/index.html
+++ b/content/docs/latest/cookbooks/message-queue/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1064,9 +1071,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1205,6 +1212,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1292,6 +1301,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
@@ -1370,8 +1381,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1459,6 +1468,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1588,6 +1599,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Python/">The Pulsar Python client</a></li>
           
           
@@ -1660,9 +1673,9 @@
           
           
           
+          <li><a href="/docs/latest/cookbooks/message-queue/">Using Pulsar as a message queue</a></li>
           
           
-          <li><a href="/docs/latest/cookbooks/message-queue/">Using Pulsar as a message queue</a></li>
           
           
           
@@ -1951,6 +1964,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2064,9 +2079,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -2092,9 +2107,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -2205,6 +2220,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/cookbooks/non-persistent-messaging/index.html b/content/docs/latest/cookbooks/non-persistent-messaging/index.html
index 151c56f..36cd57e 100644
--- a/content/docs/latest/cookbooks/non-persistent-messaging/index.html
+++ b/content/docs/latest/cookbooks/non-persistent-messaging/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/cookbooks/tiered-storage/index.html b/content/docs/latest/cookbooks/tiered-storage/index.html
index ec662d9..9260e45 100644
--- a/content/docs/latest/cookbooks/tiered-storage/index.html
+++ b/content/docs/latest/cookbooks/tiered-storage/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1459,6 +1468,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/deployment/Kubernetes/index.html b/content/docs/latest/deployment/Kubernetes/index.html
index 38cfea9..868a18b 100644
--- a/content/docs/latest/deployment/Kubernetes/index.html
+++ b/content/docs/latest/deployment/Kubernetes/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1044,6 +1051,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/deployment/Kubernetes/">Deploying Pulsar on Kubernetes</a></li>
           
           
@@ -1288,6 +1297,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/deployment/Kubernetes/">Deploying Pulsar on Kubernetes</a></li>
           
           
diff --git a/content/docs/latest/deployment/Monitoring/index.html b/content/docs/latest/deployment/Monitoring/index.html
index e07e70e..fd07c8a 100644
--- a/content/docs/latest/deployment/Monitoring/index.html
+++ b/content/docs/latest/deployment/Monitoring/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/deployment/aws-cluster/index.html b/content/docs/latest/deployment/aws-cluster/index.html
index a5942f7..47a5a53 100644
--- a/content/docs/latest/deployment/aws-cluster/index.html
+++ b/content/docs/latest/deployment/aws-cluster/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1463,6 +1472,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1709,6 +1720,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1953,6 +1966,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2197,6 +2212,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/deployment/cluster/index.html b/content/docs/latest/deployment/cluster/index.html
index 68bb7c9..3113ea1 100644
--- a/content/docs/latest/deployment/cluster/index.html
+++ b/content/docs/latest/deployment/cluster/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1463,6 +1472,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1709,6 +1720,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1955,6 +1968,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/deployment/dcos/index.html b/content/docs/latest/deployment/dcos/index.html
index 4035069..9823dba 100644
--- a/content/docs/latest/deployment/dcos/index.html
+++ b/content/docs/latest/deployment/dcos/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/deployment/instance/index.html b/content/docs/latest/deployment/instance/index.html
index 7469715..9a49d19 100644
--- a/content/docs/latest/deployment/instance/index.html
+++ b/content/docs/latest/deployment/instance/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1463,6 +1472,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1707,6 +1718,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1953,6 +1966,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/functions/api/index.html b/content/docs/latest/functions/api/index.html
index 280bc80..4ccca7d 100644
--- a/content/docs/latest/functions/api/index.html
+++ b/content/docs/latest/functions/api/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/functions/deployment/index.html b/content/docs/latest/functions/deployment/index.html
index 1262b8d..423f3d3 100644
--- a/content/docs/latest/functions/deployment/index.html
+++ b/content/docs/latest/functions/deployment/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/functions/guarantees/index.html b/content/docs/latest/functions/guarantees/index.html
index 7f8cf10..a5b9a48 100644
--- a/content/docs/latest/functions/guarantees/index.html
+++ b/content/docs/latest/functions/guarantees/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/functions/metrics/index.html b/content/docs/latest/functions/metrics/index.html
index f995045..890388c 100644
--- a/content/docs/latest/functions/metrics/index.html
+++ b/content/docs/latest/functions/metrics/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/functions/overview/index.html b/content/docs/latest/functions/overview/index.html
index d79faae..3b56b93 100644
--- a/content/docs/latest/functions/overview/index.html
+++ b/content/docs/latest/functions/overview/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/functions/quickstart/index.html b/content/docs/latest/functions/quickstart/index.html
index 277e452..3ec011e 100644
--- a/content/docs/latest/functions/quickstart/index.html
+++ b/content/docs/latest/functions/quickstart/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/getting-started/Clients/index.html b/content/docs/latest/getting-started/Clients/index.html
index b3638cd..ee33205 100644
--- a/content/docs/latest/getting-started/Clients/index.html
+++ b/content/docs/latest/getting-started/Clients/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/getting-started/ConceptsAndArchitecture/index.html b/content/docs/latest/getting-started/ConceptsAndArchitecture/index.html
index 7daa506..c4bf12b 100644
--- a/content/docs/latest/getting-started/ConceptsAndArchitecture/index.html
+++ b/content/docs/latest/getting-started/ConceptsAndArchitecture/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1014,6 +1021,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/getting-started/ConceptsAndArchitecture/">Pulsar concepts and architecture</a></li>
           
           
@@ -1258,9 +1267,9 @@
           
           
           
-          <li><a href="/docs/latest/getting-started/ConceptsAndArchitecture/">Pulsar concepts and architecture</a></li>
           
           
+          <li><a href="/docs/latest/getting-started/ConceptsAndArchitecture/">Pulsar concepts and architecture</a></li>
           
           
           
@@ -1441,6 +1450,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/getting-started/LocalCluster/index.html b/content/docs/latest/getting-started/LocalCluster/index.html
index fde2dee..564bdd5 100644
--- a/content/docs/latest/getting-started/LocalCluster/index.html
+++ b/content/docs/latest/getting-started/LocalCluster/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1050,9 +1057,9 @@
           
           
           
-          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
+          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
           
@@ -1197,6 +1204,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1296,9 +1305,9 @@
           
           
           
-          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
+          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
           
@@ -1443,6 +1452,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/getting-started/Pulsar-2.0/index.html b/content/docs/latest/getting-started/Pulsar-2.0/index.html
index 9d62948..45ec5ca 100644
--- a/content/docs/latest/getting-started/Pulsar-2.0/index.html
+++ b/content/docs/latest/getting-started/Pulsar-2.0/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1195,6 +1202,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1439,6 +1448,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1552,9 +1563,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1693,6 +1704,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/getting-started/docker/index.html b/content/docs/latest/getting-started/docker/index.html
index 0c4d1ad..9bd32cd 100644
--- a/content/docs/latest/getting-started/docker/index.html
+++ b/content/docs/latest/getting-started/docker/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1050,9 +1057,9 @@
           
           
           
-          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
+          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
           
@@ -1197,6 +1204,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1296,9 +1305,9 @@
           
           
           
-          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
+          <li><a href="/docs/latest/getting-started/LocalCluster/">Setting up a local standalone cluster</a></li>
           
           
           
@@ -1443,6 +1452,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1687,6 +1698,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/io/overview/index.html b/content/docs/latest/io/overview/index.html
index 159b630..1e2c64b 100644
--- a/content/docs/latest/io/overview/index.html
+++ b/content/docs/latest/io/overview/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/io/quickstart/index.html b/content/docs/latest/io/quickstart/index.html
index c8e792d..a1855b5 100644
--- a/content/docs/latest/io/quickstart/index.html
+++ b/content/docs/latest/io/quickstart/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/project/BinaryProtocol/index.html b/content/docs/latest/project/BinaryProtocol/index.html
index acf72a9..4bc8170 100644
--- a/content/docs/latest/project/BinaryProtocol/index.html
+++ b/content/docs/latest/project/BinaryProtocol/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -994,6 +1001,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/project/BinaryProtocol/">Pulsar binary protocol specification</a></li>
           
           
@@ -1238,6 +1247,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/project/BinaryProtocol/">Pulsar binary protocol specification</a></li>
           
           
diff --git a/content/docs/latest/project/Codebase/index.html b/content/docs/latest/project/Codebase/index.html
index c3bb7dc..29272e9 100644
--- a/content/docs/latest/project/Codebase/index.html
+++ b/content/docs/latest/project/Codebase/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/project/CompileCpp/index.html b/content/docs/latest/project/CompileCpp/index.html
index c0a6ebb..bd1db5f 100644
--- a/content/docs/latest/project/CompileCpp/index.html
+++ b/content/docs/latest/project/CompileCpp/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,9 +1005,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1026,6 +1033,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
@@ -1148,9 +1157,9 @@
           
           
           
+          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
-          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
           
@@ -1278,9 +1287,9 @@
           
           
           
-          <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
+          <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
           
@@ -1453,6 +1462,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/project/ModularLoadManager/index.html b/content/docs/latest/project/ModularLoadManager/index.html
index 378e07b..edefeb0 100644
--- a/content/docs/latest/project/ModularLoadManager/index.html
+++ b/content/docs/latest/project/ModularLoadManager/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/project/SimulationTools/index.html b/content/docs/latest/project/SimulationTools/index.html
index b963d57..e601624 100644
--- a/content/docs/latest/project/SimulationTools/index.html
+++ b/content/docs/latest/project/SimulationTools/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1092,6 +1099,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/project/SimulationTools/">Simulation tools</a></li>
           
           
diff --git a/content/docs/latest/project/schema-storage/index.html b/content/docs/latest/project/schema-storage/index.html
index c0f33b6..333ed51 100644
--- a/content/docs/latest/project/schema-storage/index.html
+++ b/content/docs/latest/project/schema-storage/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1038,9 +1045,9 @@
           
           
           
-          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
+          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
           
@@ -1197,6 +1204,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1284,9 +1293,9 @@
           
           
           
-          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
+          <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
           
@@ -1443,6 +1452,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/reference/CliTools/index.html b/content/docs/latest/reference/CliTools/index.html
index 1c69668..1f6ea9f 100644
--- a/content/docs/latest/reference/CliTools/index.html
+++ b/content/docs/latest/reference/CliTools/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1262,9 +1271,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1461,6 +1470,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1508,9 +1519,9 @@
           
           
           
-          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
+          <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
           
@@ -1536,6 +1547,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
@@ -1658,9 +1671,9 @@
           
           
           
+          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
-          <li><a href="/docs/latest/clients/go/">The Pulsar Go client</a></li>
           
           
           
@@ -1762,6 +1775,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -2006,6 +2021,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -2250,6 +2267,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
diff --git a/content/docs/latest/reference/Configuration/index.html b/content/docs/latest/reference/Configuration/index.html
index ac8a056..6685594 100644
--- a/content/docs/latest/reference/Configuration/index.html
+++ b/content/docs/latest/reference/Configuration/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/reference/RestApi/index.html b/content/docs/latest/reference/RestApi/index.html
index 12f3c21..64808ab 100644
--- a/content/docs/latest/reference/RestApi/index.html
+++ b/content/docs/latest/reference/RestApi/index.html
@@ -564,8 +564,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/security/athenz/index.html b/content/docs/latest/security/athenz/index.html
index c4c7b49..2079390 100644
--- a/content/docs/latest/security/athenz/index.html
+++ b/content/docs/latest/security/athenz/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/security/authorization/index.html b/content/docs/latest/security/authorization/index.html
index 5296f68..d82a9f9 100644
--- a/content/docs/latest/security/authorization/index.html
+++ b/content/docs/latest/security/authorization/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -998,6 +1005,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -1116,8 +1125,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1215,6 +1222,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1461,6 +1470,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1707,6 +1718,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1951,6 +1964,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2195,6 +2210,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2282,6 +2299,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/clients/Java/">The Pulsar Java client</a></li>
           
           
@@ -2360,8 +2379,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/security/authorization/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -2449,6 +2466,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2522,9 +2541,9 @@
           
           
           
-          <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
+          <li><a href="/docs/latest/clients/Cpp/">The Pulsar C++ client</a></li>
           
           
           
@@ -2697,6 +2716,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2732,11 +2753,21 @@
 -->
 
 <p>In Pulsar, the <a href="../overview#authentication-providers">authentication provider</a> is charged with properly identifying clients and
-associating them with <a href="../overview#role-tokens">role tokens</a>. <em>Authorization</em> is the process that determines <em>what</em> clients are able to do.</p>
+associating them with <a href="../overview#role-tokens">role tokens</a>. If only authentication is enabled, an authenticated role token will have the ability to access all resources in the cluster. <em>Authorization</em> is the process that determines <em>what</em> clients are able to do.</p>
+
+<p>The role tokens with the most privileges are the <em>superusers</em>. The <em>superusers</em> can create and destroy tenants, along with having full access to all tenant resources.</p>
+
+<p>When a <span class="popover-term" tabindex="0" title="What is a tenant?" data-placement="top" data-content="An administrative unit for allocating capacity and enforcing an authentication/authorization scheme. Tenants in Pulsar are managed at the property level." data-toggle="popover" data-trigger="focus">tenant</span> is created by a superuser, that tenant is assigned an admin role. A client with the admin role token can then create, modify and destroy namespaces, and grant and revoke [...]
+
+<h2 id="broker-and-proxy-setup">Broker and Proxy Setup</h2>
 
-<p>Authorization in Pulsar is managed at the <span class="popover-term" tabindex="0" title="What is a tenant?" data-placement="top" data-content="An administrative unit for allocating capacity and enforcing an authentication/authorization scheme. Tenants in Pulsar are managed at the property level." data-toggle="popover" data-trigger="focus">tenant</span> level, which means that you can have multiple authorization schemes active
-in a single Pulsar instance. You could, for example, create a <code class="highlighter-rouge">shopping</code> tenant that has one set of <a href="../overview#role-tokens">roles</a>
-and applies to a shopping application used by your company, while an <code class="highlighter-rouge">inventory</code> tenant would be used only by an inventory application.</p>
+<h3 id="enabling-authorization-and-assigning-superusers">Enabling Authorization and Assigning Superusers</h3>
+
+<p>Authorization is enabled and superusers are assigned in the broker (<a href="../../reference/Configuration#broker"><code class="highlighter-rouge">conf/broker.conf</code></a>) and proxy (<a href="../../reference/Configuration#proxy"><code class="highlighter-rouge">conf/proxy.conf</code></a>) configuration files.</p>
+
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">authorizationEnabled</span><span class="p">=</span><span class="s">true</span>
+<span class="py">superUserRoles</span><span class="p">=</span><span class="s">my-super-user-1,my-super-user-2</span>
+</code></pre></div></div>
 
 <!--
 
@@ -2760,14 +2791,38 @@ and applies to a shopping application used by your company, while an <code class
 -->
 
 <div class="admonition">
-  <div class="success">
+  <div class="info">
     
-    <p>When working with properties, you can specify which of your Pulsar clusters your property is allowed to use. This enables you to also have cluster-level authorization schemes.</p>
+    <p>A full listing of parameters available in the <code class="highlighter-rouge">conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="../../reference/Configuration#broker">Broker Configuration</a>.</p>
 
   </div>
 </div>
 
-<h2 id="creating-a-new-tenant">Creating a new tenant</h2>
+<p>Typically, superuser roles are used for administrators and clients but also for broker-to-broker authorization. When using <a href="../GeoReplication">geo-replication</a>, every broker needs to be able to publish to all the other clusters’ topics.</p>
+
+<h3 id="proxy-roles">Proxy Roles</h3>
+
+<p>By default, the broker treats the connection between a proxy and the broker as a normal user connection. The user is authenticated as the role configured in <code class="highlighter-rouge">proxy.conf</code> (see <a href="../tls#-on-proxies">“Enabling TLS Authentication on Proxies”</a>). However, this is rarely the behaviour that the user desires when connecting to the cluster through a proxy. The user expects to be able to interact with the cluster as the role for which they have auth [...]
+
+<p>Pulsar uses <em>Proxy roles</em> to enable this. Proxy roles are specified in the broker configuration file, <a href="../../reference/Configuration#broker"><code class="highlighter-rouge">conf/broker.conf</code></a>. If a client that is authenticated with a broker is one of its <code class="highlighter-rouge">proxyRoles</code>, all requests from that client must also carry information about the role of the client that is authenticated with the proxy. If this information, which we call [...]
+
+<p>Both the <em>proxy role</em> and the <em>original principle</em> must be authorized to access a resource for that resource to be accessible via the proxy. Administrators can take two approaches to this.</p>
+
+<p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code class="highlighter-rouge">proxy1</code>, when a tenant is created by the superuser, <code class="highlighter-rouge">proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code class="highlighter-rou [...]
+
+<p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
+
+<p>Roles can be specified as proxy roles in <a href="../../reference/Configuration#broker"><code class="highlighter-rouge">conf/broker.conf</code></a>.</p>
+
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">proxyRoles</span><span class="p">=</span><span class="s">my-proxy-role</span>
+
+<span class="c"># if you want to allow superusers to use the proxy (see above)
+</span><span class="py">superUserRoles</span><span class="p">=</span><span class="s">my-super-user-1,my-super-user-2,my-proxy-role</span>
+</code></pre></div></div>
+
+<h2 id="administering-tenants">Administering Tenants</h2>
+
+<h3 id="creating-a-new-tenant">Creating a new tenant</h3>
 
 <p>A Pulsar <span class="popover-term" tabindex="0" title="What is a tenant?" data-placement="top" data-content="An administrative unit for allocating capacity and enforcing an authentication/authorization scheme. Tenants in Pulsar are managed at the property level." data-toggle="popover" data-trigger="focus">tenant</span> is typically provisioned by Pulsar <span class="popover-term" tabindex="0" title="What is a Pulsar instance?" data-placement="top" data-content="A group of Pulsar clus [...]
 
@@ -2808,7 +2863,7 @@ and applies to a shopping application used by your company, while an <code class
   persistent://<span class="property">tenant</span>/<span class="namespace">namespace</span>/<span class="t">topic</span>
 </section>
 
-<h2 id="managing-permissions">Managing permissions</h2>
+<h3 id="managing-permissions">Managing permissions</h3>
 
 <!--
 
@@ -2936,48 +2991,7 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">namespaces</span><span class="o">().</span><span class="na">revokePermissionsOnNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">role</span><span class="o">);</span>
 </code></pre></div></div>
 
-<h2 id="superusers">Superusers</h2>
-
-<p>In Pulsar you can assign certain roles to be <em>superusers</em> of the system. A superuser is allowed to perform all administrative tasks on all tenants and namespaces, as well as to publish and subscribe to all topics.</p>
-
-<p>Superusers are configured in the broker configuration file in <a href="../../reference/Configuration#broker"><code class="highlighter-rouge">conf/broker.conf</code></a> configuration file, using the <a href="../../reference/Configuration#broker-superUserRoles"><code class="highlighter-rouge">superUserRoles</code></a> parameter:</p>
-
-<pre><code class="language-tenants">superUserRoles=my-super-user-1,my-super-user-2
-</code></pre>
-
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-
--->
-
-<div class="admonition">
-  <div class="info">
-    
-    <p>A full listing of parameters available in the <code class="highlighter-rouge">conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="../../reference/Configuration#broker">Broker Configuration</a>.</p>
-
-  </div>
-</div>
-
-<p>Typically, superuser roles are used for administrators and clients but also for broker-to-broker authorization. When using <a href="../GeoReplication">geo-replication</a>, every broker
-needs to be able to publish to other clusters’ topics.</p>
-
-<h2 id="pulsar-admin-authentication">Pulsar admin authentication</h2>
+<h3 id="pulsar-admin-authentication">Pulsar admin authentication</h3>
 
 <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">String</span> <span class="n">authPluginClassName</span> <span class="o">=</span> <span class="s">"com.org.MyAuthPluginClass"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">authParams</span> <span class="o">=</span> <span class="s">"param1:value1"</span><span class="o">;</span>
diff --git a/content/docs/latest/security/encryption/index.html b/content/docs/latest/security/encryption/index.html
index c1f681a..18ca402 100644
--- a/content/docs/latest/security/encryption/index.html
+++ b/content/docs/latest/security/encryption/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1197,6 +1204,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1443,6 +1452,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1556,9 +1567,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1697,6 +1708,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1810,9 +1823,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1838,9 +1851,9 @@
           
           
           
-          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/cookbooks/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -1951,6 +1964,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/security/extending/index.html b/content/docs/latest/security/extending/index.html
index 9dc4096..7d2f44c 100644
--- a/content/docs/latest/security/extending/index.html
+++ b/content/docs/latest/security/extending/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -1197,6 +1204,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1443,6 +1452,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/docs/latest/security/openssl.cnf b/content/docs/latest/security/openssl.cnf
new file mode 100644
index 0000000..eee8a47
--- /dev/null
+++ b/content/docs/latest/security/openssl.cnf
@@ -0,0 +1,152 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# 
+# Configuration file for testing certificate authority.
+# The environment variable, CA_HOME, must be set to point to the directory
+# containing this file before running any openssl commands.
+#
+[ ca ]
+# `man ca`
+default_ca = CA_default
+
+[ CA_default ]
+# Directory and file locations.
+dir               = $ENV::CA_HOME
+certs             = $dir/certs
+crl_dir           = $dir/crl
+new_certs_dir     = $dir/newcerts
+database          = $dir/index.txt
+serial            = $dir/serial
+RANDFILE          = $dir/private/.rand
+
+# The root key and root certificate.
+private_key       = $dir/private/ca.key.pem
+certificate       = $dir/certs/ca.cert.pem
+
+# For certificate revocation lists.
+crlnumber         = $dir/crlnumber
+crl               = $dir/crl/ca.crl.pem
+crl_extensions    = crl_ext
+default_crl_days  = 30
+
+# SHA-1 is deprecated, so use SHA-2 instead.
+default_md        = sha256
+
+name_opt          = ca_default
+cert_opt          = ca_default
+default_days      = 375
+preserve          = no
+policy            = policy_strict
+
+[ policy_strict ]
+# The root CA should only sign intermediate certificates that match.
+# See the POLICY FORMAT section of `man ca`.
+countryName             = match
+stateOrProvinceName     = match
+organizationName        = match
+organizationalUnitName  = optional
+commonName              = supplied
+emailAddress            = optional
+
+[ policy_loose ]
+# Allow the intermediate CA to sign a more diverse range of certificates.
+# See the POLICY FORMAT section of the `ca` man page.
+countryName             = optional
+stateOrProvinceName     = optional
+localityName            = optional
+organizationName        = optional
+organizationalUnitName  = optional
+commonName              = supplied
+emailAddress            = optional
+
+[ req ]
+# Options for the `req` tool (`man req`).
+default_bits        = 2048
+distinguished_name  = req_distinguished_name
+string_mask         = utf8only
+
+# SHA-1 is deprecated, so use SHA-2 instead.
+default_md          = sha256
+
+# Extension to add when the -x509 option is used.
+x509_extensions     = v3_ca
+
+[ req_distinguished_name ]
+# See <https://en.wikipedia.org/wiki/Certificate_signing_request>.
+countryName                     = Country Name (2 letter code)
+stateOrProvinceName             = State or Province Name
+localityName                    = Locality Name
+0.organizationName              = Organization Name
+organizationalUnitName          = Organizational Unit Name
+commonName                      = Common Name
+emailAddress                    = Email Address
+
+# Optionally, specify some defaults.
+countryName_default             = US
+stateOrProvinceName_default     = California
+localityName_default            = Palo Alto
+0.organizationName_default      = My company
+organizationalUnitName_default  = IT
+emailAddress_default            =
+
+[ v3_ca ]
+# Extensions for a typical CA (`man x509v3_config`).
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ v3_intermediate_ca ]
+# Extensions for a typical intermediate CA (`man x509v3_config`).
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
+basicConstraints = critical, CA:true, pathlen:0
+keyUsage = critical, digitalSignature, cRLSign, keyCertSign
+
+[ usr_cert ]
+# Extensions for client certificates (`man x509v3_config`).
+basicConstraints = CA:FALSE
+nsCertType = client, email
+nsComment = "OpenSSL Generated Client Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage = clientAuth, emailProtection
+
+[ server_cert ]
+# Extensions for server certificates (`man x509v3_config`).
+basicConstraints = CA:FALSE
+nsCertType = server
+nsComment = "OpenSSL Generated Server Certificate"
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer:always
+keyUsage = critical, digitalSignature, keyEncipherment
+extendedKeyUsage = serverAuth
+
+[ crl_ext ]
+# Extension for CRLs (`man x509v3_config`).
+authorityKeyIdentifier=keyid:always
+
+[ ocsp ]
+# Extension for OCSP signing certificates (`man ocsp`).
+basicConstraints = CA:FALSE
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid,issuer
+keyUsage = critical, digitalSignature
+extendedKeyUsage = critical, OCSPSigning
\ No newline at end of file
diff --git a/content/docs/latest/security/overview/index.html b/content/docs/latest/security/overview/index.html
index 04614bb..d920885 100644
--- a/content/docs/latest/security/overview/index.html
+++ b/content/docs/latest/security/overview/index.html
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
diff --git a/content/docs/latest/security/tls/index.html b/content/docs/latest/security/tls-transport/index.html
similarity index 71%
copy from content/docs/latest/security/tls/index.html
copy to content/docs/latest/security/tls-transport/index.html
index 26dc82f..61e039d 100644
--- a/content/docs/latest/security/tls/index.html
+++ b/content/docs/latest/security/tls-transport/index.html
@@ -43,7 +43,7 @@
     under the License.
 
 -->
-<title>Encryption and Authentication using TLS</title>
+<title>Transport Encryption using TLS</title>
 
 <meta charset="utf-8">
 
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -951,7 +958,7 @@
     <article class="col-xs-12 col-sm-12 col-md-12 col-lg-7">
       <section class="docs-header">
         <h1 class="docs-title">
-          Encryption and Authentication using TLS
+          Transport Encryption using TLS
           
           
         </h1>
@@ -987,103 +994,137 @@
 
 <h2 id="tls-overview">TLS Overview</h2>
 
-<p>With <a href="https://en.wikipedia.org/wiki/Transport_Layer_Security">TLS</a> authentication, the server authenticates the client (also called “2-way authentication”).
-Since TLS authentication requires TLS encryption, this page shows you how to configure both at the same time.</p>
-
-<p>By default, Apache Pulsar communicates in plain text service url, which means that all data is sent in the clear.
-To encrypt communication, it is recommended to configure all the Apache Pulsar components in your deployment to use TLS encryption.</p>
+<p>By default, Apache Pulsar clients communicate with the Apache Pulsar service in plain text, which means that all data is sent in the clear. TLS can be used to encrypt this traffic so that it cannot be snooped by a man-in-the-middle attacker.</p>
 
-<p>TLS can be configured for encryption or authentication. You may configure just TLS encryption
-(by default TLS encryption includes certificate authentication of the server) and independently choose a separate mechanism
-for client authentication, e.g. TLS, <a href="../athenz">Athenz</a>, etc. Note that TLS encryption, technically speaking, already enables
-1-way authentication in which the client authenticates the server certificate. So when referring to TLS authentication, it is really
-referring to 2-way authentication in which the broker also authenticates the client certificate.</p>
+<p>TLS can be configured for both encryption and authentication. You may configure just TLS transport encryption, which is covered in this guide. TLS authentication is covered <a href="../tls">elsewhere</a>. Alternatively, you can use <a href="../athenz">another authentication mechanism</a> on top of TLS transport encryption.</p>
 
 <blockquote>
   <p>Note that enabling TLS may have a performance impact due to encryption overhead.</p>
 </blockquote>
 
+<h2 id="tls-concepts">TLS concepts</h2>
+
+<p>TLS is a form of <a href="https://en.wikipedia.org/wiki/Public-key_cryptography">public key cryptography</a>. Encryption is performed using key pairs consisting of a public key and a private key. Messages are encrypted with the public key and can be decrypted with the private key.</p>
+
+<p>To use TLS transport encryption, you need two kinds of key pairs, <strong>server key pairs</strong> and a <strong>certificate authority</strong>.</p>
+
+<p>A third kind of key pair, <strong>client key pairs</strong>, are used for <a href="&quot;../tls&quot;">client authentication</a>.</p>
+
+<p>The <strong>certificate authority</strong> private key should be stored in a very secure location (a fully encrypted, disconnected, air gapped computer). The certificate authority public key, the <strong>trust cert</strong>, can be freely shared.</p>
+
+<p>For both client and server key pairs, the administrator first generates a private key and a certificate request. Then the certificate authority private key is used to sign the certificate request, generating a certificate. This certificate is the public key for the server/client key pair.</p>
+
+<p>For TLS transport encryption, the clients can use the <strong>trust cert</strong> to verify that the server they are talking to has a key pair that was signed by the certificate authority. A man-in-the-middle attacker would not have access to the certificate authority, so they couldn’t create a server with such a key pair.</p>
+
+<p>For TLS authentication, the server uses the <strong>trust cert</strong> to verify that the client has a key pair that was signed by the certificate authority. The Common Name of the <strong>client cert</strong> is then used as the client’s role token (see <a href="../overview">Overview</a>).</p>
+
 <h2 id="creating-tls-certificates">Creating TLS Certificates</h2>
 
-<p>Creating TLS certificates for Pulsar involves creating a <a href="#certificate-authority">certificate authority</a> (CA), <a href="#broker-certificate">broker certificate</a>, and <a href="#client-certificate">client certificate</a>.</p>
+<p>Creating TLS certificates for Pulsar involves creating a <a href="#certificate-authority">certificate authority</a> (CA), <a href="#server-certificate">server certificate</a>, and <a href="#client-certificate">client certificate</a>.</p>
+
+<p>The following guide is an abridged guide to setting up a certificate authority. For a more detailed guide, there are plenty of resource on the internet. We recommend the <a href="https://jamielinux.com/docs/openssl-certificate-authority/index.html">this guide</a>.</p>
 
 <h3 id="certificate-authority">Certificate authority</h3>
 
-<p>The first step is to create the certificate for the CA. The CA will be used to sign both the broker and client certificates, in order to ensure that each party will trust the others.</p>
+<p>The first step is to create the certificate for the CA. The CA will be used to sign both the broker and client certificates, in order to ensure that each party will trust the others. The CA should be stored in a very secure location (ideally completely disconnected from networks, air gapped, and fully encrypted).</p>
 
-<h4 id="linux">Linux</h4>
+<p>Create a directory for your CA, and place <a href="../openssl.cnf">this openssl configuration file</a> in the directory. You may want to modify the default answers for company name and department in the configuration file. Export the location of the CA directory to the environment variable, CA_HOME. The configuration file uses this environment variable to find the rest of the files and directories needed for the CA.</p>
 
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>CA.pl <span class="nt">-newca</span>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span><span class="nb">mkdir </span>my-ca
+<span class="nv">$ </span><span class="nb">cd </span>my-ca
+<span class="nv">$ </span>wget /docs/latest/security/openssl.cnf
+<span class="nv">$ </span><span class="nb">export </span><span class="nv">CA_HOME</span><span class="o">=</span><span class="k">$(</span><span class="nb">pwd</span><span class="k">)</span>
 </code></pre></div></div>
 
-<h4 id="macos">macOS</h4>
-
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>/System/Library/OpenSSL/misc/CA.pl <span class="nt">-newca</span>
+<p>Create the necessary directories, keys and certs.</p>
+
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span><span class="nb">mkdir </span>certs crl newcerts private
+<span class="nv">$ </span><span class="nb">chmod </span>700 private/
+<span class="nv">$ </span><span class="nb">touch </span>index.txt
+<span class="nv">$ </span><span class="nb">echo </span>1000 <span class="o">&gt;</span> serial
+<span class="nv">$ </span>openssl genrsa <span class="nt">-aes256</span> <span class="nt">-out</span> private/ca.key.pem 4096
+<span class="nv">$ </span><span class="nb">chmod </span>400 private/ca.key.pem
+<span class="nv">$ </span>openssl req <span class="nt">-config</span> openssl.cnf <span class="nt">-key</span> private/ca.key.pem <span class="se">\</span>
+      <span class="nt">-new</span> <span class="nt">-x509</span> <span class="nt">-days</span> 7300 <span class="nt">-sha256</span> <span class="nt">-extensions</span> v3_ca <span class="se">\</span>
+      <span class="nt">-out</span> certs/ca.cert.pem
+<span class="nv">$ </span><span class="nb">chmod </span>444 certs/ca.cert.pem
 </code></pre></div></div>
 
-<p>After answering the question prompts, this will store CA-related files in the <code class="highlighter-rouge">./demoCA</code> directory. Within that directory:</p>
+<p>After answering the question prompts, this will store CA-related files in the <code class="highlighter-rouge">./my-ca</code> directory. Within that directory:</p>
 
 <ul>
-  <li><code class="highlighter-rouge">demoCA/cacert.pem</code> is the public certificate. It is meant to be distributed to all parties involved.</li>
-  <li><code class="highlighter-rouge">demoCA/private/cakey.pem</code> is the private key. This is only needed when signing a new certificate for either broker or clients and it must be safely guarded.</li>
+  <li><code class="highlighter-rouge">certs/ca.cert.pem</code> is the public certificate. It is meant to be distributed to all parties involved.</li>
+  <li><code class="highlighter-rouge">private/ca.key.pem</code> is the private key. This is only needed when signing a new certificate for either broker or clients and it must be safely guarded.</li>
 </ul>
 
-<h3 id="broker-certificate">Broker certificate</h3>
+<h3 id="server-certificate">Server certificate</h3>
 
 <p>Once a CA certificate has been created, you can create certificate requests and sign them with the CA.</p>
 
-<p>The following commands will ask you a few questions and then create the certificates. When asked for the common name, you need to match the hostname of the broker. You could also use a wildcard to match a group of broker hostnames, for example <code class="highlighter-rouge">*.broker.usw.example.com</code>. This ensures that the same certificate can be reused on multiple machines.</p>
+<p>The following commands will ask you a few questions and then create the certificates. When asked for the common name, you should match the hostname of the broker. You could also use a wildcard to match a group of broker hostnames, for example <code class="highlighter-rouge">*.broker.usw.example.com</code>. This ensures that the same certificate can be reused on multiple machines.</p>
 
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl req <span class="se">\</span>
-  <span class="nt">-newkey</span> rsa:2048 <span class="se">\</span>
-  <span class="nt">-sha256</span> <span class="se">\</span>
-  <span class="nt">-nodes</span> <span class="se">\</span>
-  <span class="nt">-out</span> broker-cert.csr <span class="se">\</span>
-  <span class="nt">-outform</span> PEM
-</code></pre></div></div>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<div class="admonition">
+  <div class="info">
+    
+    <p>Sometimes it is not possible or makes no sense to match the hostname, such as when the brokers are created with random hostnames, or you plan to connect to the hosts via their IP. In this case, the client should be configured to disable TLS hostname verification.</p>
 
-<p>Convert the key to <a href="https://en.wikipedia.org/wiki/PKCS_8">PKCS 8</a> format:</p>
+  </div>
+</div>
 
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl pkcs8 <span class="se">\</span>
-  <span class="nt">-topk8</span> <span class="se">\</span>
-  <span class="nt">-inform</span> PEM <span class="se">\</span>
-  <span class="nt">-outform</span> PEM <span class="se">\</span>
-  <span class="nt">-in</span> privkey.pem <span class="se">\</span>
-  <span class="nt">-out</span> broker-key.pem <span class="se">\</span>
-  <span class="nt">-nocrypt</span>
+<p>First generate the key.</p>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl genrsa <span class="nt">-out</span> broker.key.pem 2048
 </code></pre></div></div>
 
-<p>This will create two broker certificate files named <code class="highlighter-rouge">broker-cert.csr</code> and <code class="highlighter-rouge">broker-key.pem</code>. Now you can create the signed certificate:</p>
+<p>The broker expects the key to be in <a href="https://en.wikipedia.org/wiki/PKCS_8">PKCS 8</a> format, so convert it.</p>
 
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl ca <span class="se">\</span>
-  <span class="nt">-out</span> broker-cert.pem <span class="se">\</span>
-  <span class="nt">-infiles</span> broker-cert.csr
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl pkcs8 <span class="nt">-topk8</span> <span class="nt">-inform</span> PEM <span class="nt">-outform</span> PEM <span class="se">\</span>
+      <span class="nt">-in</span> broker.key.pem <span class="nt">-out</span> broker.key-pk8.pem <span class="nt">-nocrypt</span>
 </code></pre></div></div>
 
-<p>At this point, you should have a <code class="highlighter-rouge">broker-cert.pem</code> and <code class="highlighter-rouge">broker-key.pem</code> file. These will be needed for the broker.</p>
+<p>Generate the certificate request…</p>
 
-<h3 id="client-certificate">Client certificate</h3>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl req <span class="nt">-config</span> openssl.cnf <span class="se">\</span>
+      <span class="nt">-key</span> broker.key.pem <span class="nt">-new</span> <span class="nt">-sha256</span> <span class="nt">-out</span> broker.cert.pem
+</code></pre></div></div>
 
-<p>To create a client certificate, repeat the steps in the previous section, but did create <code class="highlighter-rouge">client-cert.pem</code> and <code class="highlighter-rouge">client-key.pem</code> files instead.</p>
+<p>… and sign it with the certificate authority.</p>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl ca <span class="nt">-config</span> openssl.cnf <span class="nt">-extensions</span> server_cert <span class="se">\</span>
+      <span class="nt">-days</span> 1000 <span class="nt">-notext</span> <span class="nt">-md</span> sha256 <span class="se">\</span>
+      <span class="nt">-in</span> broker.csr.pem <span class="nt">-out</span> broker.cert.pem
+</code></pre></div></div>
 
-<p>For the client common name, you need to use a string that you intend to use as the <a href="../overview#role-tokens">role token</a> for this client, though it doesn’t need to match the client hostname.</p>
+<p>At this point, you have a cert, <code class="highlighter-rouge">broker.cert.pem</code>, and a key, <code class="highlighter-rouge">broker.key-pk8.pem</code>, which can be used along with <code class="highlighter-rouge">ca.cert.pem</code> to configure TLS transport encryption for your broker and proxy nodes.</p>
 
-<h2 id="configure-the-broker-for-tls">Configure the broker for TLS</h2>
+<h2 id="broker-configuration">Broker Configuration</h2>
 
-<p>To configure a Pulsar <span class="popover-term" tabindex="0" title="What is a broker?" data-placement="top" data-content="A stateless component of Pulsar clusters that runs two other components: an HTTP server exposing a REST interface for administration and topic lookup and a dispatcher that handles all message transers. Pulsar clusters typically consist of multiple brokers." data-toggle="popover" data-trigger="focus">broker</span> to use TLS authentication, you’ll need to make some [...]
+<p>To configure a Pulsar <span class="popover-term" tabindex="0" title="What is a broker?" data-placement="top" data-content="A stateless component of Pulsar clusters that runs two other components: an HTTP server exposing a REST interface for administration and topic lookup and a dispatcher that handles all message transers. Pulsar clusters typically consist of multiple brokers." data-toggle="popover" data-trigger="focus">broker</span> to use TLS transport encryption, you’ll need to mak [...]
 
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
 
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Enable TLS and point the broker to the right certs
-</span><span class="py">tlsEnabled</span><span class="p">=</span><span class="s">true</span>
-<span class="py">tlsCertificateFilePath</span><span class="p">=</span><span class="s">/path/to/broker-cert.pem</span>
-<span class="py">tlsKeyFilePath</span><span class="p">=</span><span class="s">/path/to/broker-key.pem</span>
-<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/cacert.pem</span>
-
-<span class="c"># Enable the TLS auth provider
-</span><span class="py">authenticationEnabled</span><span class="p">=</span><span class="s">true</span>
-<span class="py">authorizationEnabled</span><span class="p">=</span><span class="s">true</span>
-<span class="py">authenticationProviders</span><span class="p">=</span><span class="s">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">tlsEnabled</span><span class="p">=</span><span class="s">true</span>
+<span class="py">tlsCertificateFilePath</span><span class="p">=</span><span class="s">/path/to/broker.cert.pem</span>
+<span class="py">tlsKeyFilePath</span><span class="p">=</span><span class="s">/path/to/broker.key-pk8.pem</span>
+<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/ca.cert.pem</span>
 </code></pre></div></div>
 
 <!--
@@ -1115,36 +1156,70 @@ referring to 2-way authentication in which the broker also authenticates the cli
   </div>
 </div>
 
-<h2 id="configure-the-discovery-service">Configure the discovery service</h2>
+<h1 id="proxy-configuration">Proxy Configuration</h1>
 
-<p>The <span class="popover-term" tabindex="0" title="What is (service) discovery in Pulsar?" data-placement="top" data-content="A mechanism provided by Pulsar that enables connecting clients to use just a single URL to interact with all the brokers in a cluster." data-toggle="popover" data-trigger="focus">discovery</span> service used by Pulsar brokers needs to redirect all HTTPS requests, which means that it needs to be trusted by the client as well. Add this configuration in <code cla [...]
+<p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">tlsEnabled</span><span class="p">=</span><span class="s">true</span>
-<span class="py">tlsCertificateFilePath</span><span class="p">=</span><span class="s">/path/to/broker-cert.pem</span>
-<span class="py">tlsKeyFilePath</span><span class="p">=</span><span class="s">/path/to/broker-key.pem</span>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># For clients connecting to the proxy
+</span><span class="py">tlsEnabledInProxy</span><span class="p">=</span><span class="s">true</span>
+<span class="py">tlsCertificateFilePath</span><span class="p">=</span><span class="s">/path/to/broker.cert.pem</span>
+<span class="py">tlsKeyFilePath</span><span class="p">=</span><span class="s">/path/to/broker.key-pk8.pem</span>
+<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/ca.cert.pem</span>
+
+<span class="c"># For the proxy to connect to brokers
+</span><span class="py">tlsEnabledWithBroker</span><span class="p">=</span><span class="s">true</span>
+<span class="py">brokerClientTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/ca.cert.pem</span>
 </code></pre></div></div>
 
-<h2 id="configure-clients">Configure clients</h2>
+<h2 id="client-configuration">Client configuration</h2>
 
-<p>For more information on Pulsar client authentication using TLS, see the following language-specific docs:</p>
+<p>When TLS transport encryption is enabled, you need to configure the client to use <code class="highlighter-rouge">https://</code> and port 8443 for the web service URL, and <code class="highlighter-rouge">pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 
-<ul>
-  <li><a href="../../clients/Java">Java client</a></li>
-  <li><a href="../../clients/Cpp">C++ client</a></li>
-</ul>
+<p>As the server certificate you generated above doesn’t belong to any of the default trust chains, you also need to either specify the path the <strong>trust cert</strong> (recommended), or tell the client to allow untrusted server certs.</p>
 
-<h2 id="configure-cli-tools">Configure CLI tools</h2>
+<h3 id="cli-tools">CLI tools</h3>
 
 <p><a href="../../reference/CliTools">Command-line tools</a> like <a href="../../reference/CliTools#pulsar-admin"><code class="highlighter-rouge">pulsar-admin</code></a>, <a href="../../reference/CliTools#pulsar-perf"><code class="highlighter-rouge">pulsar-perf</code></a>, and <a href="../../reference/CliTools#pulsar-client"><code class="highlighter-rouge">pulsar-client</code></a> use the <code class="highlighter-rouge">conf/client.conf</code> config file in a Pulsar installation.</p>
 
-<p>You’ll need to add the following authentication parameters to that file to use TLS with Pulsar’s CLI tools:</p>
+<p>You’ll need to add the following parameters to that file to use TLS transport with Pulsar’s CLI tools:</p>
 
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">serviceUrl</span><span class="p">=</span><span class="s">https://broker.example.com:8443/</span>
-<span class="py">authPlugin</span><span class="p">=</span><span class="s">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
-<span class="py">authParams</span><span class="p">=</span><span class="s">tlsCertFile:/path/to/client-cert.pem,tlsKeyFile:/path/to/client-key.pem</span>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">webServiceUrl</span><span class="p">=</span><span class="s">https://broker.example.com:8443/</span>
+<span class="py">brokerServiceUrl</span><span class="p">=</span><span class="s">pulsar+ssl://broker.example.com:6651/</span>
 <span class="py">useTls</span><span class="p">=</span><span class="s">true</span>
 <span class="py">tlsAllowInsecureConnection</span><span class="p">=</span><span class="s">false</span>
-<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/cacert.pem</span>
+<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/ca.cert.pem</span>
+</code></pre></div></div>
+
+<h3 id="java-client">Java client</h3>
+
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.pulsar.client.api.PulsarClient</span><span class="o">;</span>
+
+<span class="n">PulsarClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">PulsarClient</span><span class="o">.</span><span class="na">builder</span><span class="o">()</span>
+    <span class="o">.</span><span class="na">serviceUrl</span><span class="o">(</span><span class="s">"pulsar+ssl://broker.example.com:6651/"</span><span class="o">)</span>
+    <span class="o">.</span><span class="na">enableTls</span><span class="o">(</span><span class="kc">true</span><span class="o">)</span>
+    <span class="o">.</span><span class="na">tlsTrustCertsFilePath</span><span class="o">(</span><span class="s">"/path/to/ca.cert.pem"</span><span class="o">)</span>
+    <span class="o">.</span><span class="na">build</span><span class="o">();</span>
+</code></pre></div></div>
+
+<h3 id="python-client">Python client</h3>
+
+<div class="language-python highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">from</span> <span class="nn">pulsar</span> <span class="kn">import</span> <span class="n">Client</span>
+
+<span class="n">client</span> <span class="o">=</span> <span class="n">Client</span><span class="p">(</span><span class="s">"pulsar+ssl://broker.example.com:6651/"</span><span class="p">,</span>
+                <span class="n">tls_trust_certs_file_path</span><span class="o">=</span><span class="s">"/path/to/ca.cert.pem"</span><span class="p">,</span>
+                <span class="n">tls_allow_insecure_connection</span><span class="o">=</span><span class="bp">False</span><span class="p">)</span>
+</code></pre></div></div>
+
+<h3 id="c-client">C++ client</h3>
+
+<div class="language-c++ highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">#include &lt;pulsar/Client.h&gt;
+</span>
+<span class="n">pulsar</span><span class="o">::</span><span class="n">ClientConfiguration</span> <span class="n">config</span><span class="p">;</span>
+<span class="n">config</span><span class="p">.</span><span class="n">setUseTls</span><span class="p">(</span><span class="nb">true</span><span class="p">);</span>
+<span class="n">config</span><span class="p">.</span><span class="n">setTlsTrustCertsFilePath</span><span class="p">(</span><span class="s">"/path/to/ca.cert.pem"</span><span class="p">);</span>
+<span class="n">config</span><span class="p">.</span><span class="n">setTlsAllowInsecureConnection</span><span class="p">(</span><span class="nb">false</span><span class="p">);</span>
+
+<span class="n">pulsar</span><span class="o">::</span><span class="n">Client</span> <span class="n">client</span><span class="p">(</span><span class="s">"pulsar+ssl://broker.example.com:6651/"</span><span class="p">,</span> <span class="n">config</span><span class="p">);</span>
 </code></pre></div></div>
 
       </section>
@@ -1153,7 +1228,7 @@ referring to 2-way authentication in which the broker also authenticates the cli
     <nav class="toc-bar hidden-md-down col-lg-2">
       
       <div id="toc">
-        <h4>Encryption and Authentication using TLS</h4>
+        <h4>Transport Encryption using TLS</h4>
       </div>
       
     </nav>
diff --git a/content/docs/latest/security/tls/index.html b/content/docs/latest/security/tls/index.html
index 26dc82f..2e16838 100644
--- a/content/docs/latest/security/tls/index.html
+++ b/content/docs/latest/security/tls/index.html
@@ -43,7 +43,7 @@
     under the License.
 
 -->
-<title>Encryption and Authentication using TLS</title>
+<title>Authentication using TLS</title>
 
 <meta charset="utf-8">
 
@@ -565,8 +565,15 @@
           
           
           <li>
+            <a href="../../security/tls-transport">
+              Transport Encryption with TLS
+            </a>
+          </li>
+          
+          
+          <li>
             <a href="../../security/tls">
-              Encryption and Authentication using TLS
+              Authentication using TLS
             </a>
           </li>
           
@@ -951,7 +958,7 @@
     <article class="col-xs-12 col-sm-12 col-md-12 col-lg-7">
       <section class="docs-header">
         <h1 class="docs-title">
-          Encryption and Authentication using TLS
+          Authentication using TLS
           
           
         </h1>
@@ -985,175 +992,134 @@
 
 -->
 
-<h2 id="tls-overview">TLS Overview</h2>
-
-<p>With <a href="https://en.wikipedia.org/wiki/Transport_Layer_Security">TLS</a> authentication, the server authenticates the client (also called “2-way authentication”).
-Since TLS authentication requires TLS encryption, this page shows you how to configure both at the same time.</p>
-
-<p>By default, Apache Pulsar communicates in plain text service url, which means that all data is sent in the clear.
-To encrypt communication, it is recommended to configure all the Apache Pulsar components in your deployment to use TLS encryption.</p>
+<h2 id="tls-authentication-overview">TLS Authentication Overview</h2>
 
-<p>TLS can be configured for encryption or authentication. You may configure just TLS encryption
-(by default TLS encryption includes certificate authentication of the server) and independently choose a separate mechanism
-for client authentication, e.g. TLS, <a href="../athenz">Athenz</a>, etc. Note that TLS encryption, technically speaking, already enables
-1-way authentication in which the client authenticates the server certificate. So when referring to TLS authentication, it is really
-referring to 2-way authentication in which the broker also authenticates the client certificate.</p>
+<p>TLS authentication is an extension of <a href="../tls-transport">TLS transport encryption</a>, but instead of only servers having keys and certs which the client uses the verify the server’s identity, clients also have keys and certs which the server uses to verify the client’s identity. You must have TLS transport encryption configured on your cluster before you can use TLS authentication. This guide assumes you already have TLS transport encryption configured.</p>
 
-<blockquote>
-  <p>Note that enabling TLS may have a performance impact due to encryption overhead.</p>
-</blockquote>
+<h3 id="creating-client-certificates">Creating client certificates</h3>
 
-<h2 id="creating-tls-certificates">Creating TLS Certificates</h2>
-
-<p>Creating TLS certificates for Pulsar involves creating a <a href="#certificate-authority">certificate authority</a> (CA), <a href="#broker-certificate">broker certificate</a>, and <a href="#client-certificate">client certificate</a>.</p>
-
-<h3 id="certificate-authority">Certificate authority</h3>
-
-<p>The first step is to create the certificate for the CA. The CA will be used to sign both the broker and client certificates, in order to ensure that each party will trust the others.</p>
-
-<h4 id="linux">Linux</h4>
-
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>CA.pl <span class="nt">-newca</span>
-</code></pre></div></div>
+<p>Client certificates are generated using the same certificate authority as was used to generate the server certificates.</p>
 
-<h4 id="macos">macOS</h4>
+<p>The biggest difference between client certs and server certs is that the <strong>common name</strong> for the client certificate is the <strong>role token</strong> which that client will be authenticated as.</p>
 
-<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>/System/Library/OpenSSL/misc/CA.pl <span class="nt">-newca</span>
+<p>First generate the key.</p>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl genrsa <span class="nt">-out</span> admin.key.pem 2048
 </code></pre></div></div>
 
-<p>After answering the question prompts, this will store CA-related files in the <code class="highlighter-rouge">./demoCA</code> directory. Within that directory:</p>
+<p>Similar to the broker, the client expects the key to be in <a href="https://en.wikipedia.org/wiki/PKCS_8">PKCS 8</a> format, so convert it.</p>
 
-<ul>
-  <li><code class="highlighter-rouge">demoCA/cacert.pem</code> is the public certificate. It is meant to be distributed to all parties involved.</li>
-  <li><code class="highlighter-rouge">demoCA/private/cakey.pem</code> is the private key. This is only needed when signing a new certificate for either broker or clients and it must be safely guarded.</li>
-</ul>
-
-<h3 id="broker-certificate">Broker certificate</h3>
-
-<p>Once a CA certificate has been created, you can create certificate requests and sign them with the CA.</p>
-
-<p>The following commands will ask you a few questions and then create the certificates. When asked for the common name, you need to match the hostname of the broker. You could also use a wildcard to match a group of broker hostnames, for example <code class="highlighter-rouge">*.broker.usw.example.com</code>. This ensures that the same certificate can be reused on multiple machines.</p>
-
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl req <span class="se">\</span>
-  <span class="nt">-newkey</span> rsa:2048 <span class="se">\</span>
-  <span class="nt">-sha256</span> <span class="se">\</span>
-  <span class="nt">-nodes</span> <span class="se">\</span>
-  <span class="nt">-out</span> broker-cert.csr <span class="se">\</span>
-  <span class="nt">-outform</span> PEM
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl pkcs8 <span class="nt">-topk8</span> <span class="nt">-inform</span> PEM <span class="nt">-outform</span> PEM <span class="se">\</span>
+      <span class="nt">-in</span> admin.key.pem <span class="nt">-out</span> admin.key-pk8.pem <span class="nt">-nocrypt</span>
 </code></pre></div></div>
 
-<p>Convert the key to <a href="https://en.wikipedia.org/wiki/PKCS_8">PKCS 8</a> format:</p>
+<p>Generate the certificate request. When asked for a <strong>common name</strong>, enter the <strong>role token</strong> which you want this key pair to authenticate a client as.</p>
 
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl pkcs8 <span class="se">\</span>
-  <span class="nt">-topk8</span> <span class="se">\</span>
-  <span class="nt">-inform</span> PEM <span class="se">\</span>
-  <span class="nt">-outform</span> PEM <span class="se">\</span>
-  <span class="nt">-in</span> privkey.pem <span class="se">\</span>
-  <span class="nt">-out</span> broker-key.pem <span class="se">\</span>
-  <span class="nt">-nocrypt</span>
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl req <span class="nt">-config</span> openssl.cnf <span class="se">\</span>
+      <span class="nt">-key</span> admin.key.pem <span class="nt">-new</span> <span class="nt">-sha256</span> <span class="nt">-out</span> admin.cert.pem
 </code></pre></div></div>
 
-<p>This will create two broker certificate files named <code class="highlighter-rouge">broker-cert.csr</code> and <code class="highlighter-rouge">broker-key.pem</code>. Now you can create the signed certificate:</p>
+<p>Sign with request with the certificate authority. Note that that client certs uses the <strong>usr_cert</strong> extension, which allows the cert to be used for client authentication.</p>
 
-<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl ca <span class="se">\</span>
-  <span class="nt">-out</span> broker-cert.pem <span class="se">\</span>
-  <span class="nt">-infiles</span> broker-cert.csr
+<div class="language-bash highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>openssl ca <span class="nt">-config</span> openssl.cnf <span class="nt">-extensions</span> usr_cert <span class="se">\</span>
+      <span class="nt">-days</span> 1000 <span class="nt">-notext</span> <span class="nt">-md</span> sha256 <span class="se">\</span>
+      <span class="nt">-in</span> admin.csr.pem <span class="nt">-out</span> admin.cert.pem
 </code></pre></div></div>
 
-<p>At this point, you should have a <code class="highlighter-rouge">broker-cert.pem</code> and <code class="highlighter-rouge">broker-key.pem</code> file. These will be needed for the broker.</p>
+<p>This will give you a cert, <code class="highlighter-rouge">admin.cert.pem</code>, and a key, <code class="highlighter-rouge">admin.key-pk8.pem</code>, which, with <code class="highlighter-rouge">ca.cert.pem</code>, can be used by clients to authenticate themselves to brokers and proxies as the role token <code class="highlighter-rouge">admin</code>.</p>
 
-<h3 id="client-certificate">Client certificate</h3>
+<h2 id="enabling-tls-authentication-">Enabling TLS Authentication …</h2>
 
-<p>To create a client certificate, repeat the steps in the previous section, but did create <code class="highlighter-rouge">client-cert.pem</code> and <code class="highlighter-rouge">client-key.pem</code> files instead.</p>
+<h3 id="-on-brokers">… on Brokers</h3>
 
-<p>For the client common name, you need to use a string that you intend to use as the <a href="../overview#role-tokens">role token</a> for this client, though it doesn’t need to match the client hostname.</p>
+<p>To configure brokers to authenticate clients, put the following in <code class="highlighter-rouge">broker.conf</code>, alongside <a href="../tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 
-<h2 id="configure-the-broker-for-tls">Configure the broker for TLS</h2>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Configuration to enable authentication
+</span><span class="py">authenticationEnabled</span><span class="p">=</span><span class="s">true</span>
+<span class="py">authenticationProviders</span><span class="p">=</span><span class="s">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+</code></pre></div></div>
 
-<p>To configure a Pulsar <span class="popover-term" tabindex="0" title="What is a broker?" data-placement="top" data-content="A stateless component of Pulsar clusters that runs two other components: an HTTP server exposing a REST interface for administration and topic lookup and a dispatcher that handles all message transers. Pulsar clusters typically consist of multiple brokers." data-toggle="popover" data-trigger="focus">broker</span> to use TLS authentication, you’ll need to make some [...]
+<h3 id="-on-proxies">… on Proxies</h3>
 
-<p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
+<p>To configure proxies to authenticate clients, put the folling in <code class="highlighter-rouge">proxy.conf</code>, alongside <a href="../tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Enable TLS and point the broker to the right certs
-</span><span class="py">tlsEnabled</span><span class="p">=</span><span class="s">true</span>
-<span class="py">tlsCertificateFilePath</span><span class="p">=</span><span class="s">/path/to/broker-cert.pem</span>
-<span class="py">tlsKeyFilePath</span><span class="p">=</span><span class="s">/path/to/broker-key.pem</span>
-<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/cacert.pem</span>
+<p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code class="highlighter-rouge">proxyRoles</code> of the brokers. See the <a href="../authorization">authorization guide</a> for more details.</p>
 
-<span class="c"># Enable the TLS auth provider
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># For clients connecting to the proxy
 </span><span class="py">authenticationEnabled</span><span class="p">=</span><span class="s">true</span>
-<span class="py">authorizationEnabled</span><span class="p">=</span><span class="s">true</span>
 <span class="py">authenticationProviders</span><span class="p">=</span><span class="s">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
-</code></pre></div></div>
 
-<!--
+<span class="c"># For the proxy to connect to brokers
+</span><span class="py">brokerClientAuthenticationPlugin</span><span class="p">=</span><span class="s">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="py">brokerClientAuthenticationParameters</span><span class="p">=</span><span class="s">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
+</code></pre></div></div>
 
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+<h2 id="client-configuration">Client configuration</h2>
 
-      http://www.apache.org/licenses/LICENSE-2.0
+<p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code class="highlighter-rouge">https://</code> and port 8443 for the web service URL, and <code class="highlighter-rouge">pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+<h3 id="cli-tools">CLI tools</h3>
 
--->
+<p><a href="../../reference/CliTools">Command-line tools</a> like <a href="../../reference/CliTools#pulsar-admin"><code class="highlighter-rouge">pulsar-admin</code></a>, <a href="../../reference/CliTools#pulsar-perf"><code class="highlighter-rouge">pulsar-perf</code></a>, and <a href="../../reference/CliTools#pulsar-client"><code class="highlighter-rouge">pulsar-client</code></a> use the <code class="highlighter-rouge">conf/client.conf</code> config file in a Pulsar installation.</p>
 
-<div class="admonition">
-  <div class="info">
-    
-    <p>A full listing of parameters available in the <code class="highlighter-rouge">conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="../../reference/Configuration#broker">Broker Configuration</a>.</p>
+<p>You’ll need to add the following parameters to that file to use TLS authentication with Pulsar’s CLI tools:</p>
 
-  </div>
-</div>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">webServiceUrl</span><span class="p">=</span><span class="s">https://broker.example.com:8443/</span>
+<span class="py">brokerServiceUrl</span><span class="p">=</span><span class="s">pulsar+ssl://broker.example.com:6651/</span>
+<span class="py">useTls</span><span class="p">=</span><span class="s">true</span>
+<span class="py">tlsAllowInsecureConnection</span><span class="p">=</span><span class="s">false</span>
+<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/ca.cert.pem</span>
+<span class="py">authPlugin</span><span class="p">=</span><span class="s">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="py">authParams</span><span class="p">=</span><span class="s">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
+</code></pre></div></div>
 
-<h2 id="configure-the-discovery-service">Configure the discovery service</h2>
+<h3 id="java-client">Java client</h3>
 
-<p>The <span class="popover-term" tabindex="0" title="What is (service) discovery in Pulsar?" data-placement="top" data-content="A mechanism provided by Pulsar that enables connecting clients to use just a single URL to interact with all the brokers in a cluster." data-toggle="popover" data-trigger="focus">discovery</span> service used by Pulsar brokers needs to redirect all HTTPS requests, which means that it needs to be trusted by the client as well. Add this configuration in <code cla [...]
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">import</span> <span class="nn">org.apache.pulsar.client.api.PulsarClient</span><span class="o">;</span>
 
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">tlsEnabled</span><span class="p">=</span><span class="s">true</span>
-<span class="py">tlsCertificateFilePath</span><span class="p">=</span><span class="s">/path/to/broker-cert.pem</span>
-<span class="py">tlsKeyFilePath</span><span class="p">=</span><span class="s">/path/to/broker-key.pem</span>
+<span class="n">PulsarClient</span> <span class="n">client</span> <span class="o">=</span> <span class="n">PulsarClient</span><span class="o">.</span><span class="na">builder</span><span class="o">()</span>
+    <span class="o">.</span><span class="na">serviceUrl</span><span class="o">(</span><span class="s">"pulsar+ssl://broker.example.com:6651/"</span><span class="o">)</span>
+    <span class="o">.</span><span class="na">enableTls</span><span class="o">(</span><span class="kc">true</span><span class="o">)</span>
+    <span class="o">.</span><span class="na">tlsTrustCertsFilePath</span><span class="o">(</span><span class="s">"/path/to/ca.cert.pem"</span><span class="o">)</span>
+    <span class="o">.</span><span class="na">authentication</span><span class="o">(</span><span class="s">"org.apache.pulsar.client.impl.auth.AuthenticationTls"</span><span class="o">,</span>
+                    <span class="s">"tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem"</span><span class="o">)</span>
+    <span class="o">.</span><span class="na">build</span><span class="o">();</span>
 </code></pre></div></div>
 
-<h2 id="configure-clients">Configure clients</h2>
+<h3 id="python-client">Python client</h3>
 
-<p>For more information on Pulsar client authentication using TLS, see the following language-specific docs:</p>
+<div class="language-python highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kn">from</span> <span class="nn">pulsar</span> <span class="kn">import</span> <span class="n">Client</span><span class="p">,</span> <span class="n">AuthenticationTLS</span>
 
-<ul>
-  <li><a href="../../clients/Java">Java client</a></li>
-  <li><a href="../../clients/Cpp">C++ client</a></li>
-</ul>
+<span class="n">auth</span> <span class="o">=</span> <span class="n">AuthenticationTLS</span><span class="p">(</span><span class="s">"/path/to/my-role.cert.pem"</span><span class="p">,</span> <span class="s">"/path/to/my-role.key-pk8.pem"</span><span class="p">)</span>
+<span class="n">client</span> <span class="o">=</span> <span class="n">Client</span><span class="p">(</span><span class="s">"pulsar+ssl://broker.example.com:6651/"</span><span class="p">,</span>
+                <span class="n">tls_trust_certs_file_path</span><span class="o">=</span><span class="s">"/path/to/ca.cert.pem"</span><span class="p">,</span>
+                <span class="n">tls_allow_insecure_connection</span><span class="o">=</span><span class="bp">False</span><span class="p">,</span>
+				<span class="n">authentication</span><span class="o">=</span><span class="n">auth</span><span class="p">)</span>
+</code></pre></div></div>
 
-<h2 id="configure-cli-tools">Configure CLI tools</h2>
+<h3 id="c-client">C++ client</h3>
 
-<p><a href="../../reference/CliTools">Command-line tools</a> like <a href="../../reference/CliTools#pulsar-admin"><code class="highlighter-rouge">pulsar-admin</code></a>, <a href="../../reference/CliTools#pulsar-perf"><code class="highlighter-rouge">pulsar-perf</code></a>, and <a href="../../reference/CliTools#pulsar-client"><code class="highlighter-rouge">pulsar-client</code></a> use the <code class="highlighter-rouge">conf/client.conf</code> config file in a Pulsar installation.</p>
+<div class="language-c++ highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="cp">#include &lt;pulsar/Client.h&gt;
+</span>
+<span class="n">pulsar</span><span class="o">::</span><span class="n">ClientConfiguration</span> <span class="n">config</span><span class="p">;</span>
+<span class="n">config</span><span class="p">.</span><span class="n">setUseTls</span><span class="p">(</span><span class="nb">true</span><span class="p">);</span>
+<span class="n">config</span><span class="p">.</span><span class="n">setTlsTrustCertsFilePath</span><span class="p">(</span><span class="s">"/path/to/ca.cert.pem"</span><span class="p">);</span>
+<span class="n">config</span><span class="p">.</span><span class="n">setTlsAllowInsecureConnection</span><span class="p">(</span><span class="nb">false</span><span class="p">);</span>
 
-<p>You’ll need to add the following authentication parameters to that file to use TLS with Pulsar’s CLI tools:</p>
+<span class="n">pulsar</span><span class="o">::</span><span class="n">AuthenticationPtr</span> <span class="n">auth</span> <span class="o">=</span> <span class="n">pulsar</span><span class="o">::</span><span class="n">AuthTls</span><span class="o">::</span><span class="n">create</span><span class="p">(</span><span class="s">"/path/to/my-role.cert.pem"</span><span class="p">,</span>
+                                                         <span class="s">"/path/to/my-role.key-pk8.pem"</span><span class="p">)</span>
+<span class="n">config</span><span class="p">.</span><span class="n">setAuth</span><span class="p">(</span><span class="n">auth</span><span class="p">);</span>
 
-<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">serviceUrl</span><span class="p">=</span><span class="s">https://broker.example.com:8443/</span>
-<span class="py">authPlugin</span><span class="p">=</span><span class="s">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
-<span class="py">authParams</span><span class="p">=</span><span class="s">tlsCertFile:/path/to/client-cert.pem,tlsKeyFile:/path/to/client-key.pem</span>
-<span class="py">useTls</span><span class="p">=</span><span class="s">true</span>
-<span class="py">tlsAllowInsecureConnection</span><span class="p">=</span><span class="s">false</span>
-<span class="py">tlsTrustCertsFilePath</span><span class="p">=</span><span class="s">/path/to/cacert.pem</span>
+<span class="n">pulsar</span><span class="o">::</span><span class="n">Client</span> <span class="n">client</span><span class="p">(</span><span class="s">"pulsar+ssl://broker.example.com:6651/"</span><span class="p">,</span> <span class="n">config</span><span class="p">);</span>
 </code></pre></div></div>
 
+
       </section>
     </article>
 
     <nav class="toc-bar hidden-md-down col-lg-2">
       
       <div id="toc">
-        <h4>Encryption and Authentication using TLS</h4>
+        <h4>Authentication using TLS</h4>
       </div>
       
     </nav>
diff --git a/content/ja/adaptors/PulsarSpark/index.html b/content/ja/adaptors/PulsarSpark/index.html
index 65c9ef7..34dd969 100644
--- a/content/ja/adaptors/PulsarSpark/index.html
+++ b/content/ja/adaptors/PulsarSpark/index.html
@@ -762,9 +762,11 @@
           
           
           
+          <li><a href="/ja/adaptors/PulsarSpark/">Spark Streaming Pulsar Receiver</a></li>
+          
+          
           
           
-          <li><a href="/ja/adaptors/PulsarSpark/">Spark Streaming Pulsar Receiver</a></li>
           
           
           
@@ -1006,9 +1008,11 @@
           
           
           
+          <li><a href="/ja/adaptors/PulsarSpark/">Spark Streaming Pulsar Receiver</a></li>
+          
+          
           
           
-          <li><a href="/ja/adaptors/PulsarSpark/">Spark Streaming Pulsar Receiver</a></li>
           
           
           
@@ -1220,8 +1224,6 @@
           
           
           
-          
-          
           <li><a href="/ja/clients/Java/">Pulsar Javaクライアント</a></li>
           
           
@@ -1381,6 +1383,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/adaptors/PulsarStorm/index.html b/content/ja/adaptors/PulsarStorm/index.html
index 681e054..d24d155 100644
--- a/content/ja/adaptors/PulsarStorm/index.html
+++ b/content/ja/adaptors/PulsarStorm/index.html
@@ -766,9 +766,11 @@
           
           
           
+          <li><a href="/ja/adaptors/PulsarStorm/">Apache StormのためのPulsarアダプタ</a></li>
+          
+          
           
           
-          <li><a href="/ja/adaptors/PulsarStorm/">Apache StormのためのPulsarアダプタ</a></li>
           
           
           
@@ -976,8 +978,6 @@
           
           
           
-          
-          
           <li><a href="/ja/clients/Java/">Pulsar Javaクライアント</a></li>
           
           
@@ -1137,6 +1137,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/admin/AdminInterface/index.html b/content/ja/admin/AdminInterface/index.html
index 153dc3f..5a8fbe4 100644
--- a/content/ja/admin/AdminInterface/index.html
+++ b/content/ja/admin/AdminInterface/index.html
@@ -692,9 +692,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -762,9 +762,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -792,9 +792,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -948,9 +950,11 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
+          
+          
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -1389,6 +1393,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1480,8 +1486,6 @@
           
           
           
-          
-          
           <li><a href="/ja/clients/Java/">Pulsar Javaクライアント</a></li>
           
           
@@ -1641,6 +1645,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/admin/Authz/index.html b/content/ja/admin/Authz/index.html
index c208d6e..910e23f 100644
--- a/content/ja/admin/Authz/index.html
+++ b/content/ja/admin/Authz/index.html
@@ -692,9 +692,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -762,9 +762,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -792,9 +792,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -1143,6 +1145,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1387,6 +1391,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1631,6 +1637,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1875,6 +1883,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1966,8 +1976,6 @@
           
           
           
-          
-          
           <li><a href="/ja/clients/Java/">Pulsar Javaクライアント</a></li>
           
           
@@ -2127,6 +2135,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
@@ -2200,9 +2212,11 @@
           
           
           
+          <li><a href="/ja/clients/Cpp/">Pulsar C++クライアント</a></li>
+          
+          
           
           
-          <li><a href="/ja/clients/Cpp/">Pulsar C++クライアント</a></li>
           
           
           
diff --git a/content/ja/admin/ClustersBrokers/index.html b/content/ja/admin/ClustersBrokers/index.html
index 5b03a7e..ad4bdb4 100644
--- a/content/ja/admin/ClustersBrokers/index.html
+++ b/content/ja/admin/ClustersBrokers/index.html
@@ -692,9 +692,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -762,9 +762,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -792,9 +792,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -1143,6 +1145,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1387,6 +1391,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1631,6 +1637,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1875,6 +1883,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -2119,6 +2129,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/admin/PropertiesNamespaces/index.html b/content/ja/admin/PropertiesNamespaces/index.html
index 61590f1..807551e 100644
--- a/content/ja/admin/PropertiesNamespaces/index.html
+++ b/content/ja/admin/PropertiesNamespaces/index.html
@@ -885,6 +885,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1129,6 +1131,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
@@ -1180,9 +1184,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -1250,9 +1254,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -1280,9 +1284,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
diff --git a/content/ja/advanced/PartitionedTopics/index.html b/content/ja/advanced/PartitionedTopics/index.html
index 176e9fe..4297a12 100644
--- a/content/ja/advanced/PartitionedTopics/index.html
+++ b/content/ja/advanced/PartitionedTopics/index.html
@@ -752,9 +752,11 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -996,9 +998,11 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -1180,9 +1184,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -1250,9 +1254,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -1280,9 +1284,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -1498,9 +1504,11 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
diff --git a/content/ja/advanced/RetentionExpiry/index.html b/content/ja/advanced/RetentionExpiry/index.html
index c33900b..fd6137c 100644
--- a/content/ja/advanced/RetentionExpiry/index.html
+++ b/content/ja/advanced/RetentionExpiry/index.html
@@ -692,9 +692,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -762,9 +762,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -792,9 +792,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -1036,9 +1038,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -1280,9 +1284,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -1524,9 +1530,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
diff --git a/content/ja/clients/Cpp/index.html b/content/ja/clients/Cpp/index.html
index 79441b3..e6411a1 100644
--- a/content/ja/clients/Cpp/index.html
+++ b/content/ja/clients/Cpp/index.html
@@ -688,8 +688,6 @@
           
           
           
-          
-          
           <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
@@ -891,6 +889,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
@@ -964,9 +966,11 @@
           
           
           
+          <li><a href="/ja/clients/Cpp/">Pulsar C++クライアント</a></li>
+          
+          
           
           
-          <li><a href="/ja/clients/Cpp/">Pulsar C++クライアント</a></li>
           
           
           
diff --git a/content/ja/clients/Java/index.html b/content/ja/clients/Java/index.html
index e43b89e..e543182 100644
--- a/content/ja/clients/Java/index.html
+++ b/content/ja/clients/Java/index.html
@@ -688,8 +688,6 @@
           
           
           
-          
-          
           <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
@@ -891,6 +889,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
@@ -982,8 +984,6 @@
           
           
           
-          
-          
           <li><a href="/ja/clients/Java/">Pulsar Javaクライアント</a></li>
           
           
@@ -1143,6 +1143,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/clients/Python/index.html b/content/ja/clients/Python/index.html
index 297bfdf..ed49516 100644
--- a/content/ja/clients/Python/index.html
+++ b/content/ja/clients/Python/index.html
@@ -688,8 +688,6 @@
           
           
           
-          
-          
           <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
@@ -891,6 +889,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
@@ -1020,8 +1022,6 @@
           
           
           
-          
-          
           <li><a href="/ja/clients/Python/">Pulsar Pythonクライアント</a></li>
           
           
@@ -1137,6 +1137,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/clients/WebSocket/index.html b/content/ja/clients/WebSocket/index.html
index 7ad0602..b7b7730 100644
--- a/content/ja/clients/WebSocket/index.html
+++ b/content/ja/clients/WebSocket/index.html
@@ -790,9 +790,11 @@
           
           
           
+          <li><a href="/ja/clients/WebSocket/">PulsarにおけるWebSocket API</a></li>
+          
+          
           
           
-          <li><a href="/ja/clients/WebSocket/">PulsarにおけるWebSocket API</a></li>
           
           
           
@@ -1034,9 +1036,11 @@
           
           
           
+          <li><a href="/ja/clients/WebSocket/">PulsarにおけるWebSocket API</a></li>
+          
+          
           
           
-          <li><a href="/ja/clients/WebSocket/">PulsarにおけるWebSocket API</a></li>
           
           
           
@@ -1258,8 +1262,6 @@
           
           
           
-          
-          
           <li><a href="/ja/clients/Python/">Pulsar Pythonクライアント</a></li>
           
           
@@ -1375,6 +1377,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/deployment/InstanceSetup/index.html b/content/ja/deployment/InstanceSetup/index.html
index 69fcad5..6499654 100644
--- a/content/ja/deployment/InstanceSetup/index.html
+++ b/content/ja/deployment/InstanceSetup/index.html
@@ -692,9 +692,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -762,9 +762,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -792,9 +792,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -1143,6 +1145,8 @@
           
           
           
+          
+          
         </ul>
       </div>
     </div>
diff --git a/content/ja/deployment/Kubernetes/index.html b/content/ja/deployment/Kubernetes/index.html
index 1aac0af..dd736d4 100644
--- a/content/ja/deployment/Kubernetes/index.html
+++ b/content/ja/deployment/Kubernetes/index.html
@@ -734,9 +734,11 @@
           
           
           
+          <li><a href="/ja/deployment/Kubernetes/">Kubernetes上でのPulsarのデプロイ</a></li>
+          
+          
           
           
-          <li><a href="/ja/deployment/Kubernetes/">Kubernetes上でのPulsarのデプロイ</a></li>
           
           
           
@@ -978,9 +980,11 @@
           
           
           
+          <li><a href="/ja/deployment/Kubernetes/">Kubernetes上でのPulsarのデプロイ</a></li>
+          
+          
           
           
-          <li><a href="/ja/deployment/Kubernetes/">Kubernetes上でのPulsarのデプロイ</a></li>
           
           
           
diff --git a/content/ja/getting-started/ConceptsAndArchitecture/index.html b/content/ja/getting-started/ConceptsAndArchitecture/index.html
index 104ebea..6c57f6a 100644
--- a/content/ja/getting-started/ConceptsAndArchitecture/index.html
+++ b/content/ja/getting-started/ConceptsAndArchitecture/index.html
@@ -704,9 +704,11 @@
           
           
           
+          <li><a href="/ja/getting-started/ConceptsAndArchitecture/">Pulsarのコンセプトとアーキテクチャ</a></li>
+          
+          
           
           
-          <li><a href="/ja/getting-started/ConceptsAndArchitecture/">Pulsarのコンセプトとアーキテクチャ</a></li>
           
           
           
diff --git a/content/ja/getting-started/LocalCluster/index.html b/content/ja/getting-started/LocalCluster/index.html
index a6fdf5c..f3a8dca 100644
--- a/content/ja/getting-started/LocalCluster/index.html
+++ b/content/ja/getting-started/LocalCluster/index.html
@@ -740,9 +740,11 @@
           
           
           
+          <li><a href="/ja/getting-started/LocalCluster/">ローカルスタンドアローンクラスタのセットアップ</a></li>
+          
+          
           
           
-          <li><a href="/ja/getting-started/LocalCluster/">ローカルスタンドアローンクラスタのセットアップ</a></li>
           
           
           
@@ -984,9 +986,11 @@
           
           
           
+          <li><a href="/ja/getting-started/LocalCluster/">ローカルスタンドアローンクラスタのセットアップ</a></li>
+          
+          
           
           
-          <li><a href="/ja/getting-started/LocalCluster/">ローカルスタンドアローンクラスタのセットアップ</a></li>
           
           
           
diff --git a/content/ja/project/BinaryProtocol/index.html b/content/ja/project/BinaryProtocol/index.html
index 04534d1..f2a8f00 100644
--- a/content/ja/project/BinaryProtocol/index.html
+++ b/content/ja/project/BinaryProtocol/index.html
@@ -684,9 +684,11 @@
           
           
           
+          <li><a href="/ja/project/BinaryProtocol/">Pulsarのバイナリプロトコルの仕様</a></li>
+          
+          
           
           
-          <li><a href="/ja/project/BinaryProtocol/">Pulsarのバイナリプロトコルの仕様</a></li>
           
           
           
@@ -928,9 +930,11 @@
           
           
           
+          <li><a href="/ja/project/BinaryProtocol/">Pulsarのバイナリプロトコルの仕様</a></li>
+          
+          
           
           
-          <li><a href="/ja/project/BinaryProtocol/">Pulsarのバイナリプロトコルの仕様</a></li>
           
           
           
diff --git a/content/ja/project/SimulationTools/index.html b/content/ja/project/SimulationTools/index.html
index fe66f49..e5a28bb 100644
--- a/content/ja/project/SimulationTools/index.html
+++ b/content/ja/project/SimulationTools/index.html
@@ -782,9 +782,11 @@
           
           
           
+          <li><a href="/ja/project/SimulationTools/">シミュレーションツール</a></li>
+          
+          
           
           
-          <li><a href="/ja/project/SimulationTools/">シミュレーションツール</a></li>
           
           
           
diff --git a/content/ja/reference/CliTools/index.html b/content/ja/reference/CliTools/index.html
index 2d817ec..eb25626 100644
--- a/content/ja/reference/CliTools/index.html
+++ b/content/ja/reference/CliTools/index.html
@@ -692,9 +692,9 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -762,9 +762,9 @@
           
           
           
+          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
-          <li><a href="/ja/advanced/PartitionedTopics/">パーティションドトピック</a></li>
           
           
           
@@ -792,9 +792,11 @@
           
           
           
+          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
+          
+          
           
           
-          <li><a href="/ja/advanced/RetentionExpiry/">メッセージの保存と有効期限</a></li>
           
           
           
@@ -948,9 +950,11 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
+          
+          
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -1192,8 +1196,6 @@
           
           
           
-          
-          
           <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
@@ -1395,6 +1397,10 @@
           
           
           
+          
+          
+          
+          
         </ul>
       </div>
     </div>
@@ -1442,9 +1448,11 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
+          
+          
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -1686,9 +1694,11 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
+          
+          
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
@@ -1930,9 +1940,11 @@
           
           
           
+          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
+          
+          
           
           
-          <li><a href="/ja/reference/CliTools/">Pulsarコマンドラインツール</a></li>
           
           
           
diff --git a/content/staging/docs/en/client-libraries-cpp.html b/content/staging/docs/en/client-libraries-cpp.html
index 3d73664..f201876 100644
--- a/content/staging/docs/en/client-libraries-cpp.html
+++ b/content/staging/docs/en/client-libraries-cpp.html
@@ -36,13 +36,51 @@
         </script></nav></div><div class="container mainContainer"><div class="wrapper"><div class="post"><header class="postHeader"><a class="edit-page-link button" href="https://github.com/apache/incubator-pulsar/edit/master/site2/docs/client-libraries-cpp.md" target="_blank" rel="noreferrer noopener">Edit</a><h1 class="postHeaderTitle">The Pulsar C++ client</h1></header><article><div><span><h2><a class="anchor" aria-hidden="true" id="supported-platforms"></a><a href="#supported-platfor [...]
 <p>The Pulsar C++ client has been successfully tested on <strong>MacOS</strong> and <strong>Linux</strong>.</p>
 <h2><a class="anchor" aria-hidden="true" id="linux"></a><a href="#linux" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
+<h3><a class="anchor" aria-hidden="true" id="install"></a><a href="#install" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1- [...]
+<blockquote>
+<p>Since 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can choose download
+and install those packages instead of building them yourself.</p>
+</blockquote>
+<h4><a class="anchor" aria-hidden="true" id="rpm"></a><a href="#rpm" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<table>
+<thead>
+<tr><th>Link</th><th>Crypto files</th></tr>
+</thead>
+<tbody>
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-2.1.0-1_incubating.x86_64.rpm">client</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-2.1.0-1_incubating.x86_64.rpm.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pul [...]
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-debuginfo-2.1.0-1_incubating.x86_64.rpm">client-debuginfo</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-debuginfo-2.1.0-1_incubating.x86_64.rpm.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=d [...]
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-devel-2.1.0-1_incubating.x86_64.rpm">client-devel</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-devel-2.1.0-1_incubating.x86_64.rpm.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&file [...]
+</tbody>
+</table>
+<p>To install a RPM package, down the RPM packages and install them using following command:</p>
+<pre><code class="hljs css languages- bash">$ rpm -ivh apache-pulsar-client*.rpm
+</code></pre>
+<h4><a class="anchor" aria-hidden="true" id="deb"></a><a href="#deb" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<table>
+<thead>
+<tr><th>Link</th><th>Crypto files</th></tr>
+</thead>
+<tbody>
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client.deb">client</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client.deb.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client.d [...]
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client-dev.deb">client-devel</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client-dev.deb.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-p [...]
+</tbody>
+</table>
+<p>To install a RPM package, down the DEB packages and install them using following command:</p>
+<pre><code class="hljs css languages- bash">$ apt-install apache-pulsar-client*.deb
+</code></pre>
+<h3><a class="anchor" aria-hidden="true" id="build"></a><a href="#build" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
+<blockquote>
+<p>If you want to build RPM and Debian packages off latest master, you can follow the instructions
+below to do so. All the instructions are run at the root directory of your cloned Pulsar
+repo.</p>
+</blockquote>
 <p>There are recipes that build RPM and Debian packages containing a
 statically linked <code>libpulsar.so</code> / <code>libpulsar.a</code> with all the required
 dependencies.</p>
 <p>To build the C++ library packages, first build the Java packages:</p>
 <pre><code class="hljs css languages- shell">mvn install -DskipTests
 </code></pre>
-<h4><a class="anchor" aria-hidden="true" id="rpm"></a><a href="#rpm" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<h4><a class="anchor" aria-hidden="true" id="rpm-1"></a><a href="#rpm-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
 <pre><code class="hljs css languages- shell">pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
 </code></pre>
 <p>This will build the RPM inside a Docker container and it will leave the RPMs
@@ -57,7 +95,7 @@ in <code>pulsar-client-cpp/pkg/rpm/RPMS/x86_64/</code>.</p>
 <tr><td>pulsar-client-debuginfo</td><td>Debug symbols for <code>libpulsar.so</code></td></tr>
 </tbody>
 </table>
-<h4><a class="anchor" aria-hidden="true" id="deb"></a><a href="#deb" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<h4><a class="anchor" aria-hidden="true" id="deb-1"></a><a href="#deb-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
 <p>To build Debian packages:</p>
 <pre><code class="hljs css languages- shell">pulsar-client-cpp/pkg/deb/docker-build-deb.sh
 </code></pre>
@@ -139,7 +177,7 @@ config.setAuth(pulsar::AuthTls::create(
 
 <span class="hljs-function">Client <span class="hljs-title">client</span><span class="hljs-params">(<span class="hljs-string">"pulsar+ssl://my-broker.com:6651"</span>, config)</span></span>;
 </code></pre>
-</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/staging/docs/en/client-libraries-python">← The Pulsar Python client</a><a class="docs-next button" href="/staging/docs/en/client-libraries-websocket">Pulsar&#x27;s WebSocket API →</a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#supported-platforms">Supported platforms</a></li><li><a href="#linux">Linux</a></li><li><a href="#macos">MacOS</a></li><li><a href="#conne [...]
+</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/staging/docs/en/client-libraries-python">← The Pulsar Python client</a><a class="docs-next button" href="/staging/docs/en/client-libraries-websocket">Pulsar&#x27;s WebSocket API →</a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#supported-platforms">Supported platforms</a></li><li><a href="#linux">Linux</a><ul class="toc-headings"><li><a href="#install">Install</a> [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
         '<li>' +
diff --git a/content/staging/docs/en/client-libraries-cpp/index.html b/content/staging/docs/en/client-libraries-cpp/index.html
index 3d73664..f201876 100644
--- a/content/staging/docs/en/client-libraries-cpp/index.html
+++ b/content/staging/docs/en/client-libraries-cpp/index.html
@@ -36,13 +36,51 @@
         </script></nav></div><div class="container mainContainer"><div class="wrapper"><div class="post"><header class="postHeader"><a class="edit-page-link button" href="https://github.com/apache/incubator-pulsar/edit/master/site2/docs/client-libraries-cpp.md" target="_blank" rel="noreferrer noopener">Edit</a><h1 class="postHeaderTitle">The Pulsar C++ client</h1></header><article><div><span><h2><a class="anchor" aria-hidden="true" id="supported-platforms"></a><a href="#supported-platfor [...]
 <p>The Pulsar C++ client has been successfully tested on <strong>MacOS</strong> and <strong>Linux</strong>.</p>
 <h2><a class="anchor" aria-hidden="true" id="linux"></a><a href="#linux" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
+<h3><a class="anchor" aria-hidden="true" id="install"></a><a href="#install" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1- [...]
+<blockquote>
+<p>Since 2.1.0 release, Pulsar ships pre-built RPM and Debian packages. You can choose download
+and install those packages instead of building them yourself.</p>
+</blockquote>
+<h4><a class="anchor" aria-hidden="true" id="rpm"></a><a href="#rpm" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<table>
+<thead>
+<tr><th>Link</th><th>Crypto files</th></tr>
+</thead>
+<tbody>
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-2.1.0-1_incubating.x86_64.rpm">client</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-2.1.0-1_incubating.x86_64.rpm.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pul [...]
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-debuginfo-2.1.0-1_incubating.x86_64.rpm">client-debuginfo</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-debuginfo-2.1.0-1_incubating.x86_64.rpm.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=d [...]
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-devel-2.1.0-1_incubating.x86_64.rpm">client-devel</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/RPMS/apache-pulsar-client-devel-2.1.0-1_incubating.x86_64.rpm.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&file [...]
+</tbody>
+</table>
+<p>To install a RPM package, down the RPM packages and install them using following command:</p>
+<pre><code class="hljs css languages- bash">$ rpm -ivh apache-pulsar-client*.rpm
+</code></pre>
+<h4><a class="anchor" aria-hidden="true" id="deb"></a><a href="#deb" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<table>
+<thead>
+<tr><th>Link</th><th>Crypto files</th></tr>
+</thead>
+<tbody>
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client.deb">client</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client.deb.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client.d [...]
+<tr><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client-dev.deb">client-devel</a></td><td><a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-pulsar-client-dev.deb.asc">asc</a>, <a href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=incubator/pulsar/pulsar-2.1.0-incubating/DEB/apache-p [...]
+</tbody>
+</table>
+<p>To install a RPM package, down the DEB packages and install them using following command:</p>
+<pre><code class="hljs css languages- bash">$ apt-install apache-pulsar-client*.deb
+</code></pre>
+<h3><a class="anchor" aria-hidden="true" id="build"></a><a href="#build" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
+<blockquote>
+<p>If you want to build RPM and Debian packages off latest master, you can follow the instructions
+below to do so. All the instructions are run at the root directory of your cloned Pulsar
+repo.</p>
+</blockquote>
 <p>There are recipes that build RPM and Debian packages containing a
 statically linked <code>libpulsar.so</code> / <code>libpulsar.a</code> with all the required
 dependencies.</p>
 <p>To build the C++ library packages, first build the Java packages:</p>
 <pre><code class="hljs css languages- shell">mvn install -DskipTests
 </code></pre>
-<h4><a class="anchor" aria-hidden="true" id="rpm"></a><a href="#rpm" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<h4><a class="anchor" aria-hidden="true" id="rpm-1"></a><a href="#rpm-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
 <pre><code class="hljs css languages- shell">pulsar-client-cpp/pkg/rpm/docker-build-rpm.sh
 </code></pre>
 <p>This will build the RPM inside a Docker container and it will leave the RPMs
@@ -57,7 +95,7 @@ in <code>pulsar-client-cpp/pkg/rpm/RPMS/x86_64/</code>.</p>
 <tr><td>pulsar-client-debuginfo</td><td>Debug symbols for <code>libpulsar.so</code></td></tr>
 </tbody>
 </table>
-<h4><a class="anchor" aria-hidden="true" id="deb"></a><a href="#deb" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.2 [...]
+<h4><a class="anchor" aria-hidden="true" id="deb-1"></a><a href="#deb-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
 <p>To build Debian packages:</p>
 <pre><code class="hljs css languages- shell">pulsar-client-cpp/pkg/deb/docker-build-deb.sh
 </code></pre>
@@ -139,7 +177,7 @@ config.setAuth(pulsar::AuthTls::create(
 
 <span class="hljs-function">Client <span class="hljs-title">client</span><span class="hljs-params">(<span class="hljs-string">"pulsar+ssl://my-broker.com:6651"</span>, config)</span></span>;
 </code></pre>
-</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/staging/docs/en/client-libraries-python">← The Pulsar Python client</a><a class="docs-next button" href="/staging/docs/en/client-libraries-websocket">Pulsar&#x27;s WebSocket API →</a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#supported-platforms">Supported platforms</a></li><li><a href="#linux">Linux</a></li><li><a href="#macos">MacOS</a></li><li><a href="#conne [...]
+</span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/staging/docs/en/client-libraries-python">← The Pulsar Python client</a><a class="docs-next button" href="/staging/docs/en/client-libraries-websocket">Pulsar&#x27;s WebSocket API →</a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#supported-platforms">Supported platforms</a></li><li><a href="#linux">Linux</a><ul class="toc-headings"><li><a href="#install">Install</a> [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
         '<li>' +
diff --git a/content/staging/docs/en/client-libraries-go.html b/content/staging/docs/en/client-libraries-go.html
index 402ee3e..d1e406e 100644
--- a/content/staging/docs/en/client-libraries-go.html
+++ b/content/staging/docs/en/client-libraries-go.html
@@ -42,11 +42,19 @@
 <h3><a class="anchor" aria-hidden="true" id="requirements"></a><a href="#requirements" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Pulsar Go client library is based on the C++ client library. Follow
 the instructions for <a href="/staging/docs/en/client-libraries-cpp">C++ library</a> for installing the binaries
-through RPM, Deb or Homebrew packages.</p>
+through <a href="/staging/docs/en/client-libraries-cpp#rpm">RPM</a>, <a href="/staging/docs/en/client-libraries-cpp#deb">Deb</a> or <a href="/staging/docs/en/client-libraries-cpp#macos">Homebrew packages</a>.</p>
 <h3><a class="anchor" aria-hidden="true" id="installing-go-package"></a><a href="#installing-go-package" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <p>You can install the <code>pulsar</code> library locally using <code>go get</code>:</p>
+<blockquote>
+<h4><a class="anchor" aria-hidden="true" id="note"></a><a href="#note" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6 [...]
+<p><code>go get</code> doesn't support fetching a specific tag. so it will always pull in pulsar go client
+from latest master. You need to make sure you have installed the right pulsar cpp client library.</p>
+</blockquote>
 <pre><code class="hljs css languages- bash">$ go get -u github.com/apache/incubator-pulsar/pulsar-client-go/pulsar
 </code></pre>
+<p>Or you can use <a href="https://github.com/golang/dep">dep</a> for managing the dependencies.</p>
+<pre><code class="hljs css languages- bash">$ dep ensure -add github.com/apache/incubator-pulsar/pulsar-client-go/pulsar@v{{pulsar.version}}
+</code></pre>
 <p>Once installed locally, you can import it into your project:</p>
 <pre><code class="hljs css languages- go"><span class="hljs-keyword">import</span> <span class="hljs-string">"github.com/apache/incubator-pulsar/pulsar-client-go/pulsar"</span>
 </code></pre>
diff --git a/content/staging/docs/en/client-libraries-go/index.html b/content/staging/docs/en/client-libraries-go/index.html
index 402ee3e..d1e406e 100644
--- a/content/staging/docs/en/client-libraries-go/index.html
+++ b/content/staging/docs/en/client-libraries-go/index.html
@@ -42,11 +42,19 @@
 <h3><a class="anchor" aria-hidden="true" id="requirements"></a><a href="#requirements" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Pulsar Go client library is based on the C++ client library. Follow
 the instructions for <a href="/staging/docs/en/client-libraries-cpp">C++ library</a> for installing the binaries
-through RPM, Deb or Homebrew packages.</p>
+through <a href="/staging/docs/en/client-libraries-cpp#rpm">RPM</a>, <a href="/staging/docs/en/client-libraries-cpp#deb">Deb</a> or <a href="/staging/docs/en/client-libraries-cpp#macos">Homebrew packages</a>.</p>
 <h3><a class="anchor" aria-hidden="true" id="installing-go-package"></a><a href="#installing-go-package" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <p>You can install the <code>pulsar</code> library locally using <code>go get</code>:</p>
+<blockquote>
+<h4><a class="anchor" aria-hidden="true" id="note"></a><a href="#note" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6 [...]
+<p><code>go get</code> doesn't support fetching a specific tag. so it will always pull in pulsar go client
+from latest master. You need to make sure you have installed the right pulsar cpp client library.</p>
+</blockquote>
 <pre><code class="hljs css languages- bash">$ go get -u github.com/apache/incubator-pulsar/pulsar-client-go/pulsar
 </code></pre>
+<p>Or you can use <a href="https://github.com/golang/dep">dep</a> for managing the dependencies.</p>
+<pre><code class="hljs css languages- bash">$ dep ensure -add github.com/apache/incubator-pulsar/pulsar-client-go/pulsar@v{{pulsar.version}}
+</code></pre>
 <p>Once installed locally, you can import it into your project:</p>
 <pre><code class="hljs css languages- go"><span class="hljs-keyword">import</span> <span class="hljs-string">"github.com/apache/incubator-pulsar/pulsar-client-go/pulsar"</span>
 </code></pre>
diff --git a/content/staging/docs/en/client-libraries-python.html b/content/staging/docs/en/client-libraries-python.html
index 62d185b..759e4c1 100644
--- a/content/staging/docs/en/client-libraries-python.html
+++ b/content/staging/docs/en/client-libraries-python.html
@@ -38,7 +38,7 @@
 <p>You can install the <a href="https://pypi.python.org/pypi/pulsar-client"><code>pulsar-client</code></a> library either via <a href="https://pypi.python.org/pypi">PyPi</a>, using <a href="#installation-using-pip">pip</a>, or by building the library from source.</p>
 <h3><a class="anchor" aria-hidden="true" id="installation-using-pip"></a><a href="#installation-using-pip" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <p>To install the <code>pulsar-client</code> library as a pre-built package using the <a href="https://pip.pypa.io/en/stable/">pip</a> package manager:</p>
-<pre><code class="hljs css languages- shell"><span class="hljs-meta">$</span><span class="bash"> pip install pulsar-client --upgrade</span>
+<pre><code class="hljs css languages- shell"><span class="hljs-meta">$</span><span class="bash"> pip install pulsar-client==2.1.0</span>
 </code></pre>
 <p>Installation via PyPi is available for the following Python versions:</p>
 <table>
diff --git a/content/staging/docs/en/client-libraries-python/index.html b/content/staging/docs/en/client-libraries-python/index.html
index 62d185b..759e4c1 100644
--- a/content/staging/docs/en/client-libraries-python/index.html
+++ b/content/staging/docs/en/client-libraries-python/index.html
@@ -38,7 +38,7 @@
 <p>You can install the <a href="https://pypi.python.org/pypi/pulsar-client"><code>pulsar-client</code></a> library either via <a href="https://pypi.python.org/pypi">PyPi</a>, using <a href="#installation-using-pip">pip</a>, or by building the library from source.</p>
 <h3><a class="anchor" aria-hidden="true" id="installation-using-pip"></a><a href="#installation-using-pip" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <p>To install the <code>pulsar-client</code> library as a pre-built package using the <a href="https://pip.pypa.io/en/stable/">pip</a> package manager:</p>
-<pre><code class="hljs css languages- shell"><span class="hljs-meta">$</span><span class="bash"> pip install pulsar-client --upgrade</span>
+<pre><code class="hljs css languages- shell"><span class="hljs-meta">$</span><span class="bash"> pip install pulsar-client==2.1.0</span>
 </code></pre>
 <p>Installation via PyPi is available for the following Python versions:</p>
 <table>
diff --git a/content/staging/docs/en/client-libraries.html b/content/staging/docs/en/client-libraries.html
index 4e3cac4..d7602ee 100644
--- a/content/staging/docs/en/client-libraries.html
+++ b/content/staging/docs/en/client-libraries.html
@@ -59,7 +59,7 @@
 <p>There are also <a href="https://github.com/BurntSushi/pdoc">pdoc</a>-generated API docs for the Python client <a href="/api/python">here</a>.</p>
 <h2><a class="anchor" aria-hidden="true" id="c-client"></a><a href="#c-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>For a tutorial on using the Pulsar C++ clent, see <a href="/staging/docs/en/client-libraries-cpp">The Pulsar C++ client</a>.</p>
-<p>There are also <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a>-generated API docs for the C++ client [here]({{ site.baseurl }}api/cpp).</p>
+<p>There are also <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a>-generated API docs for the C++ client <a href="/api/cpp">here</a>.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/staging/docs/en/standalone-docker">← Start a standalone cluster with Docker</a><a class="docs-next button" href="/staging/docs/en/concepts-overview">Pulsar Overview →</a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#java-client">Java client</a></li><li><a href="#go-client">Go client</a></li><li><a href="#python-client">Python client</a></li><li><a href="#c-client"> [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/staging/docs/en/client-libraries/index.html b/content/staging/docs/en/client-libraries/index.html
index 4e3cac4..d7602ee 100644
--- a/content/staging/docs/en/client-libraries/index.html
+++ b/content/staging/docs/en/client-libraries/index.html
@@ -59,7 +59,7 @@
 <p>There are also <a href="https://github.com/BurntSushi/pdoc">pdoc</a>-generated API docs for the Python client <a href="/api/python">here</a>.</p>
 <h2><a class="anchor" aria-hidden="true" id="c-client"></a><a href="#c-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>For a tutorial on using the Pulsar C++ clent, see <a href="/staging/docs/en/client-libraries-cpp">The Pulsar C++ client</a>.</p>
-<p>There are also <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a>-generated API docs for the C++ client [here]({{ site.baseurl }}api/cpp).</p>
+<p>There are also <a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a>-generated API docs for the C++ client <a href="/api/cpp">here</a>.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/staging/docs/en/standalone-docker">← Start a standalone cluster with Docker</a><a class="docs-next button" href="/staging/docs/en/concepts-overview">Pulsar Overview →</a></div></div></div><nav class="onPageNav"><ul class="toc-headings"><li><a href="#java-client">Java client</a></li><li><a href="#go-client">Go client</a></li><li><a href="#python-client">Python client</a></li><li><a href="#c-client"> [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/staging/swagger/swagger.json b/content/staging/swagger/swagger.json
index 224b470..1d4f46d 100644
--- a/content/staging/swagger/swagger.json
+++ b/content/staging/swagger/swagger.json
@@ -6418,27 +6418,19 @@
           "type" : "number",
           "format" : "double"
         },
-        "cpu" : {
+        "bandwidthIn" : {
           "$ref" : "#/definitions/ResourceUsage"
         },
-        "msgThroughputIn" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "msgThroughputOut" : {
-          "type" : "number",
-          "format" : "double"
-        },
-        "memory" : {
+        "bandwidthOut" : {
           "$ref" : "#/definitions/ResourceUsage"
         },
-        "directMemory" : {
+        "memory" : {
           "$ref" : "#/definitions/ResourceUsage"
         },
-        "bandwidthIn" : {
+        "cpu" : {
           "$ref" : "#/definitions/ResourceUsage"
         },
-        "bandwidthOut" : {
+        "directMemory" : {
           "$ref" : "#/definitions/ResourceUsage"
         },
         "lastUpdate" : {
@@ -6451,6 +6443,14 @@
         "overLoaded" : {
           "type" : "boolean"
         },
+        "msgThroughputIn" : {
+          "type" : "number",
+          "format" : "double"
+        },
+        "msgThroughputOut" : {
+          "type" : "number",
+          "format" : "double"
+        },
         "loadReportType" : {
           "type" : "string"
         }
@@ -6612,13 +6612,13 @@
           "type" : "number",
           "format" : "double"
         },
-        "connectedSince" : {
+        "producerName" : {
           "type" : "string"
         },
-        "clientVersion" : {
+        "connectedSince" : {
           "type" : "string"
         },
-        "producerName" : {
+        "clientVersion" : {
           "type" : "string"
         },
         "address" : {
@@ -7291,13 +7291,13 @@
             "type" : "string"
           }
         },
-        "connectedSince" : {
+        "producerName" : {
           "type" : "string"
         },
-        "clientVersion" : {
+        "connectedSince" : {
           "type" : "string"
         },
-        "producerName" : {
+        "clientVersion" : {
           "type" : "string"
         },
         "address" : {


Mime
View raw message