You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/01/31 06:23:06 UTC

[incubator-pulsar] branch asf-site updated: Updated site at revision 8d159ef

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 014426c  Updated site at revision 8d159ef
014426c is described below

commit 014426cbd4d575643668622c7df197b97e97a540
Author: jenkins <bu...@apache.org>
AuthorDate: Wed Jan 31 06:22:58 2018 +0000

    Updated site at revision 8d159ef
---
 content/api/admin/allclasses-frame.html            |    1 +
 content/api/admin/allclasses-noframe.html          |    1 +
 content/api/admin/index-all.html                   |   68 +
 .../org/apache/pulsar/client/admin/Clusters.html   |  177 ++-
 .../org/apache/pulsar/client/admin/Namespaces.html |  178 ++-
 .../pulsar/client/admin/NonPersistentTopics.html   |  111 +-
 .../pulsar/common/policies/data/ErrorData.html     |    4 +-
 .../{LocalPolicies.html => FailureDomain.html}     |   91 +-
 .../pulsar/common/policies/data/LocalPolicies.html |    4 +-
 .../pulsar/common/policies/data/Policies.html      |   41 +-
 .../pulsar/common/policies/data/package-frame.html |    1 +
 .../common/policies/data/package-summary.html      |   44 +-
 .../pulsar/common/policies/data/package-tree.html  |    1 +
 content/api/admin/overview-tree.html               |    1 +
 content/api/client/allclasses-frame.html           |    1 +
 content/api/client/allclasses-noframe.html         |    1 +
 content/api/client/deprecated-list.html            |    5 -
 content/api/client/index-all.html                  |   31 +-
 .../apache/pulsar/client/api/Authentication.html   |   14 +-
 .../pulsar/client/api/ClientConfiguration.html     |    2 +-
 .../pulsar/client/api/ConsumerConfiguration.html   |   72 +-
 .../org/apache/pulsar/client/api/MessageId.html    |   14 +-
 ...ml => ProducerConfiguration.HashingScheme.html} |   70 +-
 .../ProducerConfiguration.MessageRoutingMode.html  |    4 +-
 .../pulsar/client/api/ProducerConfiguration.html   |  126 +-
 .../apache/pulsar/client/api/package-frame.html    |    1 +
 .../apache/pulsar/client/api/package-summary.html  |    8 +-
 .../org/apache/pulsar/client/api/package-tree.html |    7 +-
 content/api/client/overview-tree.html              |    7 +-
 content/api/client/serialized-form.html            |   12 +
 content/api/cpp/annotated.html                     |   18 +-
 content/api/cpp/classes.html                       |   27 +-
 content/api/cpp/classpulsar_1_1_auth_factory.html  |    4 +-
 .../api/cpp/classpulsar_1_1_batch_message_id.html  |    4 +-
 .../cpp/classpulsar_1_1_client_configuration.html  |    2 +-
 ...spulsar_1_1_consumer_configuration-members.html |   20 +-
 .../classpulsar_1_1_consumer_configuration.html    |   44 +
 ...sspulsar_1_1_deprecated_exception-members.html} |    9 +-
 ...l => classpulsar_1_1_deprecated_exception.html} |   24 +-
 .../cpp/classpulsar_1_1_deprecated_exception.png   |  Bin 0 -> 645 bytes
 content/api/cpp/classpulsar_1_1_message_id.html    |    4 +-
 ...spulsar_1_1_message_routing_policy-members.html |    5 +-
 .../classpulsar_1_1_message_routing_policy.html    |   36 +-
 ...spulsar_1_1_producer_configuration-members.html |   34 +-
 .../classpulsar_1_1_producer_configuration.html    |   58 +-
 ...=> classpulsar_1_1_topic_metadata-members.html} |    9 +-
 ...cy.html => classpulsar_1_1_topic_metadata.html} |   22 +-
 content/api/cpp/deprecated.html                    |    2 +
 content/api/cpp/files.html                         |   20 +-
 content/api/cpp/functions.html                     |   15 +
 content/api/cpp/functions_func.html                |   15 +
 content/api/cpp/hierarchy.html                     |    3 +
 content/api/cpp/index.html                         |    7 +-
 content/api/cpp/namespacepulsar.html               |    6 +-
 content/api/cpp/search/all_3.js                    |    1 +
 content/api/cpp/search/all_5.js                    |    3 +
 content/api/cpp/search/all_c.js                    |    2 +
 content/api/cpp/search/all_d.js                    |    3 +-
 content/api/cpp/search/classes_3.js                |    5 +-
 content/api/cpp/search/classes_4.js                |    6 +-
 content/api/cpp/search/classes_5.js                |    4 +-
 content/api/cpp/search/classes_6.html              |   26 +
 .../api/cpp/search/{classes_5.js => classes_6.js}  |    0
 content/api/cpp/search/classes_7.html              |   26 +
 content/api/cpp/search/classes_7.js                |    4 +
 content/api/cpp/search/functions_5.js              |    3 +
 content/api/cpp/search/functions_b.js              |    2 +
 content/api/cpp/search/searchdata.js               |    4 +-
 content/api/python/index.html                      |  149 +-
 content/css/style.css                              |  676 +++++----
 .../docs/latest/adaptors/KafkaWrapper/index.html   |   20 +-
 .../docs/latest/adaptors/PulsarSpark/index.html    |   23 +-
 .../docs/latest/adaptors/PulsarStorm/index.html    |   21 +-
 content/docs/latest/admin-api/brokers/index.html   |   70 +-
 content/docs/latest/admin-api/clusters/index.html  |   87 +-
 .../docs/latest/admin-api/namespaces/index.html    |  417 +++---
 .../admin-api/non-persistent-topics/index.html     |  129 +-
 content/docs/latest/admin-api/overview/index.html  |   20 +-
 .../latest/admin-api/partitioned-topics/index.html |  186 ++-
 .../docs/latest/admin-api/permissions/index.html   |   63 +-
 .../latest/admin-api/persistent-topics/index.html  |  284 ++--
 .../docs/latest/admin-api/properties/index.html    |   36 +-
 content/docs/latest/admin/Authz/index.html         |  183 ++-
 content/docs/latest/admin/Dashboard/index.html     |   14 +-
 .../docs/latest/admin/GeoReplication/index.html    |   31 +-
 .../latest/admin/ModularLoadManager/index.html     |   92 +-
 .../latest/admin/ZooKeeperBookKeeper/index.html    |   81 +-
 content/docs/latest/advanced/Encryption/index.html |   24 +-
 .../latest/advanced/PartitionedTopics/index.html   |  221 ++-
 .../latest/advanced/RetentionExpiry/index.html     |   95 +-
 content/docs/latest/clients/Cpp/index.html         |  108 +-
 content/docs/latest/clients/Java/index.html        |  168 ++-
 content/docs/latest/clients/Python/index.html      |   47 +-
 content/docs/latest/clients/WebSocket/index.html   |  136 +-
 .../docs/latest/deployment/Kubernetes/index.html   |  210 +--
 .../docs/latest/deployment/Monitoring/index.html   |   32 +-
 .../docs/latest/deployment/aws-cluster/index.html  |   92 +-
 content/docs/latest/deployment/cluster/index.html  |   92 +-
 content/docs/latest/deployment/dcos/index.html     |   37 +-
 content/docs/latest/deployment/instance/index.html |  161 +--
 .../ConceptsAndArchitecture/index.html             |   98 +-
 .../latest/getting-started/LocalCluster/index.html |   68 +-
 .../docs/latest/getting-started/docker/index.html  |  121 +-
 .../docs/latest/project/BinaryProtocol/index.html  |   99 +-
 .../docs/latest/project/SimulationTools/index.html |   17 +-
 content/docs/latest/reference/CliTools/index.html  |   27 +-
 .../docs/latest/reference/Configuration/index.html |   33 +-
 content/download/index.html                        |   10 +-
 content/ja/adaptors/PulsarSpark/index.html         |   23 +-
 content/ja/adaptors/PulsarStorm/index.html         |   21 +-
 content/ja/admin/AdminInterface/index.html         | 1433 +++++++++-----------
 content/ja/admin/Authz/index.html                  |  187 ++-
 content/ja/admin/ClustersBrokers/index.html        |  160 +--
 content/ja/admin/Dashboard/index.html              |   14 +-
 content/ja/admin/GeoReplication/index.html         |   31 +-
 content/ja/admin/ModularLoadManager/index.html     |   92 +-
 content/ja/admin/PropertiesNamespaces/index.html   |  488 +++----
 content/ja/admin/ZooKeeperBookKeeper/index.html    |   81 +-
 content/ja/advanced/PartitionedTopics/index.html   |  225 ++-
 content/ja/advanced/RetentionExpiry/index.html     |  113 +-
 content/ja/clients/Cpp/index.html                  |  108 +-
 content/ja/clients/Java/index.html                 |  103 +-
 content/ja/clients/Python/index.html               |   37 +-
 content/ja/clients/WebSocket/index.html            |  106 +-
 content/ja/deployment/InstanceSetup/index.html     |  160 +--
 content/ja/deployment/Kubernetes/index.html        |  149 +-
 content/ja/deployment/Monitoring/index.html        |   32 +-
 .../ConceptsAndArchitecture/index.html             |   22 +-
 content/ja/getting-started/LocalCluster/index.html |   63 +-
 content/ja/project/BinaryProtocol/index.html       |   99 +-
 content/ja/project/SimulationTools/index.html      |   17 +-
 content/ja/reference/CliTools/index.html           |   31 +-
 content/ja/reference/Configuration/index.html      |   33 +-
 content/js/main.js                                 |    2 -
 134 files changed, 5108 insertions(+), 4775 deletions(-)

diff --git a/content/api/admin/allclasses-frame.html b/content/api/admin/allclasses-frame.html
index 9e37632..0cf6182 100644
--- a/content/api/admin/allclasses-frame.html
+++ b/content/api/admin/allclasses-frame.html
@@ -30,6 +30,7 @@
 <li><a href="org/apache/pulsar/common/policies/data/ConsumerStats.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">ConsumerStats</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">DispatchRate</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">ErrorData</a></li>
+<li><a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">FailureDomain</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">LocalPolicies</a></li>
 <li><a href="org/apache/pulsar/client/admin/Lookup.html" title="interface in org.apache.pulsar.client.admin" target="classFrame"><span class="interfaceName">Lookup</span></a></li>
 <li><a href="org/apache/pulsar/common/policies/impl/MinAvailablePolicy.html" title="class in org.apache.pulsar.common.policies.impl" target="classFrame">MinAvailablePolicy</a></li>
diff --git a/content/api/admin/allclasses-noframe.html b/content/api/admin/allclasses-noframe.html
index 1e8a426..6ceca0b 100644
--- a/content/api/admin/allclasses-noframe.html
+++ b/content/api/admin/allclasses-noframe.html
@@ -30,6 +30,7 @@
 <li><a href="org/apache/pulsar/common/policies/data/ConsumerStats.html" title="class in org.apache.pulsar.common.policies.data">ConsumerStats</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data">DispatchRate</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data">ErrorData</a></li>
+<li><a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data">LocalPolicies</a></li>
 <li><a href="org/apache/pulsar/client/admin/Lookup.html" title="interface in org.apache.pulsar.client.admin"><span class="interfaceName">Lookup</span></a></li>
 <li><a href="org/apache/pulsar/common/policies/impl/MinAvailablePolicy.html" title="class in org.apache.pulsar.common.policies.impl">MinAvailablePolicy</a></li>
diff --git a/content/api/admin/index-all.html b/content/api/admin/index-all.html
index 5c4787c..0cd01b4 100644
--- a/content/api/admin/index-all.html
+++ b/content/api/admin/index-all.html
@@ -106,6 +106,8 @@
 <dd>
 <div class="block">Address of this publisher</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/Policies.html#antiAffinityGroup">antiAffinityGroup</a></span> - Variable in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/Policies.html" title="class in org.apache.pulsar.common.policies.data">Policies</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicies.html#assignBroker-NamespaceName-org.apache.pulsar.common.policies.data.BrokerStatus-java.util.SortedSet-java.util.SortedSet-java.util.SortedSet-">assignBroker(NamespaceName, BrokerStatus, SortedSet&lt;BrokerStatus&gt;, SortedSet&lt;BrokerStatus&gt;, SortedSet&lt;BrokerStatus&gt;)</a></span> - Method in class org.apache.pulsar.common.policies.impl.<a href="org/apache/pulsar/common/p [...]
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/Policies.html#auth_policies">auth_policies</a></span> - Variable in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/Policies.html" title="class in org.apache.pulsar.common.policies.data">Policies</a></dt>
@@ -194,6 +196,8 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/PulsarAdmin.html#brokers--">brokers()</a></span> - Method in class org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/PulsarAdmin.html" title="class in org.apache.pulsar.client.admin">PulsarAdmin</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/FailureDomain.html#brokers">brokers</a></span> - Variable in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/pulsar/client/admin/BrokerStats.html" title="interface in org.apache.pulsar.client.admin"><span class="typeNameLink">BrokerStats</span></a> - Interface in <a href="org/apache/pulsar/client/admin/package-summary.html">org.apache.pulsar.client.admin</a></dt>
 <dd>
 <div class="block">Admin interface for brokers management.</div>
@@ -306,6 +310,10 @@
 <dd>
 <div class="block">Create a new cluster.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Clusters.html#createFailureDomain-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.FailureDomain-">createFailureDomain(String, String, FailureDomain)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Clusters.html" title="interface in org.apache.pulsar.client.admin">Clusters</a></dt>
+<dd>
+<div class="block">Create a domain into cluster</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#createNamespace-java.lang.String-int-">createNamespace(String, int)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Namespaces.html" title="interface in org.apache.pulsar.client.admin">Namespaces</a></dt>
 <dd>
 <div class="block">Create a new namespace.</div>
@@ -394,10 +402,18 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/Policies.html#deleted">deleted</a></span> - Variable in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/Policies.html" title="class in org.apache.pulsar.common.policies.data">Policies</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Clusters.html#deleteFailureDomain-java.lang.String-java.lang.String-">deleteFailureDomain(String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Clusters.html" title="interface in org.apache.pulsar.client.admin">Clusters</a></dt>
+<dd>
+<div class="block">Delete a domain in cluster</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#deleteNamespace-java.lang.String-">deleteNamespace(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Namespaces.html" title="interface in org.apache.pulsar.client.admin">Namespaces</a></dt>
 <dd>
 <div class="block">Delete an existing namespace.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#deleteNamespaceAntiAffinityGroup-java.lang.String-">deleteNamespaceAntiAffinityGroup(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Namespaces.html" title="interface in org.apache.pulsar.client.admin">Namespaces</a></dt>
+<dd>
+<div class="block">Delete anti-affinity group name for a namespace.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#deleteNamespaceBundle-java.lang.String-java.lang.String-">deleteNamespaceBundle(String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Namespaces.html" title="interface in org.apache.pulsar.client.admin">Namespaces</a></dt>
 <dd>
 <div class="block">Delete an existing bundle in a namespace.</div>
@@ -468,6 +484,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/DispatchRate.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data">DispatchRate</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/FailureDomain.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/LocalPolicies.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data">LocalPolicies</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/NamespaceIsolationData.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a></dt>
@@ -516,6 +534,10 @@
 </a>
 <h2 class="title">F</h2>
 <dl>
+<dt><a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">FailureDomain</span></a> - Class in <a href="org/apache/pulsar/common/policies/data/package-summary.html">org.apache.pulsar.common.policies.data</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/FailureDomain.html#FailureDomain--">FailureDomain()</a></span> - Constructor for class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.html#findPrimaryBrokers-java.util.List-NamespaceName-">findPrimaryBrokers(List&lt;URL&gt;, NamespaceName)</a></span> - Method in class org.apache.pulsar.common.policies.impl.<a href="org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.html" title="class in org.apache.pulsar.common.policies.impl">NamespaceIsolationPolicyImpl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/NamespaceIsolationPolicy.html#findPrimaryBrokers-java.util.List-NamespaceName-">findPrimaryBrokers(List&lt;URL&gt;, NamespaceName)</a></span> - Method in interface org.apache.pulsar.common.policies.<a href="org/apache/pulsar/common/policies/NamespaceIsolationPolicy.html" title="interface in org.apache.pulsar.common.policies">NamespaceIsolationPolicy</a></dt>
@@ -552,6 +574,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/PropertyAdmin.html#getAllowedClusters--">getAllowedClusters()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/PropertyAdmin.html" title="class in org.apache.pulsar.common.policies.data">PropertyAdmin</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#getAntiAffinityNamespaces-java.lang.String-java.lang.String-java.lang.String-">getAntiAffinityNamespaces(String, String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Namespaces.html" title="interface in org.apache.pulsar.client.admin">Namespaces</a></dt>
+<dd>
+<div class="block">Get all namespaces that grouped with given anti-affinity group</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.html#getAvailablePrimaryBrokers-java.util.SortedSet-">getAvailablePrimaryBrokers(SortedSet&lt;BrokerStatus&gt;)</a></span> - Method in class org.apache.pulsar.common.policies.impl.<a href="org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicyImpl.html" title="class in org.apache.pulsar.common.policies.impl">NamespaceIsolationPolicyImpl</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/NamespaceIsolationPolicy.html#getAvailablePrimaryBrokers-java.util.SortedSet-">getAvailablePrimaryBrokers(SortedSet&lt;BrokerStatus&gt;)</a></span> - Method in interface org.apache.pulsar.common.policies.<a href="org/apache/pulsar/common/policies/NamespaceIsolationPolicy.html" title="interface in org.apache.pulsar.common.policies">NamespaceIsolationPolicy</a></dt>
@@ -580,6 +606,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/BrokerStatus.html#getBrokerAddress--">getBrokerAddress()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/BrokerStatus.html" title="class in org.apache.pulsar.common.policies.data">BrokerStatus</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/FailureDomain.html#getBrokers--">getBrokers()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/ClusterData.html#getBrokerServiceUrl--">getBrokerServiceUrl()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/ClusterData.html" title="class in org.apache.pulsar.common.policies.data">ClusterData</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/ClusterData.html#getBrokerServiceUrlTls--">getBrokerServiceUrlTls()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/ClusterData.html" title="class in org.apache.pulsar.common.policies.data">ClusterData</a></dt>
@@ -620,6 +648,14 @@
 <dd>
 <div class="block">Get list of updatable configuration name</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Clusters.html#getFailureDomain-java.lang.String-java.lang.String-">getFailureDomain(String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Clusters.html" title="interface in org.apache.pulsar.client.admin">Clusters</a></dt>
+<dd>
+<div class="block">Get the domain registered into a cluster</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Clusters.html#getFailureDomains-java.lang.String-">getFailureDomains(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Clusters.html" title="interface in org.apache.pulsar.client.admin">Clusters</a></dt>
+<dd>
+<div class="block">Get all registered domains in cluster</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/PulsarAdminException.html#getHttpError--">getHttpError()</a></span> - Method in exception org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/PersistentTopics.html#getInternalInfo-java.lang.String-">getInternalInfo(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/PersistentTopics.html" title="interface in org.apache.pulsar.client.admin">PersistentTopics</a></dt>
@@ -650,10 +686,26 @@
 <dd>
 <div class="block">Gets quota limit in bytes</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/NonPersistentTopics.html#getList-java.lang.String-">getList(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/NonPersistentTopics.html" title="interface in org.apache.pulsar.client.admin">NonPersistentTopics</a></dt>
+<dd>
+<div class="block">Get list of topics exist into given namespace</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/PersistentTopics.html#getList-java.lang.String-">getList(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/PersistentTopics.html" title="interface in org.apache.pulsar.client.admin">PersistentTopics</a></dt>
 <dd>
 <div class="block">Get the list of topics under a namespace.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/NonPersistentTopics.html#getListAsync-java.lang.String-">getListAsync(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/NonPersistentTopics.html" title="interface in org.apache.pulsar.client.admin">NonPersistentTopics</a></dt>
+<dd>
+<div class="block">Get list of topics exist into given namespace asynchronously.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/NonPersistentTopics.html#getListInBundle-java.lang.String-java.lang.String-">getListInBundle(String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/NonPersistentTopics.html" title="interface in org.apache.pulsar.client.admin">NonPersistentTopics</a></dt>
+<dd>
+<div class="block">Get list of topics exist into given bundle</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/NonPersistentTopics.html#getListInBundleAsync-java.lang.String-java.lang.String-">getListInBundleAsync(String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/NonPersistentTopics.html" title="interface in org.apache.pulsar.client.admin">NonPersistentTopics</a></dt>
+<dd>
+<div class="block">Get list of topics exist into given bundle asynchronously.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/BrokerStatus.html#getLoadFactor--">getLoadFactor()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/BrokerStatus.html" title="class in org.apache.pulsar.common.policies.data">BrokerStatus</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/BrokerStats.html#getLoadReport--">getLoadReport()</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/BrokerStats.html" title="interface in org.apache.pulsar.client.admin">BrokerStats</a></dt>
@@ -680,6 +732,10 @@
 <dd>
 <div class="block">Get outgoing message rate quota</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#getNamespaceAntiAffinityGroup-java.lang.String-">getNamespaceAntiAffinityGroup(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Namespaces.html" title="interface in org.apache.pulsar.client.admin">Namespaces</a></dt>
+<dd>
+<div class="block">Get anti-affinity group name for a namespace</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/ResourceQuotas.html#getNamespaceBundleResourceQuota-java.lang.String-java.lang.String-">getNamespaceBundleResourceQuota(String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/ResourceQuotas.html" title="interface in org.apache.pulsar.client.admin">ResourceQuotas</a></dt>
 <dd>
 <div class="block">Get resource quota of a namespace bundle.</div>
@@ -1472,6 +1528,8 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/BundlesData.html#setBoundaries-java.util.List-">setBoundaries(List&lt;String&gt;)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/BundlesData.html" title="class in org.apache.pulsar.common.policies.data">BundlesData</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/FailureDomain.html#setBrokers-java.util.Set-">setBrokers(Set&lt;String&gt;)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/ClusterData.html#setBrokerServiceUrl-java.lang.String-">setBrokerServiceUrl(String)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/ClusterData.html" title="class in org.apache.pulsar.common.policies.data">ClusterData</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/ClusterData.html#setBrokerServiceUrlTls-java.lang.String-">setBrokerServiceUrlTls(String)</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/ClusterData.html" title="class in org.apache.pulsar.common.policies.data">ClusterData</a></dt>
@@ -1514,6 +1572,10 @@
 <dd>
 <div class="block">Set outgoing message rate quota</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#setNamespaceAntiAffinityGroup-java.lang.String-java.lang.String-">setNamespaceAntiAffinityGroup(String, String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Namespaces.html" title="interface in org.apache.pulsar.client.admin">Namespaces</a></dt>
+<dd>
+<div class="block">Set anti-affinity group name for a namespace</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/ResourceQuotas.html#setNamespaceBundleResourceQuota-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.ResourceQuota-">setNamespaceBundleResourceQuota(String, String, ResourceQuota)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/ResourceQuotas.html" title="interface in org.apache.pulsar.client.admin">ResourceQuotas</a></dt>
 <dd>
 <div class="block">Set resource quota for a namespace bundle.</div>
@@ -1670,6 +1732,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/DispatchRate.html#toString--">toString()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data">DispatchRate</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/FailureDomain.html#toString--">toString()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/NamespaceIsolationData.html#toString--">toString()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.html#toString--">toString()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.html" title="class in org.apache.pulsar.common.policies.data">NamespaceOwnershipStatus</a></dt>
@@ -1754,6 +1818,10 @@
  brokers and all brokers can update <code>ServiceConfiguration</code> value
  locally</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Clusters.html#updateFailureDomain-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.FailureDomain-">updateFailureDomain(String, String, FailureDomain)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Clusters.html" title="interface in org.apache.pulsar.client.admin">Clusters</a></dt>
+<dd>
+<div class="block">Update a domain into cluster</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Clusters.html#updateNamespaceIsolationPolicy-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.NamespaceIsolationData-">updateNamespaceIsolationPolicy(String, String, NamespaceIsolationData)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Clusters.html" title="interface in org.apache.pulsar.client.admin">Clusters</a></dt>
 <dd>
 <div class="block">Update a namespace isolation policy for a cluster</div>
diff --git a/content/api/admin/org/apache/pulsar/client/admin/Clusters.html b/content/api/admin/org/apache/pulsar/client/admin/Clusters.html
index 3264377..953c55b 100644
--- a/content/api/admin/org/apache/pulsar/client/admin/Clusters.html
+++ b/content/api/admin/org/apache/pulsar/client/admin/Clusters.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -128,58 +128,94 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#createFailureDomain-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.FailureDomain-">createFailureDomain</a></span>(String&nbsp;cluster,
+                   String&nbsp;domainName,
+                   <a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a>&nbsp;domain)</code>
+<div class="block">Create a domain into cluster</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#createNamespaceIsolationPolicy-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.NamespaceIsolationData-">createNamespaceIsolationPolicy</a></span>(String&nbsp;cluster,
                               String&nbsp;policyName,
                               <a href="../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a>&nbsp;namespaceIsolationData)</code>
 <div class="block">Create a namespace isolation policy for a cluster</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#deleteCluster-java.lang.String-">deleteCluster</a></span>(String&nbsp;cluster)</code>
 <div class="block">Delete an existing cluster</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#deleteFailureDomain-java.lang.String-java.lang.String-">deleteFailureDomain</a></span>(String&nbsp;cluster,
+                   String&nbsp;domainName)</code>
+<div class="block">Delete a domain in cluster</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#deleteNamespaceIsolationPolicy-java.lang.String-java.lang.String-">deleteNamespaceIsolationPolicy</a></span>(String&nbsp;cluster,
                               String&nbsp;policyName)</code>
 <div class="block">Delete a namespace isolation policy for a cluster</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/ClusterData.html" title="class in org.apache.pulsar.common.policies.data">ClusterData</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#getCluster-java.lang.String-">getCluster</a></span>(String&nbsp;cluster)</code>
 <div class="block">Get the configuration data for the specified cluster.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>List&lt;String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#getClusters--">getClusters</a></span>()</code>
 <div class="block">Get the list of clusters.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i8" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#getFailureDomain-java.lang.String-java.lang.String-">getFailureDomain</a></span>(String&nbsp;cluster,
+                String&nbsp;domainName)</code>
+<div class="block">Get the domain registered into a cluster</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>Map&lt;String,<a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a>&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#getFailureDomains-java.lang.String-">getFailureDomains</a></span>(String&nbsp;cluster)</code>
+<div class="block">Get all registered domains in cluster</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>Map&lt;String,<a href="../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#getNamespaceIsolationPolicies-java.lang.String-">getNamespaceIsolationPolicies</a></span>(String&nbsp;cluster)</code>
 <div class="block">Get the namespace isolation policies of a cluster</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#getNamespaceIsolationPolicy-java.lang.String-java.lang.String-">getNamespaceIsolationPolicy</a></span>(String&nbsp;cluster,
                            String&nbsp;policyName)</code>
 <div class="block">Get a single namespace isolation policy for a cluster</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#updateCluster-java.lang.String-org.apache.pulsar.common.policies.data.ClusterData-">updateCluster</a></span>(String&nbsp;cluster,
              <a href="../../../../../org/apache/pulsar/common/policies/data/ClusterData.html" title="class in org.apache.pulsar.common.policies.data">ClusterData</a>&nbsp;clusterData)</code>
 <div class="block">Update the configuration for a cluster.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#updateFailureDomain-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.FailureDomain-">updateFailureDomain</a></span>(String&nbsp;cluster,
+                   String&nbsp;domainName,
+                   <a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a>&nbsp;domain)</code>
+<div class="block">Update a domain into cluster</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#updateNamespaceIsolationPolicy-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.NamespaceIsolationData-">updateNamespaceIsolationPolicy</a></span>(String&nbsp;cluster,
                               String&nbsp;policyName,
@@ -187,7 +223,7 @@ var activeTableTab = "activeTableTab";
 <div class="block">Update a namespace isolation policy for a cluster</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Clusters.html#updatePeerClusterNames-java.lang.String-java.util.LinkedHashSet-">updatePeerClusterNames</a></span>(String&nbsp;cluster,
                       LinkedHashSet&lt;String&gt;&nbsp;peerClusterNames)</code>
@@ -451,7 +487,7 @@ var activeTableTab = "activeTableTab";
 <a name="getNamespaceIsolationPolicy-java.lang.String-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getNamespaceIsolationPolicy</h4>
 <pre><a href="../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a>&nbsp;getNamespaceIsolationPolicy(String&nbsp;cluster,
@@ -471,6 +507,125 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
+<a name="createFailureDomain-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.FailureDomain-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createFailureDomain</h4>
+<pre>void&nbsp;createFailureDomain(String&nbsp;cluster,
+                         String&nbsp;domainName,
+                         <a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a>&nbsp;domain)
+                  throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Create a domain into cluster
+ <p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>cluster</code> - Cluster name</dd>
+<dd><code>domainName</code> - domain name</dd>
+<dd><code>FailureDomain</code> - Domain configurations</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - You don't have admin permission to create the cluster</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.ConflictException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.ConflictException</a></code> - Broker already exist into other domain</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Cluster doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.PreconditionFailedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.PreconditionFailedException</a></code> - Cluster doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
+<a name="updateFailureDomain-java.lang.String-java.lang.String-org.apache.pulsar.common.policies.data.FailureDomain-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>updateFailureDomain</h4>
+<pre>void&nbsp;updateFailureDomain(String&nbsp;cluster,
+                         String&nbsp;domainName,
+                         <a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a>&nbsp;domain)
+                  throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Update a domain into cluster
+ <p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>cluster</code> - Cluster name</dd>
+<dd><code>domainName</code> - domain name</dd>
+<dd><code>FailureDomain</code> - Domain configurations</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - You don't have admin permission to create the cluster</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.ConflictException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.ConflictException</a></code> - Broker already exist into other domain</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Cluster doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.PreconditionFailedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.PreconditionFailedException</a></code> - Cluster doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
+<a name="deleteFailureDomain-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteFailureDomain</h4>
+<pre>void&nbsp;deleteFailureDomain(String&nbsp;cluster,
+                         String&nbsp;domainName)
+                  throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Delete a domain in cluster
+ <p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>cluster</code> - Cluster name</dd>
+<dd><code>domainName</code> - Domain name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - You don't have admin permission to create the cluster</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Cluster doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.PreconditionFailedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.PreconditionFailedException</a></code> - Cluster doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
+<a name="getFailureDomains-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFailureDomains</h4>
+<pre>Map&lt;String,<a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a>&gt;&nbsp;getFailureDomains(String&nbsp;cluster)
+                                     throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Get all registered domains in cluster
+ <p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>cluster</code> - Cluster name</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - You don't have admin permission to create the cluster</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Cluster don't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
+<a name="getFailureDomain-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getFailureDomain</h4>
+<pre><a href="../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a>&nbsp;getFailureDomain(String&nbsp;cluster,
+                               String&nbsp;domainName)
+                        throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Get the domain registered into a cluster
+ <p></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>cluster</code> - Cluster name</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - You don't have admin permission to create the cluster</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Domain doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.PreconditionFailedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.PreconditionFailedException</a></code> - Cluster doesn't exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/content/api/admin/org/apache/pulsar/client/admin/Namespaces.html b/content/api/admin/org/apache/pulsar/client/admin/Namespaces.html
index 73d7dfe..e472beb 100644
--- a/content/api/admin/org/apache/pulsar/client/admin/Namespaces.html
+++ b/content/api/admin/org/apache/pulsar/client/admin/Namespaces.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":6,"i37":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":6,"i21":6,"i22":6,"i23":6,"i24":6,"i25":6,"i26":6,"i27":6,"i28":6,"i29":6,"i30":6,"i31":6,"i32":6,"i33":6,"i34":6,"i35":6,"i36":6,"i37":6,"i38":6,"i39":6,"i40":6,"i41":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -175,85 +175,105 @@ var activeTableTab = "activeTableTab";
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#deleteNamespaceAntiAffinityGroup-java.lang.String-">deleteNamespaceAntiAffinityGroup</a></span>(String&nbsp;namespace)</code>
+<div class="block">Delete anti-affinity group name for a namespace.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#deleteNamespaceBundle-java.lang.String-java.lang.String-">deleteNamespaceBundle</a></span>(String&nbsp;namespace,
                      String&nbsp;bundleRange)</code>
 <div class="block">Delete an existing bundle in a namespace.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>List&lt;String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getAntiAffinityNamespaces-java.lang.String-java.lang.String-java.lang.String-">getAntiAffinityNamespaces</a></span>(String&nbsp;property,
+                         String&nbsp;cluster,
+                         String&nbsp;namespaceAntiAffinityGroup)</code>
+<div class="block">Get all namespaces that grouped with given anti-affinity group</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>Map&lt;<a href="../../../../../org/apache/pulsar/common/policies/data/BacklogQuota.BacklogQuotaType.html" title="enum in org.apache.pulsar.common.policies.data">BacklogQuota.BacklogQuotaType</a>,<a href="../../../../../org/apache/pulsar/common/policies/data/BacklogQuota.html" title="class in org.apache.pulsar.common.policies.data">BacklogQuota</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getBacklogQuotaMap-java.lang.String-">getBacklogQuotaMap</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get backlog quota map on a namespace.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>List&lt;String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getDestinations-java.lang.String-">getDestinations</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get the list of destinations.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data">DispatchRate</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getDispatchRate-java.lang.String-">getDispatchRate</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get message-dispatch-rate (topics under this namespace can dispatch this many messages per second)</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getNamespaceAntiAffinityGroup-java.lang.String-">getNamespaceAntiAffinityGroup</a></span>(String&nbsp;namespace)</code>
+<div class="block">Get anti-affinity group name for a namespace</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getNamespaceMessageTTL-java.lang.String-">getNamespaceMessageTTL</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get the message TTL for a namespace.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>List&lt;String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getNamespaceReplicationClusters-java.lang.String-">getNamespaceReplicationClusters</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get the replication clusters for a namespace.</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>List&lt;String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getNamespaces-java.lang.String-">getNamespaces</a></span>(String&nbsp;property)</code>
 <div class="block">Get the list of namespaces.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>List&lt;String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getNamespaces-java.lang.String-java.lang.String-">getNamespaces</a></span>(String&nbsp;property,
              String&nbsp;cluster)</code>
 <div class="block">Get the list of namespaces.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>Map&lt;String,Set&lt;<a href="../../../../../org/apache/pulsar/common/policies/data/AuthAction.html" title="enum in org.apache.pulsar.common.policies.data">AuthAction</a>&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getPermissions-java.lang.String-">getPermissions</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get permissions on a namespace.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/PersistencePolicies.html" title="class in org.apache.pulsar.common.policies.data">PersistencePolicies</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getPersistence-java.lang.String-">getPersistence</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get the persistence configuration for a namespace.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/Policies.html" title="class in org.apache.pulsar.common.policies.data">Policies</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getPolicies-java.lang.String-">getPolicies</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get policies for a namespace.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getReplicationConfigVersion-java.lang.String-">getReplicationConfigVersion</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get the replication configuration version for a given namespace</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.html" title="class in org.apache.pulsar.common.policies.data">RetentionPolicies</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getRetention-java.lang.String-">getRetention</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get the retention configuration for a namespace.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#grantPermissionOnNamespace-java.lang.String-java.lang.String-java.util.Set-">grantPermissionOnNamespace</a></span>(String&nbsp;namespace,
                           String&nbsp;role,
@@ -261,83 +281,90 @@ var activeTableTab = "activeTableTab";
 <div class="block">Grant permission on a namespace.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#removeBacklogQuota-java.lang.String-">removeBacklogQuota</a></span>(String&nbsp;namespace)</code>
 <div class="block">Remove a backlog quota policy from a namespace.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#revokePermissionsOnNamespace-java.lang.String-java.lang.String-">revokePermissionsOnNamespace</a></span>(String&nbsp;namespace,
                             String&nbsp;role)</code>
 <div class="block">Revoke permissions on a namespace.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setBacklogQuota-java.lang.String-org.apache.pulsar.common.policies.data.BacklogQuota-">setBacklogQuota</a></span>(String&nbsp;namespace,
                <a href="../../../../../org/apache/pulsar/common/policies/data/BacklogQuota.html" title="class in org.apache.pulsar.common.policies.data">BacklogQuota</a>&nbsp;backlogQuota)</code>
 <div class="block">Set a backlog quota for all the destinations on a namespace.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setDeduplicationStatus-java.lang.String-boolean-">setDeduplicationStatus</a></span>(String&nbsp;namespace,
                       boolean&nbsp;enableDeduplication)</code>
 <div class="block">Set the deduplication status for all topics within a namespace.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setDispatchRate-java.lang.String-org.apache.pulsar.common.policies.data.DispatchRate-">setDispatchRate</a></span>(String&nbsp;namespace,
                <a href="../../../../../org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data">DispatchRate</a>&nbsp;dispatchRate)</code>
 <div class="block">Set message-dispatch-rate (topics under this namespace can dispatch this many messages per second)</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setEncryptionRequiredStatus-java.lang.String-boolean-">setEncryptionRequiredStatus</a></span>(String&nbsp;namespace,
                            boolean&nbsp;encryptionRequired)</code>
 <div class="block">Set the encryption required status for all topics within a namespace.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i31" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setNamespaceAntiAffinityGroup-java.lang.String-java.lang.String-">setNamespaceAntiAffinityGroup</a></span>(String&nbsp;namespace,
+                             String&nbsp;namespaceAntiAffinityGroup)</code>
+<div class="block">Set anti-affinity group name for a namespace</div>
+</td>
+</tr>
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setNamespaceMessageTTL-java.lang.String-int-">setNamespaceMessageTTL</a></span>(String&nbsp;namespace,
                       int&nbsp;ttlInSeconds)</code>
 <div class="block">Set the messages Time to Live for all the topics within a namespace.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setNamespaceReplicationClusters-java.lang.String-java.util.List-">setNamespaceReplicationClusters</a></span>(String&nbsp;namespace,
                                List&lt;String&gt;&nbsp;clusterIds)</code>
 <div class="block">Set the replication clusters for a namespace.</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setPersistence-java.lang.String-org.apache.pulsar.common.policies.data.PersistencePolicies-">setPersistence</a></span>(String&nbsp;namespace,
               <a href="../../../../../org/apache/pulsar/common/policies/data/PersistencePolicies.html" title="class in org.apache.pulsar.common.policies.data">PersistencePolicies</a>&nbsp;persistence)</code>
 <div class="block">Set the persistence configuration for all the destinations on a namespace.</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setRetention-java.lang.String-org.apache.pulsar.common.policies.data.RetentionPolicies-">setRetention</a></span>(String&nbsp;namespace,
             <a href="../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.html" title="class in org.apache.pulsar.common.policies.data">RetentionPolicies</a>&nbsp;retention)</code>
 <div class="block">Set the retention configuration for all the destinations on a namespace.</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#setSubscriptionAuthMode-java.lang.String-org.apache.pulsar.common.policies.data.SubscriptionAuthMode-">setSubscriptionAuthMode</a></span>(String&nbsp;namespace,
                        <a href="../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a>&nbsp;subscriptionAuthMode)</code>
 <div class="block">Set the given subscription auth mode on all destinations on a namespace</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#splitNamespaceBundle-java.lang.String-java.lang.String-boolean-">splitNamespaceBundle</a></span>(String&nbsp;namespace,
                     String&nbsp;bundle,
@@ -345,27 +372,27 @@ var activeTableTab = "activeTableTab";
 <div class="block">Split namespace bundle</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#unload-java.lang.String-">unload</a></span>(String&nbsp;namespace)</code>
 <div class="block">Unload a namespace from the current serving broker.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#unloadNamespaceBundle-java.lang.String-java.lang.String-">unloadNamespaceBundle</a></span>(String&nbsp;namespace,
                      String&nbsp;bundle)</code>
 <div class="block">Unload namespace bundle</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i40" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#unsubscribeNamespace-java.lang.String-java.lang.String-">unsubscribeNamespace</a></span>(String&nbsp;namespace,
                     String&nbsp;subscription)</code>
 <div class="block">Unsubscribes the given subscription on all destinations on a namespace</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#unsubscribeNamespaceBundle-java.lang.String-java.lang.String-java.lang.String-">unsubscribeNamespaceBundle</a></span>(String&nbsp;namespace,
                           String&nbsp;bundle,
@@ -825,6 +852,97 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
+<a name="setNamespaceAntiAffinityGroup-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setNamespaceAntiAffinityGroup</h4>
+<pre>void&nbsp;setNamespaceAntiAffinityGroup(String&nbsp;namespace,
+                                   String&nbsp;namespaceAntiAffinityGroup)
+                            throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Set anti-affinity group name for a namespace
+ <p>
+ Request example:</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - Namespace name</dd>
+<dd><code>namespaceAntiAffinityGroup</code> - anti-affinity group name for a namespace</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - Don't have admin permission</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Namespace does not exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
+<a name="getAntiAffinityNamespaces-java.lang.String-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAntiAffinityNamespaces</h4>
+<pre>List&lt;String&gt;&nbsp;getAntiAffinityNamespaces(String&nbsp;property,
+                                       String&nbsp;cluster,
+                                       String&nbsp;namespaceAntiAffinityGroup)
+                                throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Get all namespaces that grouped with given anti-affinity group</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>property</code> - property is only used for authorization. Client has to be admin of any of the property to access this
+            api api.</dd>
+<dd><code>cluster</code> - cluster name</dd>
+<dd><code>namespaceAntiAffinityGroup</code> - Anti-affinity group name</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>list of namespace grouped under a given anti-affinity group</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getNamespaceAntiAffinityGroup-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNamespaceAntiAffinityGroup</h4>
+<pre>String&nbsp;getNamespaceAntiAffinityGroup(String&nbsp;namespace)
+                              throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Get anti-affinity group name for a namespace
+ <p>
+ Response example:
+
+ <pre>
+ <code>60</code>
+ </pre></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - Namespace name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - Don't have admin permission</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Namespace does not exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
+<a name="deleteNamespaceAntiAffinityGroup-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteNamespaceAntiAffinityGroup</h4>
+<pre>void&nbsp;deleteNamespaceAntiAffinityGroup(String&nbsp;namespace)
+                               throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Delete anti-affinity group name for a namespace.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - Namespace name</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotAuthorizedException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotAuthorizedException</a></code> - You don't have admin permission</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.NotFoundException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException.NotFoundException</a></code> - Namespace does not exist</dd>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code> - Unexpected error</dd>
+</dl>
+</li>
+</ul>
 <a name="setDeduplicationStatus-java.lang.String-boolean-">
 <!--   -->
 </a>
diff --git a/content/api/admin/org/apache/pulsar/client/admin/NonPersistentTopics.html b/content/api/admin/org/apache/pulsar/client/admin/NonPersistentTopics.html
index e5b9bbe..ca563c5 100644
--- a/content/api/admin/org/apache/pulsar/client/admin/NonPersistentTopics.html
+++ b/content/api/admin/org/apache/pulsar/client/admin/NonPersistentTopics.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -145,36 +145,62 @@ var activeTableTab = "activeTableTab";
 </td>
 </tr>
 <tr id="i4" class="altColor">
+<td class="colFirst"><code>List&lt;String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getList-java.lang.String-">getList</a></span>(String&nbsp;namespace)</code>
+<div class="block">Get list of topics exist into given namespace</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>CompletableFuture&lt;List&lt;String&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getListAsync-java.lang.String-">getListAsync</a></span>(String&nbsp;namespace)</code>
+<div class="block">Get list of topics exist into given namespace asynchronously.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>List&lt;String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getListInBundle-java.lang.String-java.lang.String-">getListInBundle</a></span>(String&nbsp;namespace,
+               String&nbsp;bundleRange)</code>
+<div class="block">Get list of topics exist into given bundle</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>CompletableFuture&lt;List&lt;String&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getListInBundleAsync-java.lang.String-java.lang.String-">getListInBundleAsync</a></span>(String&nbsp;namespace,
+                    String&nbsp;bundleRange)</code>
+<div class="block">Get list of topics exist into given bundle asynchronously.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>PartitionedTopicMetadata</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getPartitionedTopicMetadata-java.lang.String-">getPartitionedTopicMetadata</a></span>(String&nbsp;destination)</code>
 <div class="block">Get metadata of a partitioned topic.</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>CompletableFuture&lt;PartitionedTopicMetadata&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getPartitionedTopicMetadataAsync-java.lang.String-">getPartitionedTopicMetadataAsync</a></span>(String&nbsp;destination)</code>
 <div class="block">Get metadata of a partitioned topic asynchronously.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/NonPersistentTopicStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentTopicStats</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getStats-java.lang.String-">getStats</a></span>(String&nbsp;destination)</code>
 <div class="block">Get the stats for the topic.</div>
 </td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>CompletableFuture&lt;<a href="../../../../../org/apache/pulsar/common/policies/data/NonPersistentTopicStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentTopicStats</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#getStatsAsync-java.lang.String-">getStatsAsync</a></span>(String&nbsp;destination)</code>
 <div class="block">Get the stats for the topic asynchronously.</div>
 </td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#unload-java.lang.String-">unload</a></span>(String&nbsp;destination)</code>
 <div class="block">Unload a topic.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>CompletableFuture&lt;Void&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/NonPersistentTopics.html#unloadAsync-java.lang.String-">unloadAsync</a></span>(String&nbsp;destination)</code>
 <div class="block">Unload a topic asynchronously.</div>
@@ -438,7 +464,7 @@ var activeTableTab = "activeTableTab";
 <a name="unloadAsync-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>unloadAsync</h4>
 <pre>CompletableFuture&lt;Void&gt;&nbsp;unloadAsync(String&nbsp;destination)</pre>
@@ -452,6 +478,77 @@ var activeTableTab = "activeTableTab";
 </dl>
 </li>
 </ul>
+<a name="getListInBundle-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListInBundle</h4>
+<pre>List&lt;String&gt;&nbsp;getListInBundle(String&nbsp;namespace,
+                             String&nbsp;bundleRange)
+                      throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Get list of topics exist into given bundle</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - </dd>
+<dd><code>bundleRange</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getListInBundleAsync-java.lang.String-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getListInBundleAsync</h4>
+<pre>CompletableFuture&lt;List&lt;String&gt;&gt;&nbsp;getListInBundleAsync(String&nbsp;namespace,
+                                                     String&nbsp;bundleRange)</pre>
+<div class="block">Get list of topics exist into given bundle asynchronously.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - </dd>
+<dd><code>bundleRange</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a name="getList-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getList</h4>
+<pre>List&lt;String&gt;&nbsp;getList(String&nbsp;namespace)
+              throws <a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></pre>
+<div class="block">Get list of topics exist into given namespace</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="../../../../../org/apache/pulsar/client/admin/PulsarAdminException.html" title="class in org.apache.pulsar.client.admin">PulsarAdminException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="getListAsync-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getListAsync</h4>
+<pre>CompletableFuture&lt;List&lt;String&gt;&gt;&nbsp;getListAsync(String&nbsp;namespace)</pre>
+<div class="block">Get list of topics exist into given namespace asynchronously.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - </dd>
+<dd><code>bundleRange</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/ErrorData.html b/content/api/admin/org/apache/pulsar/common/policies/data/ErrorData.html
index d946c54..bcd6487 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/ErrorData.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/ErrorData.html
@@ -42,7 +42,7 @@
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/ErrorData.html" target="_top">Frames</a></li>
@@ -238,7 +238,7 @@ extends Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/ErrorData.html" target="_top">Frames</a></li>
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/LocalPolicies.html b/content/api/admin/org/apache/pulsar/common/policies/data/FailureDomain.html
similarity index 74%
copy from content/api/admin/org/apache/pulsar/common/policies/data/LocalPolicies.html
copy to content/api/admin/org/apache/pulsar/common/policies/data/FailureDomain.html
index 0748717..9274b66 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/LocalPolicies.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/FailureDomain.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>LocalPolicies (Pulsar Admin Java API)</title>
+<title>FailureDomain (Pulsar Admin Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 </head>
@@ -11,13 +11,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="LocalPolicies (Pulsar Admin Java API)";
+            parent.document.title="FailureDomain (Pulsar Admin Java API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -48,11 +48,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/LocalPolicies.html" target="_top">Frames</a></li>
-<li><a href="LocalPolicies.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/FailureDomain.html" target="_top">Frames</a></li>
+<li><a href="FailureDomain.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,14 +91,14 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.pulsar.common.policies.data</div>
-<h2 title="Class LocalPolicies" class="title">Class LocalPolicies</h2>
+<h2 title="Class FailureDomain" class="title">Class FailureDomain</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>Object</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.pulsar.common.policies.data.LocalPolicies</li>
+<li>org.apache.pulsar.common.policies.data.FailureDomain</li>
 </ul>
 </li>
 </ul>
@@ -107,7 +107,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <span class="typeNameLabel">LocalPolicies</span>
+<pre>public class <span class="typeNameLabel">FailureDomain</span>
 extends Object</pre>
 </li>
 </ul>
@@ -128,8 +128,8 @@ extends Object</pre>
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/pulsar/common/policies/data/BundlesData.html" title="class in org.apache.pulsar.common.policies.data">BundlesData</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html#bundles">bundles</a></span></code>&nbsp;</td>
+<td class="colFirst"><code>Set&lt;String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html#brokers">brokers</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -146,7 +146,7 @@ extends Object</pre>
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html#LocalPolicies--">LocalPolicies</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html#FailureDomain--">FailureDomain</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -165,7 +165,19 @@ extends Object</pre>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html#equals-java.lang.Object-">equals</a></span>(Object&nbsp;obj)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html#equals-java.lang.Object-">equals</a></span>(Object&nbsp;obj)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>Set&lt;String&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html#getBrokers--">getBrokers</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html#setBrokers-java.util.Set-">setBrokers</a></span>(Set&lt;String&gt;&nbsp;brokers)</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -173,7 +185,7 @@ extends Object</pre>
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
-<code>clone, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+<code>clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
 </ul>
 </li>
 </ul>
@@ -189,13 +201,13 @@ extends Object</pre>
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="bundles">
+<a name="brokers">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>bundles</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/BundlesData.html" title="class in org.apache.pulsar.common.policies.data">BundlesData</a> bundles</pre>
+<h4>brokers</h4>
+<pre>public&nbsp;Set&lt;String&gt; brokers</pre>
 </li>
 </ul>
 </li>
@@ -206,13 +218,13 @@ extends Object</pre>
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="LocalPolicies--">
+<a name="FailureDomain--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>LocalPolicies</h4>
-<pre>public&nbsp;LocalPolicies()</pre>
+<h4>FailureDomain</h4>
+<pre>public&nbsp;FailureDomain()</pre>
 </li>
 </ul>
 </li>
@@ -223,10 +235,28 @@ extends Object</pre>
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="getBrokers--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getBrokers</h4>
+<pre>public&nbsp;Set&lt;String&gt;&nbsp;getBrokers()</pre>
+</li>
+</ul>
+<a name="setBrokers-java.util.Set-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setBrokers</h4>
+<pre>public&nbsp;void&nbsp;setBrokers(Set&lt;String&gt;&nbsp;brokers)</pre>
+</li>
+</ul>
 <a name="equals-java.lang.Object-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>equals</h4>
 <pre>public&nbsp;boolean&nbsp;equals(Object&nbsp;obj)</pre>
@@ -236,6 +266,19 @@ extends Object</pre>
 </dl>
 </li>
 </ul>
+<a name="toString--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>toString</h4>
+<pre>public&nbsp;String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>Object</code></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
@@ -264,11 +307,11 @@ extends Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/LocalPolicies.html" target="_top">Frames</a></li>
-<li><a href="LocalPolicies.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/FailureDomain.html" target="_top">Frames</a></li>
+<li><a href="FailureDomain.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/LocalPolicies.html b/content/api/admin/org/apache/pulsar/common/policies/data/LocalPolicies.html
index 0748717..a608547 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/LocalPolicies.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/LocalPolicies.html
@@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -263,7 +263,7 @@ extends Object</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/Policies.html b/content/api/admin/org/apache/pulsar/common/policies/data/Policies.html
index 3162f24..9bd0cc2 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/Policies.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/Policies.html
@@ -128,62 +128,66 @@ extends Object</pre>
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#antiAffinityGroup">antiAffinityGroup</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/pulsar/common/policies/data/AuthPolicies.html" title="class in org.apache.pulsar.common.policies.data">AuthPolicies</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#auth_policies">auth_policies</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>Map&lt;<a href="../../../../../../org/apache/pulsar/common/policies/data/BacklogQuota.BacklogQuotaType.html" title="enum in org.apache.pulsar.common.policies.data">BacklogQuota.BacklogQuotaType</a>,<a href="../../../../../../org/apache/pulsar/common/policies/data/BacklogQuota.html" title="class in org.apache.pulsar.common.policies.data">BacklogQuota</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#backlog_quota_map">backlog_quota_map</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/pulsar/common/policies/data/BundlesData.html" title="class in org.apache.pulsar.common.policies.data">BundlesData</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#bundles">bundles</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>Map&lt;String,<a href="../../../../../../org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data">DispatchRate</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#clusterDispatchRate">clusterDispatchRate</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>Boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#deduplicationEnabled">deduplicationEnabled</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#deleted">deleted</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#encryption_required">encryption_required</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#FIRST_BOUNDARY">FIRST_BOUNDARY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#LAST_BOUNDARY">LAST_BOUNDARY</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>Map&lt;String,Integer&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#latency_stats_sample_rate">latency_stats_sample_rate</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#message_ttl_in_seconds">message_ttl_in_seconds</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistencePolicies.html" title="class in org.apache.pulsar.common.policies.data">PersistencePolicies</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#persistence">persistence</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>List&lt;String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#replication_clusters">replication_clusters</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.html" title="class in org.apache.pulsar.common.policies.data">RetentionPolicies</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#retention_policies">retention_policies</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#subscription_auth_mode">subscription_auth_mode</a></span></code>&nbsp;</td>
 </tr>
@@ -352,6 +356,15 @@ extends Object</pre>
 <pre>public&nbsp;boolean deleted</pre>
 </li>
 </ul>
+<a name="antiAffinityGroup">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>antiAffinityGroup</h4>
+<pre>public&nbsp;String antiAffinityGroup</pre>
+</li>
+</ul>
 <a name="FIRST_BOUNDARY">
 <!--   -->
 </a>
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/package-frame.html b/content/api/admin/org/apache/pulsar/common/policies/data/package-frame.html
index 6216a25..30ca535 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/package-frame.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/package-frame.html
@@ -21,6 +21,7 @@
 <li><a href="ConsumerStats.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">ConsumerStats</a></li>
 <li><a href="DispatchRate.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">DispatchRate</a></li>
 <li><a href="ErrorData.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">ErrorData</a></li>
+<li><a href="FailureDomain.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">FailureDomain</a></li>
 <li><a href="LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">LocalPolicies</a></li>
 <li><a href="NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">NamespaceIsolationData</a></li>
 <li><a href="NamespaceOwnershipStatus.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">NamespaceOwnershipStatus</a></li>
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/package-summary.html b/content/api/admin/org/apache/pulsar/common/policies/data/package-summary.html
index e6ccf1a..37148ae 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/package-summary.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/package-summary.html
@@ -119,90 +119,94 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data">LocalPolicies</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data">FailureDomain</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data">LocalPolicies</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.html" title="class in org.apache.pulsar.common.policies.data">NamespaceOwnershipStatus</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data">NamespaceIsolationData</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentPublisherStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentPublisherStats</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.html" title="class in org.apache.pulsar.common.policies.data">NamespaceOwnershipStatus</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentReplicatorStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentReplicatorStats</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentPublisherStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentPublisherStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentSubscriptionStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentSubscriptionStats</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentReplicatorStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentReplicatorStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentTopicStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentTopicStats</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentSubscriptionStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentSubscriptionStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PartitionedTopicStats.html" title="class in org.apache.pulsar.common.policies.data">PartitionedTopicStats</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/NonPersistentTopicStats.html" title="class in org.apache.pulsar.common.policies.data">NonPersistentTopicStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistencePolicies.html" title="class in org.apache.pulsar.common.policies.data">PersistencePolicies</a></td>
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PartitionedTopicStats.html" title="class in org.apache.pulsar.common.policies.data">PartitionedTopicStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistencePolicies.html" title="class in org.apache.pulsar.common.policies.data">PersistencePolicies</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistentOfflineTopicStats.html" title="class in org.apache.pulsar.common.policies.data">PersistentOfflineTopicStats</a></td>
 <td class="colLast">
 <div class="block">This object is populated using meta data in zookeeper without actually bringing the topic online</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistentTopicInternalStats.html" title="class in org.apache.pulsar.common.policies.data">PersistentTopicInternalStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistentTopicInternalStats.CursorStats.html" title="class in org.apache.pulsar.common.policies.data">PersistentTopicInternalStats.CursorStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistentTopicInternalStats.LedgerInfo.html" title="class in org.apache.pulsar.common.policies.data">PersistentTopicInternalStats.LedgerInfo</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PersistentTopicStats.html" title="class in org.apache.pulsar.common.policies.data">PersistentTopicStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html" title="class in org.apache.pulsar.common.policies.data">Policies</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PropertyAdmin.html" title="class in org.apache.pulsar.common.policies.data">PropertyAdmin</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/PublisherStats.html" title="class in org.apache.pulsar.common.policies.data">PublisherStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/ReplicatorStats.html" title="class in org.apache.pulsar.common.policies.data">ReplicatorStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/ResourceQuota.html" title="class in org.apache.pulsar.common.policies.data">ResourceQuota</a></td>
 <td class="colLast">
 <div class="block">Resource quota for a namespace or namespace bundle.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.html" title="class in org.apache.pulsar.common.policies.data">RetentionPolicies</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionStats.html" title="class in org.apache.pulsar.common.policies.data">SubscriptionStats</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/package-tree.html b/content/api/admin/org/apache/pulsar/common/policies/data/package-tree.html
index 7978c7e..3434568 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/package-tree.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/package-tree.html
@@ -88,6 +88,7 @@
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/ConsumerStats.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">ConsumerStats</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">DispatchRate</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">ErrorData</span></a></li>
+<li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">FailureDomain</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">LocalPolicies</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">NamespaceIsolationData</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/NamespaceOwnershipStatus.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">NamespaceOwnershipStatus</span></a></li>
diff --git a/content/api/admin/overview-tree.html b/content/api/admin/overview-tree.html
index 072abf6..fa73200 100644
--- a/content/api/admin/overview-tree.html
+++ b/content/api/admin/overview-tree.html
@@ -97,6 +97,7 @@
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/ConsumerStats.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">ConsumerStats</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/DispatchRate.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">DispatchRate</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/ErrorData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">ErrorData</span></a></li>
+<li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/FailureDomain.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">FailureDomain</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/LocalPolicies.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">LocalPolicies</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/NamespaceIsolationData.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">NamespaceIsolationData</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.impl.<a href="org/apache/pulsar/common/policies/impl/NamespaceIsolationPolicies.html" title="class in org.apache.pulsar.common.policies.impl"><span class="typeNameLink">NamespaceIsolationPolicies</span></a></li>
diff --git a/content/api/client/allclasses-frame.html b/content/api/client/allclasses-frame.html
index 1654805..77ff2be 100644
--- a/content/api/client/allclasses-frame.html
+++ b/content/api/client/allclasses-frame.html
@@ -29,6 +29,7 @@
 <li><a href="org/apache/pulsar/client/api/MessageRouter.html" title="interface in org.apache.pulsar.client.api" target="classFrame"><span class="interfaceName">MessageRouter</span></a></li>
 <li><a href="org/apache/pulsar/client/api/Producer.html" title="interface in org.apache.pulsar.client.api" target="classFrame"><span class="interfaceName">Producer</span></a></li>
 <li><a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api" target="classFrame">ProducerConfiguration</a></li>
+<li><a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api" target="classFrame">ProducerConfiguration.HashingScheme</a></li>
 <li><a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api" target="classFrame">ProducerConfiguration.MessageRoutingMode</a></li>
 <li><a href="org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api" target="classFrame">ProducerCryptoFailureAction</a></li>
 <li><a href="org/apache/pulsar/client/api/PulsarClient.html" title="interface in org.apache.pulsar.client.api" target="classFrame"><span class="interfaceName">PulsarClient</span></a></li>
diff --git a/content/api/client/allclasses-noframe.html b/content/api/client/allclasses-noframe.html
index 1973a33..d65b524 100644
--- a/content/api/client/allclasses-noframe.html
+++ b/content/api/client/allclasses-noframe.html
@@ -29,6 +29,7 @@
 <li><a href="org/apache/pulsar/client/api/MessageRouter.html" title="interface in org.apache.pulsar.client.api"><span class="interfaceName">MessageRouter</span></a></li>
 <li><a href="org/apache/pulsar/client/api/Producer.html" title="interface in org.apache.pulsar.client.api"><span class="interfaceName">Producer</span></a></li>
 <li><a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></li>
+<li><a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a></li>
 <li><a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></li>
 <li><a href="org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api">ProducerCryptoFailureAction</a></li>
 <li><a href="org/apache/pulsar/client/api/PulsarClient.html" title="interface in org.apache.pulsar.client.api"><span class="interfaceName">PulsarClient</span></a></li>
diff --git a/content/api/client/deprecated-list.html b/content/api/client/deprecated-list.html
index 9c34204..2d079fb 100644
--- a/content/api/client/deprecated-list.html
+++ b/content/api/client/deprecated-list.html
@@ -91,11 +91,6 @@
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><a href="org/apache/pulsar/client/api/Authentication.html#configure-java.util.Map-">org.apache.pulsar.client.api.Authentication.configure(Map&lt;String, String&gt;)</a>
-<div class="block"><span class="deprecationComment">This method will be deleted on versin 2.0, instead please use configure(String encodedAuthParamString) which is in EncodedAuthenticationParameterSupport for now and will be integrated into this interface.</span></div>
-</td>
-</tr>
-<tr class="altColor">
 <td class="colOne"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#getMessageRouter-int-">org.apache.pulsar.client.api.ProducerConfiguration.getMessageRouter(int)</a>
 <div class="block"><span class="deprecationComment">since 1.22.0-incubating. <tt>numPartitions</tt> is already passed as parameter in
  <a href="org/apache/pulsar/client/api/MessageRouter.html#choosePartition-org.apache.pulsar.client.api.Message-org.apache.pulsar.client.api.TopicMetadata-"><code>MessageRouter.choosePartition(Message, TopicMetadata)</code></a>.</span></div>
diff --git a/content/api/client/index-all.html b/content/api/client/index-all.html
index 5ff13fd..1cc760e 100644
--- a/content/api/client/index-all.html
+++ b/content/api/client/index-all.html
@@ -196,9 +196,7 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/Authentication.html#configure-java.util.Map-">configure(Map&lt;String, String&gt;)</a></span> - Method in interface org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/Authentication.html" title="interface in org.apache.pulsar.client.api">Authentication</a></dt>
 <dd>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>
-<div class="block"><span class="deprecationComment">This method will be deleted on versin 2.0, instead please use configure(String encodedAuthParamString) which is in EncodedAuthenticationParameterSupport for now and will be integrated into this interface.</span></div>
-</div>
+<div class="block">Configure the authentication plugins with the supplied parameters</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.html#configure-java.lang.String-">configure(String)</a></span> - Method in interface org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.html" title="interface in org.apache.pulsar.client.api">EncodedAuthenticationParameterSupport</a></dt>
 <dd>
@@ -363,6 +361,8 @@
 <dd>
 <div class="block">Get the event time associated with this message.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#getHashingScheme--">getHashingScheme()</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/AuthenticationDataProvider.html#getHttpAuthType--">getHttpAuthType()</a></span> - Method in interface org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/AuthenticationDataProvider.html" title="interface in org.apache.pulsar.client.api">AuthenticationDataProvider</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/AuthenticationDataProvider.html#getHttpHeaders--">getHttpHeaders()</a></span> - Method in interface org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/AuthenticationDataProvider.html" title="interface in org.apache.pulsar.client.api">AuthenticationDataProvider</a></dt>
@@ -389,6 +389,10 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#getMaxPendingMessages--">getMaxPendingMessages()</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#getMaxPendingMessagesAcrossPartitions--">getMaxPendingMessagesAcrossPartitions()</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ConsumerConfiguration.html#getMaxTotalReceiverQueueSizeAcrossPartitions--">getMaxTotalReceiverQueueSizeAcrossPartitions()</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/Message.html#getMessageId--">getMessageId()</a></span> - Method in interface org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/Message.html" title="interface in org.apache.pulsar.client.api">Message</a></dt>
 <dd>
 <div class="block">Get the unique message ID associated with this message.</div>
@@ -646,6 +650,8 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#ProducerConfiguration--">ProducerConfiguration()</a></span> - Constructor for class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerConfiguration.HashingScheme</span></a> - Enum in <a href="org/apache/pulsar/client/api/package-summary.html">org.apache.pulsar.client.api</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerConfiguration.MessageRoutingMode</span></a> - Enum in <a href="org/apache/pulsar/client/api/package-summary.html">org.apache.pulsar.client.api</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerCryptoFailureAction</span></a> - Enum in <a href="org/apache/pulsar/client/api/package-summary.html">org.apache.pulsar.client.api</a></dt>
@@ -894,6 +900,8 @@
 <dd>
 <div class="block">Set the event time for a given message.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#setHashingScheme-org.apache.pulsar.client.api.ProducerConfiguration.HashingScheme-">setHashingScheme(ProducerConfiguration.HashingScheme)</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#setInitialSequenceId-long-">setInitialSequenceId(long)</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></dt>
 <dd>
 <div class="block">Set the baseline for the sequence ids for messages published by the producer.</div>
@@ -922,6 +930,14 @@
 <dd>
 <div class="block">Set the max size of the queue holding the messages pending to receive an acknowledgment from the broker.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessagesAcrossPartitions-int-">setMaxPendingMessagesAcrossPartitions(int)</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></dt>
+<dd>
+<div class="block">Set the number of max pending messages across all the partitions</div>
+</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ConsumerConfiguration.html#setMaxTotalReceiverQueueSizeAcrossPartitions-int-">setMaxTotalReceiverQueueSizeAcrossPartitions(int)</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></dt>
+<dd>
+<div class="block">Set the max total receiver queue size across partitons.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ConsumerConfiguration.html#setMessageListener-org.apache.pulsar.client.api.MessageListener-">setMessageListener(MessageListener)</a></span> - Method in class org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></dt>
 <dd>
 <div class="block">Sets a <a href="org/apache/pulsar/client/api/MessageListener.html" title="interface in org.apache.pulsar.client.api"><code>MessageListener</code></a> for the consumer</div>
@@ -1108,6 +1124,10 @@
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a></dt>
+<dd>
+<div class="block">Returns the enum constant of this type with the specified name.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -1130,6 +1150,11 @@ the order they are declared.</div>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html#values--">values()</a></span> - Static method in enum org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a></dt>
+<dd>
+<div class="block">Returns an array containing the constants of this enum type, in
+the order they are declared.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html#values--">values()</a></span> - Static method in enum org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
diff --git a/content/api/client/org/apache/pulsar/client/api/Authentication.html b/content/api/client/org/apache/pulsar/client/api/Authentication.html
index 1fbefba..4fa6a73 100644
--- a/content/api/client/org/apache/pulsar/client/api/Authentication.html
+++ b/content/api/client/org/apache/pulsar/client/api/Authentication.html
@@ -17,8 +17,8 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":38,"i1":6,"i2":6,"i3":6};
-var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
 var tableTab = "tableTab";
@@ -118,7 +118,7 @@ extends Closeable, Serializable</pre>
 </a>
 <h3>Method Summary</h3>
 <table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
-<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t6" class="tableTab"><span><a href="javascript:show(32);">Deprecated Methods</a></span><span class="t [...]
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd">&nbsp;</span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
 <th class="colLast" scope="col">Method and Description</th>
@@ -126,9 +126,7 @@ extends Closeable, Serializable</pre>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/Authentication.html#configure-java.util.Map-">configure</a></span>(Map&lt;String,String&gt;&nbsp;authParams)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
-<div class="block"><span class="deprecationComment">This method will be deleted on versin 2.0, instead please use configure(String encodedAuthParamString) which is in EncodedAuthenticationParameterSupport for now and will be integrated into this interface.</span></div>
-</div>
+<div class="block">Configure the authentication plugins with the supplied parameters</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -203,9 +201,7 @@ extends Closeable, Serializable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>configure</h4>
-<pre>@Deprecated
-void&nbsp;configure(Map&lt;String,String&gt;&nbsp;authParams)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;<span class="deprecationComment">This method will be deleted on versin 2.0, instead please use configure(String encodedAuthParamString) which is in EncodedAuthenticationParameterSupport for now and will be integrated into this interface.</span></div>
+<pre>void&nbsp;configure(Map&lt;String,String&gt;&nbsp;authParams)</pre>
 <div class="block">Configure the authentication plugins with the supplied parameters</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/content/api/client/org/apache/pulsar/client/api/ClientConfiguration.html b/content/api/client/org/apache/pulsar/client/api/ClientConfiguration.html
index a0f7ec8..ec31e51 100644
--- a/content/api/client/org/apache/pulsar/client/api/ClientConfiguration.html
+++ b/content/api/client/org/apache/pulsar/client/api/ClientConfiguration.html
@@ -730,7 +730,7 @@ implements Serializable</pre>
 <h4>setConcurrentLookupRequest</h4>
 <pre>public&nbsp;void&nbsp;setConcurrentLookupRequest(int&nbsp;concurrentLookupRequest)</pre>
 <div class="block">Number of concurrent lookup-requests allowed on each broker-connection to prevent overload on broker.
- <i>(default: 5000)</i> It should be configured with higher value only in case of it requires to produce/subscribe on
+ <i>(default: 50000)</i> It should be configured with higher value only in case of it requires to produce/subscribe on
  thousands of topic using created <a href="../../../../../org/apache/pulsar/client/api/PulsarClient.html" title="interface in org.apache.pulsar.client.api"><code>PulsarClient</code></a></div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/content/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html b/content/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html
index 1312f4a..3e77340 100644
--- a/content/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html
+++ b/content/api/client/org/apache/pulsar/client/api/ConsumerConfiguration.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -173,83 +173,93 @@ implements Serializable</pre>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#getCryptoKeyReader--">getCryptoKeyReader</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#getMaxTotalReceiverQueueSizeAcrossPartitions--">getMaxTotalReceiverQueueSizeAcrossPartitions</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/MessageListener.html" title="interface in org.apache.pulsar.client.api">MessageListener</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#getMessageListener--">getMessageListener</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#getPriorityLevel--">getPriorityLevel</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>Map&lt;String,String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#getProperties--">getProperties</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#getReceiverQueueSize--">getReceiverQueueSize</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/SubscriptionType.html" title="enum in org.apache.pulsar.client.api">SubscriptionType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#getSubscriptionType--">getSubscriptionType</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setAckTimeout-long-java.util.concurrent.TimeUnit-">setAckTimeout</a></span>(long&nbsp;ackTimeout,
              TimeUnit&nbsp;timeUnit)</code>
 <div class="block">Set the timeout for unacked messages, truncated to the nearest millisecond.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setConsumerName-java.lang.String-">setConsumerName</a></span>(String&nbsp;consumerName)</code>
 <div class="block">Set the consumer name.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setCryptoFailureAction-org.apache.pulsar.client.api.ConsumerCryptoFailureAction-">setCryptoFailureAction</a></span>(<a href="../../../../../org/apache/pulsar/client/api/ConsumerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api">ConsumerCryptoFailureAction</a>&nbsp;action)</code>
 <div class="block">Sets the ConsumerCryptoFailureAction to the value specified</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setCryptoKeyReader-org.apache.pulsar.client.api.CryptoKeyReader-">setCryptoKeyReader</a></span>(<a href="../../../../../org/apache/pulsar/client/api/CryptoKeyReader.html" title="interface in org.apache.pulsar.client.api">CryptoKeyReader</a>&nbsp;cryptoKeyReader)</code>
 <div class="block">Sets a <a href="../../../../../org/apache/pulsar/client/api/CryptoKeyReader.html" title="interface in org.apache.pulsar.client.api"><code>CryptoKeyReader</code></a></div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setMaxTotalReceiverQueueSizeAcrossPartitions-int-">setMaxTotalReceiverQueueSizeAcrossPartitions</a></span>(int&nbsp;maxTotalReceiverQueueSizeAcrossPartitions)</code>
+<div class="block">Set the max total receiver queue size across partitons.</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setMessageListener-org.apache.pulsar.client.api.MessageListener-">setMessageListener</a></span>(<a href="../../../../../org/apache/pulsar/client/api/MessageListener.html" title="interface in org.apache.pulsar.client.api">MessageListener</a>&nbsp;messageListener)</code>
 <div class="block">Sets a <a href="../../../../../org/apache/pulsar/client/api/MessageListener.html" title="interface in org.apache.pulsar.client.api"><code>MessageListener</code></a> for the consumer</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setPriorityLevel-int-">setPriorityLevel</a></span>(int&nbsp;priorityLevel)</code>
 <div class="block">Sets priority level for the shared subscription consumers to which broker gives more priority while dispatching
  messages.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setProperties-java.util.Map-">setProperties</a></span>(Map&lt;String,String&gt;&nbsp;properties)</code>
 <div class="block">Add all the properties in the provided map</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setProperty-java.lang.String-java.lang.String-">setProperty</a></span>(String&nbsp;key,
            String&nbsp;value)</code>
 <div class="block">Set a name/value property with this consumer.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setReceiverQueueSize-int-">setReceiverQueueSize</a></span>(int&nbsp;receiverQueueSize)</code>
 <div class="block">Sets the size of the consumer receive queue.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html" title="class in org.apache.pulsar.client.api">ConsumerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setSubscriptionType-org.apache.pulsar.client.api.SubscriptionType-">setSubscriptionType</a></span>(<a href="../../../../../org/apache/pulsar/client/api/SubscriptionType.html" title="enum in org.apache.pulsar.client.api">SubscriptionType</a>&nbsp;subscriptionType)</code>
 <div class="block">Select the subscription type to be used when subscribing to the topic.</div>
@@ -398,6 +408,36 @@ implements Serializable</pre>
 </dl>
 </li>
 </ul>
+<a name="getMaxTotalReceiverQueueSizeAcrossPartitions--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMaxTotalReceiverQueueSizeAcrossPartitions</h4>
+<pre>public&nbsp;int&nbsp;getMaxTotalReceiverQueueSizeAcrossPartitions()</pre>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the configured max total receiver queue size across partitions</dd>
+</dl>
+</li>
+</ul>
+<a name="setMaxTotalReceiverQueueSizeAcrossPartitions-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMaxTotalReceiverQueueSizeAcrossPartitions</h4>
+<pre>public&nbsp;void&nbsp;setMaxTotalReceiverQueueSizeAcrossPartitions(int&nbsp;maxTotalReceiverQueueSizeAcrossPartitions)</pre>
+<div class="block">Set the max total receiver queue size across partitons.
+ <p>
+ This setting will be used to reduce the receiver queue size for individual partitions
+ <a href="../../../../../org/apache/pulsar/client/api/ConsumerConfiguration.html#setReceiverQueueSize-int-"><code>setReceiverQueueSize(int)</code></a> if the total exceeds this value (default: 50000).</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>maxTotalReceiverQueueSizeAcrossPartitions</code> - </dd>
+</dl>
+</li>
+</ul>
 <a name="getCryptoKeyReader--">
 <!--   -->
 </a>
@@ -535,7 +575,7 @@ implements Serializable</pre>
  permits, else broker will consider next priority level consumers. </br>
  If subscription has consumer-A with priorityLevel 0 and Consumer-B with priorityLevel 1 then broker will dispatch
  messages to only consumer-A until it runs out permit and then broker starts dispatching messages to Consumer-B.
- 
+
  <pre>
  Consumer PriorityLevel Permits
  C1       0             2
diff --git a/content/api/client/org/apache/pulsar/client/api/MessageId.html b/content/api/client/org/apache/pulsar/client/api/MessageId.html
index 08d30dc..1165c22 100644
--- a/content/api/client/org/apache/pulsar/client/api/MessageId.html
+++ b/content/api/client/org/apache/pulsar/client/api/MessageId.html
@@ -97,9 +97,14 @@ var activeTableTab = "activeTableTab";
 <div class="description">
 <ul class="blockList">
 <li class="blockList">
+<dl>
+<dt>All Superinterfaces:</dt>
+<dd>Comparable&lt;<a href="../../../../../org/apache/pulsar/client/api/MessageId.html" title="interface in org.apache.pulsar.client.api">MessageId</a>&gt;</dd>
+</dl>
 <hr>
 <br>
-<pre>public interface <span class="typeNameLabel">MessageId</span></pre>
+<pre>public interface <span class="typeNameLabel">MessageId</span>
+extends Comparable&lt;<a href="../../../../../org/apache/pulsar/client/api/MessageId.html" title="interface in org.apache.pulsar.client.api">MessageId</a>&gt;</pre>
 <div class="block">Opaque unique identifier of a single message
 
  The MessageId can be used to reference a specific message, for example when acknowledging, without having to retain
@@ -158,6 +163,13 @@ var activeTableTab = "activeTableTab";
 </td>
 </tr>
 </table>
+<ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.Comparable">
+<!--   -->
+</a>
+<h3>Methods inherited from interface&nbsp;Comparable</h3>
+<code>compareTo</code></li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html b/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html
similarity index 74%
copy from content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html
copy to content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html
index ab88157..be09d86 100644
--- a/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html
+++ b/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ProducerConfiguration.MessageRoutingMode (Pulsar Client Java API)</title>
+<title>ProducerConfiguration.HashingScheme (Pulsar Client Java API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -11,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ProducerConfiguration.MessageRoutingMode (Pulsar Client Java API)";
+            parent.document.title="ProducerConfiguration.HashingScheme (Pulsar Client Java API)";
         }
     }
     catch(err) {
@@ -48,11 +48,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" target="_top">Frames</a></li>
-<li><a href="ProducerConfiguration.MessageRoutingMode.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" target="_top">Frames</a></li>
+<li><a href="ProducerConfiguration.HashingScheme.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -91,17 +91,17 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.pulsar.client.api</div>
-<h2 title="Enum ProducerConfiguration.MessageRoutingMode" class="title">Enum ProducerConfiguration.MessageRoutingMode</h2>
+<h2 title="Enum ProducerConfiguration.HashingScheme" class="title">Enum ProducerConfiguration.HashingScheme</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>Object</li>
 <li>
 <ul class="inheritance">
-<li>Enum&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a>&gt;</li>
+<li>Enum&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.pulsar.client.api.ProducerConfiguration.MessageRoutingMode</li>
+<li>org.apache.pulsar.client.api.ProducerConfiguration.HashingScheme</li>
 </ul>
 </li>
 </ul>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>Serializable, Comparable&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a>&gt;</dd>
+<dd>Serializable, Comparable&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>&gt;</dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
@@ -120,8 +120,8 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static enum <span class="typeNameLabel">ProducerConfiguration.MessageRoutingMode</span>
-extends Enum&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a>&gt;</pre>
+<pre>public static enum <span class="typeNameLabel">ProducerConfiguration.HashingScheme</span>
+extends Enum&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>&gt;</pre>
 </li>
 </ul>
 </div>
@@ -140,13 +140,10 @@ extends Enum&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerCon
 <th class="colOne" scope="col">Enum Constant and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html#CustomPartition">CustomPartition</a></span></code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html#JavaStringHash">JavaStringHash</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html#RoundRobinPartition">RoundRobinPartition</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html#SinglePartition">SinglePartition</a></span></code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html#Murmur3_32Hash">Murmur3_32Hash</a></span></code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -164,14 +161,14 @@ extends Enum&lt;<a href="../../../../../org/apache/pulsar/client/api/ProducerCon
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html#valueOf-java.lang.String-">valueOf</a></span>(String&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html#valueOf-java.lang.String-">valueOf</a></span>(String&nbsp;name)</code>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static <a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html#values--">values</a></span>()</code>
+<td class="colFirst"><code>static <a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html#values--">values</a></span>()</code>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
@@ -205,31 +202,22 @@ the order they are declared.</div>
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
-<a name="SinglePartition">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>SinglePartition</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a> SinglePartition</pre>
-</li>
-</ul>
-<a name="RoundRobinPartition">
+<a name="JavaStringHash">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>RoundRobinPartition</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a> RoundRobinPartition</pre>
+<h4>JavaStringHash</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a> JavaStringHash</pre>
 </li>
 </ul>
-<a name="CustomPartition">
+<a name="Murmur3_32Hash">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>CustomPartition</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a> CustomPartition</pre>
+<h4>Murmur3_32Hash</h4>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a> Murmur3_32Hash</pre>
 </li>
 </ul>
 </li>
@@ -246,12 +234,12 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a>[]&nbsp;values()</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>[]&nbsp;values()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.  This method may be used to iterate
 over the constants as follows:
 <pre>
-for (ProducerConfiguration.MessageRoutingMode c : ProducerConfiguration.MessageRoutingMode.values())
+for (ProducerConfiguration.HashingScheme c : ProducerConfiguration.HashingScheme.values())
 &nbsp;   System.out.println(c);
 </pre></div>
 <dl>
@@ -266,7 +254,7 @@ for (ProducerConfiguration.MessageRoutingMode c : ProducerConfiguration.MessageR
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a>&nbsp;valueOf(String&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>&nbsp;valueOf(String&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -310,11 +298,11 @@ not permitted.)</div>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" target="_top">Frames</a></li>
-<li><a href="ProducerConfiguration.MessageRoutingMode.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" target="_top">Frames</a></li>
+<li><a href="ProducerConfiguration.HashingScheme.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html b/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html
index ab88157..17195a0 100644
--- a/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html
+++ b/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html
@@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -309,7 +309,7 @@ not permitted.)</div>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html b/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html
index f14d596..d130be0 100644
--- a/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html
+++ b/content/api/client/org/apache/pulsar/client/api/ProducerConfiguration.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":42,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":42,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/pulsar/client/api/Producer.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/pulsar/client/api/ProducerConfiguration.html" target="_top">Frames</a></li>
@@ -139,6 +139,10 @@ implements Serializable</pre>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></span></code>&nbsp;</td>
 </tr>
 </table>
@@ -216,20 +220,28 @@ implements Serializable</pre>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getEncryptionKeys--">getEncryptionKeys</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getHashingScheme--">getHashingScheme</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>Optional&lt;Long&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getInitialSequenceId--">getInitialSequenceId</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getMaxPendingMessages--">getMaxPendingMessages</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getMaxPendingMessagesAcrossPartitions--">getMaxPendingMessagesAcrossPartitions</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/MessageRouter.html" title="interface in org.apache.pulsar.client.api">MessageRouter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getMessageRouter--">getMessageRouter</a></span>()</code>
 <div class="block">Get the message router set by <a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setMessageRouter-org.apache.pulsar.client.api.MessageRouter-"><code>setMessageRouter(MessageRouter)</code></a>.</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/MessageRouter.html" title="interface in org.apache.pulsar.client.api">MessageRouter</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getMessageRouter-int-">getMessageRouter</a></span>(int&nbsp;numPartitions)</code>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;
@@ -238,47 +250,47 @@ implements Serializable</pre>
 </div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getMessageRoutingMode--">getMessageRoutingMode</a></span>()</code>
 <div class="block">Get the message routing mode for the partitioned producer</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>String</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getProducerName--">getProducerName</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>Map&lt;String,String&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getProperties--">getProperties</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#getSendTimeoutMs--">getSendTimeoutMs</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#isEncryptionEnabled--">isEncryptionEnabled</a></span>()</code>
 <div class="block">Returns true if encryption keys are added</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#removeEncryptionKey-java.lang.String-">removeEncryptionKey</a></span>(String&nbsp;key)</code>&nbsp;</td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingEnabled-boolean-">setBatchingEnabled</a></span>(boolean&nbsp;batchMessagesEnabled)</code>
 <div class="block">Control whether automatic batching of messages is enabled for the producer.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingMaxMessages-int-">setBatchingMaxMessages</a></span>(int&nbsp;batchMessagesMaxMessagesPerBatch)</code>
 <div class="block">Set the maximum number of messages permitted in a batch.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setBatchingMaxPublishDelay-long-java.util.concurrent.TimeUnit-">setBatchingMaxPublishDelay</a></span>(long&nbsp;batchDelay,
                           TimeUnit&nbsp;timeUnit)</code>
@@ -286,75 +298,85 @@ implements Serializable</pre>
  enabled.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setBlockIfQueueFull-boolean-">setBlockIfQueueFull</a></span>(boolean&nbsp;blockIfQueueFull)</code>
 <div class="block">Set whether the <a href="../../../../../org/apache/pulsar/client/api/Producer.html#send-byte:A-"><code>Producer.send(byte[])</code></a> and <a href="../../../../../org/apache/pulsar/client/api/Producer.html#sendAsync-byte:A-"><code>Producer.sendAsync(byte[])</code></a> operations should block when the outgoing
  message queue is full.</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setCompressionType-org.apache.pulsar.client.api.CompressionType-">setCompressionType</a></span>(<a href="../../../../../org/apache/pulsar/client/api/CompressionType.html" title="enum in org.apache.pulsar.client.api">CompressionType</a>&nbsp;compressionType)</code>
 <div class="block">Set the compression type for the producer.</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setCryptoFailureAction-org.apache.pulsar.client.api.ProducerCryptoFailureAction-">setCryptoFailureAction</a></span>(<a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api">ProducerCryptoFailureAction</a>&nbsp;action)</code>
 <div class="block">Sets the ProducerCryptoFailureAction to the value specified</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setCryptoKeyReader-org.apache.pulsar.client.api.CryptoKeyReader-">setCryptoKeyReader</a></span>(<a href="../../../../../org/apache/pulsar/client/api/CryptoKeyReader.html" title="interface in org.apache.pulsar.client.api">CryptoKeyReader</a>&nbsp;cryptoKeyReader)</code>
 <div class="block">Sets a <a href="../../../../../org/apache/pulsar/client/api/CryptoKeyReader.html" title="interface in org.apache.pulsar.client.api"><code>CryptoKeyReader</code></a></div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i29" class="rowColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setHashingScheme-org.apache.pulsar.client.api.ProducerConfiguration.HashingScheme-">setHashingScheme</a></span>(<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>&nbsp;hashingScheme)</code>&nbsp;</td>
+</tr>
+<tr id="i30" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setInitialSequenceId-long-">setInitialSequenceId</a></span>(long&nbsp;initialSequenceId)</code>
 <div class="block">Set the baseline for the sequence ids for messages published by the producer.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessages-int-">setMaxPendingMessages</a></span>(int&nbsp;maxPendingMessages)</code>
 <div class="block">Set the max size of the queue holding the messages pending to receive an acknowledgment from the broker.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i32" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessagesAcrossPartitions-int-">setMaxPendingMessagesAcrossPartitions</a></span>(int&nbsp;maxPendingMessagesAcrossPartitions)</code>
+<div class="block">Set the number of max pending messages across all the partitions</div>
+</td>
+</tr>
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setMessageRouter-org.apache.pulsar.client.api.MessageRouter-">setMessageRouter</a></span>(<a href="../../../../../org/apache/pulsar/client/api/MessageRouter.html" title="interface in org.apache.pulsar.client.api">MessageRouter</a>&nbsp;messageRouter)</code>
 <div class="block">Set a custom message routing policy by passing an implementation of MessageRouter</div>
 </td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setMessageRoutingMode-org.apache.pulsar.client.api.ProducerConfiguration.MessageRoutingMode-">setMessageRoutingMode</a></span>(<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a>&nbsp;messageRouteMode)</code>
 <div class="block">Set the message routing mode for the partitioned producer</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setProducerName-java.lang.String-">setProducerName</a></span>(String&nbsp;producerName)</code>
 <div class="block">Specify a name for the producer</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setProperties-java.util.Map-">setProperties</a></span>(Map&lt;String,String&gt;&nbsp;properties)</code>
 <div class="block">Add all the properties in the provided map</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setProperty-java.lang.String-java.lang.String-">setProperty</a></span>(String&nbsp;key,
            String&nbsp;value)</code>
 <div class="block">Set a name/value property with this producer.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setSendTimeout-int-java.util.concurrent.TimeUnit-">setSendTimeout</a></span>(int&nbsp;sendTimeout,
               TimeUnit&nbsp;unit)</code>
@@ -499,6 +521,54 @@ implements Serializable</pre>
 </dl>
 </li>
 </ul>
+<a name="getHashingScheme--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHashingScheme</h4>
+<pre>public&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>&nbsp;getHashingScheme()</pre>
+</li>
+</ul>
+<a name="setHashingScheme-org.apache.pulsar.client.api.ProducerConfiguration.HashingScheme-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setHashingScheme</h4>
+<pre>public&nbsp;<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html" title="class in org.apache.pulsar.client.api">ProducerConfiguration</a>&nbsp;setHashingScheme(<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a>&nbsp;hashingScheme)</pre>
+</li>
+</ul>
+<a name="getMaxPendingMessagesAcrossPartitions--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMaxPendingMessagesAcrossPartitions</h4>
+<pre>public&nbsp;int&nbsp;getMaxPendingMessagesAcrossPartitions()</pre>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the maximum number of pending messages allowed across all the partitions</dd>
+</dl>
+</li>
+</ul>
+<a name="setMaxPendingMessagesAcrossPartitions-int-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMaxPendingMessagesAcrossPartitions</h4>
+<pre>public&nbsp;void&nbsp;setMaxPendingMessagesAcrossPartitions(int&nbsp;maxPendingMessagesAcrossPartitions)</pre>
+<div class="block">Set the number of max pending messages across all the partitions
+ <p>
+ This setting will be used to lower the max pending messages for each partition
+ (<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.html#setMaxPendingMessages-int-"><code>setMaxPendingMessages(int)</code></a>), if the total exceeds the configured value.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>maxPendingMessagesAcrossPartitions</code> - </dd>
+</dl>
+</li>
+</ul>
 <a name="getBlockIfQueueFull--">
 <!--   -->
 </a>
@@ -524,7 +594,7 @@ implements Serializable</pre>
  message queue is full.
  <p>
  Default is <code>false</code>. If set to <code>false</code>, send operations will immediately fail with
- <code>ProducerQueueIsFullError</code> when there is no space left in pending queue.</div>
+ <a href="../../../../../org/apache/pulsar/client/api/PulsarClientException.ProducerQueueIsFullError.html" title="class in org.apache.pulsar.client.api"><code>PulsarClientException.ProducerQueueIsFullError</code></a> when there is no space left in pending queue.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>blockIfQueueFull</code> - whether to block <a href="../../../../../org/apache/pulsar/client/api/Producer.html#send-byte:A-"><code>Producer.send(byte[])</code></a> and <a href="../../../../../org/apache/pulsar/client/api/Producer.html#sendAsync-byte:A-"><code>Producer.sendAsync(byte[])</code></a> operations on queue full</dd>
@@ -964,7 +1034,7 @@ public&nbsp;<a href="../../../../../org/apache/pulsar/client/api/MessageRouter.h
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/pulsar/client/api/Producer.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/pulsar/client/api/ProducerConfiguration.html" target="_top">Frames</a></li>
diff --git a/content/api/client/org/apache/pulsar/client/api/package-frame.html b/content/api/client/org/apache/pulsar/client/api/package-frame.html
index bbdde03..ca55fa1 100644
--- a/content/api/client/org/apache/pulsar/client/api/package-frame.html
+++ b/content/api/client/org/apache/pulsar/client/api/package-frame.html
@@ -41,6 +41,7 @@
 <ul title="Enums">
 <li><a href="CompressionType.html" title="enum in org.apache.pulsar.client.api" target="classFrame">CompressionType</a></li>
 <li><a href="ConsumerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api" target="classFrame">ConsumerCryptoFailureAction</a></li>
+<li><a href="ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api" target="classFrame">ProducerConfiguration.HashingScheme</a></li>
 <li><a href="ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api" target="classFrame">ProducerConfiguration.MessageRoutingMode</a></li>
 <li><a href="ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api" target="classFrame">ProducerCryptoFailureAction</a></li>
 <li><a href="SubscriptionType.html" title="enum in org.apache.pulsar.client.api" target="classFrame">SubscriptionType</a></li>
diff --git a/content/api/client/org/apache/pulsar/client/api/package-summary.html b/content/api/client/org/apache/pulsar/client/api/package-summary.html
index 90efb87..d12f9f1 100644
--- a/content/api/client/org/apache/pulsar/client/api/package-summary.html
+++ b/content/api/client/org/apache/pulsar/client/api/package-summary.html
@@ -226,14 +226,18 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></td>
+<td class="colFirst"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api">ProducerCryptoFailureAction</a></td>
+<td class="colFirst"><a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api">ProducerCryptoFailureAction</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/pulsar/client/api/SubscriptionType.html" title="enum in org.apache.pulsar.client.api">SubscriptionType</a></td>
 <td class="colLast">
 <div class="block">Types of subscription supported by Pulsar</div>
diff --git a/content/api/client/org/apache/pulsar/client/api/package-tree.html b/content/api/client/org/apache/pulsar/client/api/package-tree.html
index f7e4f59..eabc041 100644
--- a/content/api/client/org/apache/pulsar/client/api/package-tree.html
+++ b/content/api/client/org/apache/pulsar/client/api/package-tree.html
@@ -142,11 +142,15 @@
 </li>
 </ul>
 </li>
+<li type="circle">Comparable&lt;T&gt;
+<ul>
+<li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/MessageId.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">MessageId</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/CryptoKeyReader.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">CryptoKeyReader</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">EncodedAuthenticationParameterSupport</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/Message.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">Message</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/MessageBuilder.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">MessageBuilder</span></a></li>
-<li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/MessageId.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">MessageId</span></a></li>
 <li type="circle">Serializable
 <ul>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/Authentication.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">Authentication</span></a> (also extends Closeable)</li>
@@ -166,6 +170,7 @@
 <ul>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/CompressionType.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">CompressionType</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/ConsumerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ConsumerCryptoFailureAction</span></a></li>
+<li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerConfiguration.HashingScheme</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerConfiguration.MessageRoutingMode</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerCryptoFailureAction</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="../../../../../org/apache/pulsar/client/api/SubscriptionType.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">SubscriptionType</span></a></li>
diff --git a/content/api/client/overview-tree.html b/content/api/client/overview-tree.html
index 8ae491c..19b063a 100644
--- a/content/api/client/overview-tree.html
+++ b/content/api/client/overview-tree.html
@@ -146,11 +146,15 @@
 </li>
 </ul>
 </li>
+<li type="circle">Comparable&lt;T&gt;
+<ul>
+<li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/MessageId.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">MessageId</span></a></li>
+</ul>
+</li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/CryptoKeyReader.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">CryptoKeyReader</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/EncodedAuthenticationParameterSupport.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">EncodedAuthenticationParameterSupport</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/Message.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">Message</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/MessageBuilder.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">MessageBuilder</span></a></li>
-<li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/MessageId.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">MessageId</span></a></li>
 <li type="circle">Serializable
 <ul>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/Authentication.html" title="interface in org.apache.pulsar.client.api"><span class="typeNameLink">Authentication</span></a> (also extends Closeable)</li>
@@ -170,6 +174,7 @@
 <ul>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/CompressionType.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">CompressionType</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ConsumerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ConsumerCryptoFailureAction</span></a></li>
+<li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerConfiguration.HashingScheme</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerConfiguration.MessageRoutingMode</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/ProducerCryptoFailureAction.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">ProducerCryptoFailureAction</span></a></li>
 <li type="circle">org.apache.pulsar.client.api.<a href="org/apache/pulsar/client/api/SubscriptionType.html" title="enum in org.apache.pulsar.client.api"><span class="typeNameLink">SubscriptionType</span></a></li>
diff --git a/content/api/client/serialized-form.html b/content/api/client/serialized-form.html
index 2bb9ea4..c225c1e 100644
--- a/content/api/client/serialized-form.html
+++ b/content/api/client/serialized-form.html
@@ -164,6 +164,10 @@
 <pre>int receiverQueueSize</pre>
 </li>
 <li class="blockList">
+<h4>maxTotalReceiverQueueSizeAcrossPartitions</h4>
+<pre>int maxTotalReceiverQueueSizeAcrossPartitions</pre>
+</li>
+<li class="blockList">
 <h4>consumerName</h4>
 <pre>String consumerName</pre>
 </li>
@@ -220,10 +224,18 @@
 <pre>int maxPendingMessages</pre>
 </li>
 <li class="blockList">
+<h4>maxPendingMessagesAcrossPartitions</h4>
+<pre>int maxPendingMessagesAcrossPartitions</pre>
+</li>
+<li class="blockList">
 <h4>messageRouteMode</h4>
 <pre><a href="org/apache/pulsar/client/api/ProducerConfiguration.MessageRoutingMode.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.MessageRoutingMode</a> messageRouteMode</pre>
 </li>
 <li class="blockList">
+<h4>hashingScheme</h4>
+<pre><a href="org/apache/pulsar/client/api/ProducerConfiguration.HashingScheme.html" title="enum in org.apache.pulsar.client.api">ProducerConfiguration.HashingScheme</a> hashingScheme</pre>
+</li>
+<li class="blockList">
 <h4>customMessageRouter</h4>
 <pre><a href="org/apache/pulsar/client/api/MessageRouter.html" title="interface in org.apache.pulsar.client.api">MessageRouter</a> customMessageRouter</pre>
 </li>
diff --git a/content/api/cpp/annotated.html b/content/api/cpp/annotated.html
index 6fbc134..9772a89 100644
--- a/content/api/cpp/annotated.html
+++ b/content/api/cpp/annotated.html
@@ -100,14 +100,16 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <tr id="row_0_6_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_client_configuration.html" target="_self">ClientConfiguration</a></td><td class="desc"></td></tr>
 <tr id="row_0_7_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_consumer.html" target="_self">Consumer</a></td><td class="desc"></td></tr>
 <tr id="row_0_8_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_consumer_configuration.html" target="_self">ConsumerConfiguration</a></td><td class="desc"></td></tr>
-<tr id="row_0_9_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message.html" target="_self">Message</a></td><td class="desc"></td></tr>
-<tr id="row_0_10_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message_builder.html" target="_self">MessageBuilder</a></td><td class="desc"></td></tr>
-<tr id="row_0_11_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message_id.html" target="_self">MessageId</a></td><td class="desc"></td></tr>
-<tr id="row_0_12_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message_routing_policy.html" target="_self">MessageRoutingPolicy</a></td><td class="desc"></td></tr>
-<tr id="row_0_13_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_producer.html" target="_self">Producer</a></td><td class="desc"></td></tr>
-<tr id="row_0_14_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_producer_configuration.html" target="_self">ProducerConfiguration</a></td><td class="desc"></td></tr>
-<tr id="row_0_15_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_reader.html" target="_self">Reader</a></td><td class="desc"></td></tr>
-<tr id="row_0_16_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_reader_configuration.html" target="_self">ReaderConfiguration</a></td><td class="desc"></td></tr>
+<tr id="row_0_9_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_deprecated_exception.html" target="_self">DeprecatedException</a></td><td class="desc"></td></tr>
+<tr id="row_0_10_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message.html" target="_self">Message</a></td><td class="desc"></td></tr>
+<tr id="row_0_11_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message_builder.html" target="_self">MessageBuilder</a></td><td class="desc"></td></tr>
+<tr id="row_0_12_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message_id.html" target="_self">MessageId</a></td><td class="desc"></td></tr>
+<tr id="row_0_13_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_message_routing_policy.html" target="_self">MessageRoutingPolicy</a></td><td class="desc"></td></tr>
+<tr id="row_0_14_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_producer.html" target="_self">Producer</a></td><td class="desc"></td></tr>
+<tr id="row_0_15_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_producer_configuration.html" target="_self">ProducerConfiguration</a></td><td class="desc"></td></tr>
+<tr id="row_0_16_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_reader.html" target="_self">Reader</a></td><td class="desc"></td></tr>
+<tr id="row_0_17_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_reader_configuration.html" target="_self">ReaderConfiguration</a></td><td class="desc"></td></tr>
+<tr id="row_0_18_"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_topic_metadata.html" target="_self">TopicMetadata</a></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
diff --git a/content/api/cpp/classes.html b/content/api/cpp/classes.html
index 1bcafa4..6f8b074 100644
--- a/content/api/cpp/classes.html
+++ b/content/api/cpp/classes.html
@@ -88,25 +88,28 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <div class="title">Class Index</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="qindex"><a class="qindex" href="#letter_A">A</a>&#160;|&#160;<a class="qindex" href="#letter_B">B</a>&#160;|&#160;<a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_M">M</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_R">R</a></div>
+<div class="qindex"><a class="qindex" href="#letter_A">A</a>&#160;|&#160;<a class="qindex" href="#letter_B">B</a>&#160;|&#160;<a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_D">D</a>&#160;|&#160;<a class="qindex" href="#letter_M">M</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_R">R</a>&#160;|&#160;<a class="qindex" href="#letter_T">T</a></div>
 <table class="classindex">
 <tr><td rowspan="2" valign="bottom"><a name="letter_A"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;A&#160;&#160;</div></td></tr></table>
-</td><td valign="top"><a class="el" href="classpulsar_1_1_broker_consumer_stats.html">BrokerConsumerStats</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_consumer_configuration.html">ConsumerConfiguration</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_message_routing_policy.html">MessageRoutingPolicy</a> (<a class="el [...]
+</td><td valign="top"><a class="el" href="classpulsar_1_1_broker_consumer_stats.html">BrokerConsumerStats</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;D&#160;&#160;</div></td></tr></table>
+</td><td valign="top"><a class="el" href="classpulsar_1_1_message_id.html">MessageId</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_reader_configuration.html">ReaderConfiguration</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td></tr>
 <tr><td rowspan="2" valign="bottom"><a name="letter_C"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;C&#160;&#160;</div></td></tr></table>
-</td><td rowspan="2" valign="bottom"><a name="letter_M"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;M&#160;&#160;</div></td></tr></table>
-</td><td rowspan="2" valign="bottom"><a name="letter_P"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;P&#160;&#160;</div></td></tr></table>
-</td><td></td></tr>
-<tr><td valign="top"><a class="el" href="classpulsar_1_1_authentication.html">Authentication</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td></td></tr>
-<tr><td valign="top"><a class="el" href="classpulsar_1_1_authentication_data_provider.html">AuthenticationDataProvider</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_client.html">Client</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_message.html">Message</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160 [...]
-<tr><td valign="top"><a class="el" href="classpulsar_1_1_auth_factory.html">AuthFactory</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_client_configuration.html">ClientConfiguration</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_message_builder.html">MessageBuilder</a> (<a class="el" href="namespacepulsar.html">pulsa [...]
+</td><td valign="top"><a class="el" href="classpulsar_1_1_message_routing_policy.html">MessageRoutingPolicy</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_T"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;T&#160;&#160;</div></td></tr></table>
+</td></tr>
+<tr><td valign="top"><a class="el" href="classpulsar_1_1_authentication.html">Authentication</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_deprecated_exception.html">DeprecatedException</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_P"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&# [...]
+</td></tr>
+<tr><td valign="top"><a class="el" href="classpulsar_1_1_authentication_data_provider.html">AuthenticationDataProvider</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_client.html">Client</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_M"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#1 [...]
+</td><td valign="top"><a class="el" href="classpulsar_1_1_topic_metadata.html">TopicMetadata</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td></tr>
+<tr><td valign="top"><a class="el" href="classpulsar_1_1_auth_factory.html">AuthFactory</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_client_configuration.html">ClientConfiguration</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_producer.html">Producer</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;& [...]
 <tr><td rowspan="2" valign="bottom"><a name="letter_B"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;B&#160;&#160;</div></td></tr></table>
-</td><td valign="top"><a class="el" href="classpulsar_1_1_consumer.html">Consumer</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_message_id.html">MessageId</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_R"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;R&#160;&#160;</div></td></t [...]
+</td><td valign="top"><a class="el" href="classpulsar_1_1_consumer.html">Consumer</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_message.html">Message</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_producer_configuration.html">ProducerConfiguration</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160 [...]
+<tr><td valign="top"><a class="el" href="classpulsar_1_1_consumer_configuration.html">ConsumerConfiguration</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classpulsar_1_1_message_builder.html">MessageBuilder</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_R"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#1 [...]
 </td><td></td></tr>
-<tr><td></td><td></td><td></td></tr>
-<tr><td valign="top"><a class="el" href="classpulsar_1_1_batch_message_id.html">BatchMessageId</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td></td><td></td><td valign="top"><a class="el" href="classpulsar_1_1_reader.html">Reader</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td></td></tr>
+<tr><td valign="top"><a class="el" href="classpulsar_1_1_batch_message_id.html">BatchMessageId</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td></td><td></td><td></td></tr>
+<tr><td></td><td></td><td></td><td valign="top"><a class="el" href="classpulsar_1_1_reader.html">Reader</a> (<a class="el" href="namespacepulsar.html">pulsar</a>)&#160;&#160;&#160;</td><td></td></tr>
 <tr><td></td><td></td><td></td><td></td><td></td></tr>
 </table>
-<div class="qindex"><a class="qindex" href="#letter_A">A</a>&#160;|&#160;<a class="qindex" href="#letter_B">B</a>&#160;|&#160;<a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_M">M</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_R">R</a></div>
+<div class="qindex"><a class="qindex" href="#letter_A">A</a>&#160;|&#160;<a class="qindex" href="#letter_B">B</a>&#160;|&#160;<a class="qindex" href="#letter_C">C</a>&#160;|&#160;<a class="qindex" href="#letter_D">D</a>&#160;|&#160;<a class="qindex" href="#letter_M">M</a>&#160;|&#160;<a class="qindex" href="#letter_P">P</a>&#160;|&#160;<a class="qindex" href="#letter_R">R</a>&#160;|&#160;<a class="qindex" href="#letter_T">T</a></div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
diff --git a/content/api/cpp/classpulsar_1_1_auth_factory.html b/content/api/cpp/classpulsar_1_1_auth_factory.html
index e9f4de9..4954a5e 100644
--- a/content/api/cpp/classpulsar_1_1_auth_factory.html
+++ b/content/api/cpp/classpulsar_1_1_auth_factory.html
@@ -124,9 +124,9 @@ Static Protected Attributes</h2></td></tr>
 <tr class="memitem:a6a3436cb14de4c90a3b02509410753fd"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6a3436cb14de4c90a3b02509410753fd"></a>
 static bool&#160;</td><td class="memItemRight" valign="bottom"><b>isShutdownHookRegistered_</b></td></tr>
 <tr class="separator:a6a3436cb14de4c90a3b02509410753fd"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:aa0103333731b092a4d351ddeb2c5f26b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa0103333731b092a4d351ddeb2c5f26b"></a>
+<tr class="memitem:abf8d4232884ae351e216935f1d229ee6"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abf8d4232884ae351e216935f1d229ee6"></a>
 static std::vector&lt; void * &gt;&#160;</td><td class="memItemRight" valign="bottom"><b>loadedLibrariesHandles_</b></td></tr>
-<tr class="separator:aa0103333731b092a4d351ddeb2c5f26b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="separator:abf8d4232884ae351e216935f1d229ee6"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li>include/pulsar/<a class="el" href="_authentication_8h_source.html">Authentication.h</a></li>
diff --git a/content/api/cpp/classpulsar_1_1_batch_message_id.html b/content/api/cpp/classpulsar_1_1_batch_message_id.html
index de9b475..c636775 100644
--- a/content/api/cpp/classpulsar_1_1_batch_message_id.html
+++ b/content/api/cpp/classpulsar_1_1_batch_message_id.html
@@ -158,10 +158,10 @@ int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>batchIndex_</b></t
 int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>ledgerId_</b></td></tr>
 <tr class="separator:a2558c771f93c1a2a710290e312819622 inherit pro_attribs_classpulsar_1_1_message_id"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5eff9137c3f2298790101b2d290ce6d7 inherit pro_attribs_classpulsar_1_1_message_id"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5eff9137c3f2298790101b2d290ce6d7"></a>
-int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>entryId_</b>:48</td></tr>
+int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>entryId_</b>: 48</td></tr>
 <tr class="separator:a5eff9137c3f2298790101b2d290ce6d7 inherit pro_attribs_classpulsar_1_1_message_id"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aeb9d69108d3e653213c8bc1cb1dd6b0c inherit pro_attribs_classpulsar_1_1_message_id"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aeb9d69108d3e653213c8bc1cb1dd6b0c"></a>
-short&#160;</td><td class="memItemRight" valign="bottom"><b>partition_</b>:16</td></tr>
+short&#160;</td><td class="memItemRight" valign="bottom"><b>partition_</b>: 16</td></tr>
 <tr class="separator:aeb9d69108d3e653213c8bc1cb1dd6b0c inherit pro_attribs_classpulsar_1_1_message_id"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="friends"></a>
diff --git a/content/api/cpp/classpulsar_1_1_client_configuration.html b/content/api/cpp/classpulsar_1_1_client_configuration.html
index 9b31b2f..2e9ba45 100644
--- a/content/api/cpp/classpulsar_1_1_client_configuration.html
+++ b/content/api/cpp/classpulsar_1_1_client_configuration.html
@@ -296,7 +296,7 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PulsarWrapper</b></t
         </tr>
       </table>
 </div><div class="memdoc">
-<p>Number of concurrent lookup-requests allowed on each broker-connection to prevent overload on broker. <em>(default: 5000)</em> It should be configured with higher value only in case of it requires to produce/subscribe on thousands of topic using created <a class="el" href="">PulsarClient</a></p>
+<p>Number of concurrent lookup-requests allowed on each broker-connection to prevent overload on broker. <em>(default: 50000)</em> It should be configured with higher value only in case of it requires to produce/subscribe on thousands of topic using created <a class="el" href="">PulsarClient</a></p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">concurrentLookupRequest</td><td></td></tr>
diff --git a/content/api/cpp/classpulsar_1_1_consumer_configuration-members.html b/content/api/cpp/classpulsar_1_1_consumer_configuration-members.html
index 64a52bf..721274e 100644
--- a/content/api/cpp/classpulsar_1_1_consumer_configuration-members.html
+++ b/content/api/cpp/classpulsar_1_1_consumer_configuration-members.html
@@ -100,15 +100,17 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
   <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a8dbae5f4af0e2bd078419096c9cdd8e6">getBrokerConsumerStatsCacheTimeInMs</a>() const </td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>getConsumerName</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getConsumerType</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getMessageListener</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getReceiverQueueSize</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#ad07ae5670961401470b6e98541ddcbf7">getUnAckedMessagesTimeoutMs</a>() const </td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>hasMessageListener</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>operator=</b>(const ConsumerConfiguration &amp;) (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>PulsarWrapper</b> (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
-  <tr><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a453a6af922fea7c45d56264d57925507">setBrokerConsumerStatsCacheTimeInMs</a>(const long cacheTimeInMs)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>setConsumerName</b>(const std::string &amp;) (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
-  <tr><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#ace6b2f1da486fcffacc4e877e5533268">setConsumerType</a>(ConsumerType consumerType)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a2ad7b00cae770f1f75ad5791ddf22052">getMaxTotalReceiverQueueSizeAcrossPartitions</a>() const </td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getMessageListener</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getReceiverQueueSize</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#ad07ae5670961401470b6e98541ddcbf7">getUnAckedMessagesTimeoutMs</a>() const </td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>hasMessageListener</b>() const  (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>operator=</b>(const ConsumerConfiguration &amp;) (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>PulsarWrapper</b> (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"><span class="mlabel">friend</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a453a6af922fea7c45d56264d57925507">setBrokerConsumerStatsCacheTimeInMs</a>(const long cacheTimeInMs)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>setConsumerName</b>(const std::string &amp;) (defined in <a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#ace6b2f1da486fcffacc4e877e5533268">setConsumerType</a>(ConsumerType consumerType)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a9c07888abe996b80c2fd168278a24de3">setMaxTotalReceiverQueueSizeAcrossPartitions</a>(int maxTotalReceiverQueueSizeAcrossPartitions)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#aeb4301821f8f471c6c542f486df9639d">setMessageListener</a>(MessageListener messageListener)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
   <tr><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a265d2cd1e9d1d329eff9b98346f245c2">setReceiverQueueSize</a>(int size)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
   <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html#ad55a4f0187517c984de8d01f8660fb8f">setUnAckedMessagesTimeoutMs</a>(const uint64_t milliSeconds)</td><td class="entry"><a class="el" href="classpulsar_1_1_consumer_configuration.html">pulsar::ConsumerConfiguration</a></td><td class="entry"></td></tr>
diff --git a/content/api/cpp/classpulsar_1_1_consumer_configuration.html b/content/api/cpp/classpulsar_1_1_consumer_configuration.html
index 53f865e..e52e8af 100644
--- a/content/api/cpp/classpulsar_1_1_consumer_configuration.html
+++ b/content/api/cpp/classpulsar_1_1_consumer_configuration.html
@@ -125,6 +125,10 @@ bool&#160;</td><td class="memItemRight" valign="bottom"><b>hasMessageListener</b
 <tr class="memitem:a4a87e62a6fc25abf3a952545046edba2"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4a87e62a6fc25abf3a952545046edba2"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>getReceiverQueueSize</b> () const </td></tr>
 <tr class="separator:a4a87e62a6fc25abf3a952545046edba2"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9c07888abe996b80c2fd168278a24de3"><td class="memItemLeft" align="right" valign="top">void&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a9c07888abe996b80c2fd168278a24de3">setMaxTotalReceiverQueueSizeAcrossPartitions</a> (int maxTotalReceiverQueueSizeAcrossPartitions)</td></tr>
+<tr class="separator:a9c07888abe996b80c2fd168278a24de3"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2ad7b00cae770f1f75ad5791ddf22052"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_consumer_configuration.html#a2ad7b00cae770f1f75ad5791ddf22052">getMaxTotalReceiverQueueSizeAcrossPartitions</a> () const </td></tr>
+<tr class="separator:a2ad7b00cae770f1f75ad5791ddf22052"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a7a3cfb88ea1f1d67c4f8a9209ca228af"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7a3cfb88ea1f1d67c4f8a9209ca228af"></a>
 void&#160;</td><td class="memItemRight" valign="bottom"><b>setConsumerName</b> (const std::string &amp;)</td></tr>
 <tr class="separator:a7a3cfb88ea1f1d67c4f8a9209ca228af"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -165,6 +169,22 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PulsarWrapper</b></t
 
 </div>
 </div>
+<a class="anchor" id="a2ad7b00cae770f1f75ad5791ddf22052"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int pulsar::ConsumerConfiguration::getMaxTotalReceiverQueueSizeAcrossPartitions </td>
+          <td>(</td>
+          <td class="paramname"></td><td>)</td>
+          <td> const</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<dl class="section return"><dt>Returns</dt><dd>the configured max total receiver queue size across partitions </dd></dl>
+
+</div>
+</div>
 <a class="anchor" id="ad07ae5670961401470b6e98541ddcbf7"></a>
 <div class="memitem">
 <div class="memproto">
@@ -220,6 +240,30 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PulsarWrapper</b></t
 
 </div>
 </div>
+<a class="anchor" id="a9c07888abe996b80c2fd168278a24de3"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void pulsar::ConsumerConfiguration::setMaxTotalReceiverQueueSizeAcrossPartitions </td>
+          <td>(</td>
+          <td class="paramtype">int&#160;</td>
+          <td class="paramname"><em>maxTotalReceiverQueueSizeAcrossPartitions</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<p>Set the max total receiver queue size across partitons. </p>
+<p>This setting will be used to reduce the receiver queue size for individual partitions <a class="el" href="classpulsar_1_1_consumer_configuration.html#a265d2cd1e9d1d329eff9b98346f245c2">setReceiverQueueSize(int)</a> if the total exceeds this value (default: 50000).</p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">maxTotalReceiverQueueSizeAcrossPartitions</td><td></td></tr>
+  </table>
+  </dd>
+</dl>
+
+</div>
+</div>
 <a class="anchor" id="aeb4301821f8f471c6c542f486df9639d"></a>
 <div class="memitem">
 <div class="memproto">
diff --git a/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html b/content/api/cpp/classpulsar_1_1_deprecated_exception-members.html
similarity index 79%
copy from content/api/cpp/classpulsar_1_1_message_routing_policy-members.html
copy to content/api/cpp/classpulsar_1_1_deprecated_exception-members.html
index 913888e..876d713 100644
--- a/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html
+++ b/content/api/cpp/classpulsar_1_1_deprecated_exception-members.html
@@ -84,19 +84,18 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_message_routing_policy.html">MessageRoutingPolicy</a></li>  </ul>
+<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_deprecated_exception.html">DeprecatedException</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="headertitle">
-<div class="title">pulsar::MessageRoutingPolicy Member List</div>  </div>
+<div class="title">pulsar::DeprecatedException Member List</div>  </div>
 </div><!--header-->
 <div class="contents">
 
-<p>This is the complete list of members for <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>, including all inherited members.</p>
+<p>This is the complete list of members for <a class="el" href="classpulsar_1_1_deprecated_exception.html">pulsar::DeprecatedException</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getPartition</b>(const Message &amp;msg)=0 (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>~MessageRoutingPolicy</b>() (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>DeprecatedException</b>(const std::string &amp;__arg) (defined in <a class="el" href="classpulsar_1_1_deprecated_exception.html">pulsar::DeprecatedException</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_deprecated_exception.html">pulsar::DeprecatedException</a></td><td class="entry"><span class="mlabel">explicit</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
diff --git a/content/api/cpp/classpulsar_1_1_message_routing_policy.html b/content/api/cpp/classpulsar_1_1_deprecated_exception.html
similarity index 80%
copy from content/api/cpp/classpulsar_1_1_message_routing_policy.html
copy to content/api/cpp/classpulsar_1_1_deprecated_exception.html
index 353992c..27706ed 100644
--- a/content/api/cpp/classpulsar_1_1_message_routing_policy.html
+++ b/content/api/cpp/classpulsar_1_1_deprecated_exception.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.11"/>
-<title>pulsar-client-cpp: pulsar::MessageRoutingPolicy Class Reference</title>
+<title>pulsar-client-cpp: pulsar::DeprecatedException Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -84,26 +84,34 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_message_routing_policy.html">MessageRoutingPolicy</a></li>  </ul>
+<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_deprecated_exception.html">DeprecatedException</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-methods">Public Member Functions</a> &#124;
-<a href="classpulsar_1_1_message_routing_policy-members.html">List of all members</a>  </div>
+<a href="classpulsar_1_1_deprecated_exception-members.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">pulsar::MessageRoutingPolicy Class Reference<span class="mlabels"><span class="mlabel">abstract</span></span></div>  </div>
+<div class="title">pulsar::DeprecatedException Class Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
+<div class="dynheader">
+Inheritance diagram for pulsar::DeprecatedException:</div>
+<div class="dyncontent">
+ <div class="center">
+  <img src="classpulsar_1_1_deprecated_exception.png" usemap="#pulsar::DeprecatedException_map" alt=""/>
+  <map id="pulsar::DeprecatedException_map" name="pulsar::DeprecatedException_map">
+</map>
+ </div></div>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a35e4fd4022dd7d317f23dc89a7edeab7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a35e4fd4022dd7d317f23dc89a7edeab7"></a>
-virtual int&#160;</td><td class="memItemRight" valign="bottom"><b>getPartition</b> (const <a class="el" href="classpulsar_1_1_message.html">Message</a> &amp;msg)=0</td></tr>
-<tr class="separator:a35e4fd4022dd7d317f23dc89a7edeab7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ad1bd8ffeafe5f201aed0098e669b4284"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad1bd8ffeafe5f201aed0098e669b4284"></a>
+&#160;</td><td class="memItemRight" valign="bottom"><b>DeprecatedException</b> (const std::string &amp;__arg)</td></tr>
+<tr class="separator:ad1bd8ffeafe5f201aed0098e669b4284"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
 <hr/>The documentation for this class was generated from the following file:<ul>
-<li>include/pulsar/<a class="el" href="_message_routing_policy_8h_source.html">MessageRoutingPolicy.h</a></li>
+<li>include/pulsar/<a class="el" href="_deprecated_exception_8h_source.html">DeprecatedException.h</a></li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
diff --git a/content/api/cpp/classpulsar_1_1_deprecated_exception.png b/content/api/cpp/classpulsar_1_1_deprecated_exception.png
new file mode 100644
index 0000000..733da60
Binary files /dev/null and b/content/api/cpp/classpulsar_1_1_deprecated_exception.png differ
diff --git a/content/api/cpp/classpulsar_1_1_message_id.html b/content/api/cpp/classpulsar_1_1_message_id.html
index 920fbae..accc97b 100644
--- a/content/api/cpp/classpulsar_1_1_message_id.html
+++ b/content/api/cpp/classpulsar_1_1_message_id.html
@@ -147,10 +147,10 @@ Protected Attributes</h2></td></tr>
 int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>ledgerId_</b></td></tr>
 <tr class="separator:a2558c771f93c1a2a710290e312819622"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a5eff9137c3f2298790101b2d290ce6d7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5eff9137c3f2298790101b2d290ce6d7"></a>
-int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>entryId_</b>:48</td></tr>
+int64_t&#160;</td><td class="memItemRight" valign="bottom"><b>entryId_</b>: 48</td></tr>
 <tr class="separator:a5eff9137c3f2298790101b2d290ce6d7"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:aeb9d69108d3e653213c8bc1cb1dd6b0c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aeb9d69108d3e653213c8bc1cb1dd6b0c"></a>
-short&#160;</td><td class="memItemRight" valign="bottom"><b>partition_</b>:16</td></tr>
+short&#160;</td><td class="memItemRight" valign="bottom"><b>partition_</b>: 16</td></tr>
 <tr class="separator:aeb9d69108d3e653213c8bc1cb1dd6b0c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="friends"></a>
diff --git a/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html b/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html
index 913888e..821b8f9 100644
--- a/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html
+++ b/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html
@@ -95,8 +95,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
 <p>This is the complete list of members for <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getPartition</b>(const Message &amp;msg)=0 (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>~MessageRoutingPolicy</b>() (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html#a8071e740dd2e44ae75a91901e776c310">getPartition</a>(const Message &amp;msg)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getPartition</b>(const Message &amp;msg, const TopicMetadata &amp;topicMetadata) (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>~MessageRoutingPolicy</b>() (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
diff --git a/content/api/cpp/classpulsar_1_1_message_routing_policy.html b/content/api/cpp/classpulsar_1_1_message_routing_policy.html
index 353992c..f6de8a9 100644
--- a/content/api/cpp/classpulsar_1_1_message_routing_policy.html
+++ b/content/api/cpp/classpulsar_1_1_message_routing_policy.html
@@ -92,16 +92,44 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <a href="#pub-methods">Public Member Functions</a> &#124;
 <a href="classpulsar_1_1_message_routing_policy-members.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">pulsar::MessageRoutingPolicy Class Reference<span class="mlabels"><span class="mlabel">abstract</span></span></div>  </div>
+<div class="title">pulsar::MessageRoutingPolicy Class Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a35e4fd4022dd7d317f23dc89a7edeab7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a35e4fd4022dd7d317f23dc89a7edeab7"></a>
-virtual int&#160;</td><td class="memItemRight" valign="bottom"><b>getPartition</b> (const <a class="el" href="classpulsar_1_1_message.html">Message</a> &amp;msg)=0</td></tr>
-<tr class="separator:a35e4fd4022dd7d317f23dc89a7edeab7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a8071e740dd2e44ae75a91901e776c310"><td class="memItemLeft" align="right" valign="top">virtual int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_message_routing_policy.html#a8071e740dd2e44ae75a91901e776c310">getPartition</a> (const <a class="el" href="classpulsar_1_1_message.html">Message</a> &amp;msg)</td></tr>
+<tr class="separator:a8071e740dd2e44ae75a91901e776c310"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a080148f08d302d032b0f49d68ada73de"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a080148f08d302d032b0f49d68ada73de"></a>
+virtual int&#160;</td><td class="memItemRight" valign="bottom"><b>getPartition</b> (const <a class="el" href="classpulsar_1_1_message.html">Message</a> &amp;msg, const <a class="el" href="classpulsar_1_1_topic_metadata.html">TopicMetadata</a> &amp;topicMetadata)</td></tr>
+<tr class="separator:a080148f08d302d032b0f49d68ada73de"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
+<h2 class="groupheader">Member Function Documentation</h2>
+<a class="anchor" id="a8071e740dd2e44ae75a91901e776c310"></a>
+<div class="memitem">
+<div class="memproto">
+<table class="mlabels">
+  <tr>
+  <td class="mlabels-left">
+      <table class="memname">
+        <tr>
+          <td class="memname">virtual int pulsar::MessageRoutingPolicy::getPartition </td>
+          <td>(</td>
+          <td class="paramtype">const <a class="el" href="classpulsar_1_1_message.html">Message</a> &amp;&#160;</td>
+          <td class="paramname"><em>msg</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+  </td>
+  <td class="mlabels-right">
+<span class="mlabels"><span class="mlabel">inline</span><span class="mlabel">virtual</span></span>  </td>
+  </tr>
+</table>
+</div><div class="memdoc">
+<dl class="deprecated"><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>Use int getPartition(const Message&amp; msg, const TopicMetadata&amp; topicMetadata) </dd></dl>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li>include/pulsar/<a class="el" href="_message_routing_policy_8h_source.html">MessageRoutingPolicy.h</a></li>
 </ul>
diff --git a/content/api/cpp/classpulsar_1_1_producer_configuration-members.html b/content/api/cpp/classpulsar_1_1_producer_configuration-members.html
index bcf1b34..76b9842 100644
--- a/content/api/cpp/classpulsar_1_1_producer_configuration-members.html
+++ b/content/api/cpp/classpulsar_1_1_producer_configuration-members.html
@@ -95,19 +95,25 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
 <p>This is the complete list of members for <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>CustomPartition</b> enum value (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getBatchingEnabled</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getBatchingMaxAllowedSizeInBytes</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getBatchingMaxMessages</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getBatchingMaxPublishDelayMs</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getBlockIfQueueFull</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getCompressionType</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>BoostHash</b> enum value (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>CustomPartition</b> enum value (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getBatchingEnabled</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getBatchingMaxAllowedSizeInBytes</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getBatchingMaxMessages</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getBatchingMaxPublishDelayMs</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getBlockIfQueueFull</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getCompressionType</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getHashingScheme</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>getInitialSequenceId</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getMaxPendingMessages</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getMessageRouterPtr</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getPartitionsRoutingMode</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>getProducerName</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getSendTimeout</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html#a4791e6a58ba180382e9fdc1e349a4188">getMaxPendingMessagesAcrossPartitions</a>() const </td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getMessageRouterPtr</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getPartitionsRoutingMode</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getProducerName</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>getSendTimeout</b>() const  (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>HashingScheme</b> enum name (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>JavaStringHash</b> enum value (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>Murmur3_32Hash</b> enum value (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>operator=</b>(const ProducerConfiguration &amp;) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>PartitionsRoutingMode</b> enum name (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>ProducerConfiguration</b>() (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
@@ -120,8 +126,10 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>setBatchingMaxPublishDelayMs</b>(const unsigned long &amp;batchingMaxPublishDelayMs) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>setBlockIfQueueFull</b>(bool) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>setCompressionType</b>(CompressionType compressionType) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>setInitialSequenceId</b>(int64_t initialSequenceId) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>setMaxPendingMessages</b>(int maxPendingMessages) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>setHashingScheme</b>(const HashingScheme &amp;scheme) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>setInitialSequenceId</b>(int64_t initialSequenceId) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr bgcolor="#f0f0f0"><td class="entry"><b>setMaxPendingMessages</b>(int maxPendingMessages) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
+  <tr class="even"><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html#a158f3061d38b91b3c9ccf81545278a61">setMaxPendingMessagesAcrossPartitions</a>(int maxPendingMessagesAcrossPartitions)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>setMessageRouter</b>(const MessageRoutingPolicyPtr &amp;router) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>setPartitionsRoutingMode</b>(const PartitionsRoutingMode &amp;mode) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
   <tr bgcolor="#f0f0f0"><td class="entry"><b>setProducerName</b>(const std::string &amp;producerName) (defined in <a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_producer_configuration.html">pulsar::ProducerConfiguration</a></td><td class="entry"></td></tr>
diff --git a/content/api/cpp/classpulsar_1_1_producer_configuration.html b/content/api/cpp/classpulsar_1_1_producer_configuration.html
index ecd7560..b8632ae 100644
--- a/content/api/cpp/classpulsar_1_1_producer_configuration.html
+++ b/content/api/cpp/classpulsar_1_1_producer_configuration.html
@@ -107,6 +107,11 @@ Public Types</h2></td></tr>
 <b>CustomPartition</b>
  }</td></tr>
 <tr class="separator:ad4f416b4f11ec25705f6369cd92e89f6"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ad6d6011184bb2da9f961e7a21e2e656c"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad6d6011184bb2da9f961e7a21e2e656c"></a>enum &#160;</td><td class="memItemRight" valign="bottom"><b>HashingScheme</b> { <b>Murmur3_32Hash</b>, 
+<b>BoostHash</b>, 
+<b>JavaStringHash</b>
+ }</td></tr>
+<tr class="separator:ad6d6011184bb2da9f961e7a21e2e656c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
@@ -146,6 +151,10 @@ CompressionType&#160;</td><td class="memItemRight" valign="bottom"><b>getCompres
 <tr class="memitem:a244303fea863a6b664f80f05273a395a"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a244303fea863a6b664f80f05273a395a"></a>
 int&#160;</td><td class="memItemRight" valign="bottom"><b>getMaxPendingMessages</b> () const </td></tr>
 <tr class="separator:a244303fea863a6b664f80f05273a395a"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a158f3061d38b91b3c9ccf81545278a61"><td class="memItemLeft" align="right" valign="top"><a class="el" href="classpulsar_1_1_producer_configuration.html">ProducerConfiguration</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_producer_configuration.html#a158f3061d38b91b3c9ccf81545278a61">setMaxPendingMessagesAcrossPartitions</a> (int maxPendingMessagesAcrossPartitions)</td></tr>
+<tr class="separator:a158f3061d38b91b3c9ccf81545278a61"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a4791e6a58ba180382e9fdc1e349a4188"><td class="memItemLeft" align="right" valign="top">int&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_producer_configuration.html#a4791e6a58ba180382e9fdc1e349a4188">getMaxPendingMessagesAcrossPartitions</a> () const </td></tr>
+<tr class="separator:a4791e6a58ba180382e9fdc1e349a4188"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab7ae82ea42b7ecfd36b20534cdb204eb"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab7ae82ea42b7ecfd36b20534cdb204eb"></a>
 <a class="el" href="classpulsar_1_1_producer_configuration.html">ProducerConfiguration</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>setPartitionsRoutingMode</b> (const PartitionsRoutingMode &amp;mode)</td></tr>
 <tr class="separator:ab7ae82ea42b7ecfd36b20534cdb204eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -158,6 +167,12 @@ PartitionsRoutingMode&#160;</td><td class="memItemRight" valign="bottom"><b>getP
 <tr class="memitem:a6df169d09d8f11d0d7266b26efd04f98"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6df169d09d8f11d0d7266b26efd04f98"></a>
 const MessageRoutingPolicyPtr &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>getMessageRouterPtr</b> () const </td></tr>
 <tr class="separator:a6df169d09d8f11d0d7266b26efd04f98"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a2c09224f38f05f3ec59abbe6e3325c5b"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2c09224f38f05f3ec59abbe6e3325c5b"></a>
+<a class="el" href="classpulsar_1_1_producer_configuration.html">ProducerConfiguration</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>setHashingScheme</b> (const HashingScheme &amp;scheme)</td></tr>
+<tr class="separator:a2c09224f38f05f3ec59abbe6e3325c5b"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ad5222b12e277b8d7ddeed38c83798804"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad5222b12e277b8d7ddeed38c83798804"></a>
+HashingScheme&#160;</td><td class="memItemRight" valign="bottom"><b>getHashingScheme</b> () const </td></tr>
+<tr class="separator:ad5222b12e277b8d7ddeed38c83798804"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a953666b06aa2ca889b6c961530602b62"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a953666b06aa2ca889b6c961530602b62"></a>
 <a class="el" href="classpulsar_1_1_producer_configuration.html">ProducerConfiguration</a> &amp;&#160;</td><td class="memItemRight" valign="bottom"><b>setBlockIfQueueFull</b> (bool)</td></tr>
 <tr class="separator:a953666b06aa2ca889b6c961530602b62"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -197,7 +212,48 @@ class&#160;</td><td class="memItemRight" valign="bottom"><b>PulsarWrapper</b></t
 </table>
 <a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
 <div class="textblock"><p>Class that holds the configuration for a producer </p>
-</div><hr/>The documentation for this class was generated from the following file:<ul>
+</div><h2 class="groupheader">Member Function Documentation</h2>
+<a class="anchor" id="a4791e6a58ba180382e9fdc1e349a4188"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">int pulsar::ProducerConfiguration::getMaxPendingMessagesAcrossPartitions </td>
+          <td>(</td>
+          <td class="paramname"></td><td>)</td>
+          <td> const</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<dl class="section return"><dt>Returns</dt><dd>the maximum number of pending messages allowed across all the partitions </dd></dl>
+
+</div>
+</div>
+<a class="anchor" id="a158f3061d38b91b3c9ccf81545278a61"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classpulsar_1_1_producer_configuration.html">ProducerConfiguration</a>&amp; pulsar::ProducerConfiguration::setMaxPendingMessagesAcrossPartitions </td>
+          <td>(</td>
+          <td class="paramtype">int&#160;</td>
+          <td class="paramname"><em>maxPendingMessagesAcrossPartitions</em></td><td>)</td>
+          <td></td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+<p>Set the number of max pending messages across all the partitions </p>
+<p>This setting will be used to lower the max pending messages for each partition (<a class="el" href="">setMaxPendingMessages(int)</a>), if the total exceeds the configured value.</p>
+<dl class="params"><dt>Parameters</dt><dd>
+  <table class="params">
+    <tr><td class="paramname">maxPendingMessagesAcrossPartitions</td><td></td></tr>
+  </table>
+  </dd>
+</dl>
+
+</div>
+</div>
+<hr/>The documentation for this class was generated from the following file:<ul>
 <li>include/pulsar/<a class="el" href="_producer_configuration_8h_source.html">ProducerConfiguration.h</a></li>
 </ul>
 </div><!-- contents -->
diff --git a/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html b/content/api/cpp/classpulsar_1_1_topic_metadata-members.html
similarity index 79%
copy from content/api/cpp/classpulsar_1_1_message_routing_policy-members.html
copy to content/api/cpp/classpulsar_1_1_topic_metadata-members.html
index 913888e..3baaa26 100644
--- a/content/api/cpp/classpulsar_1_1_message_routing_policy-members.html
+++ b/content/api/cpp/classpulsar_1_1_topic_metadata-members.html
@@ -84,19 +84,18 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_message_routing_policy.html">MessageRoutingPolicy</a></li>  </ul>
+<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_topic_metadata.html">TopicMetadata</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="headertitle">
-<div class="title">pulsar::MessageRoutingPolicy Member List</div>  </div>
+<div class="title">pulsar::TopicMetadata Member List</div>  </div>
 </div><!--header-->
 <div class="contents">
 
-<p>This is the complete list of members for <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>, including all inherited members.</p>
+<p>This is the complete list of members for <a class="el" href="classpulsar_1_1_topic_metadata.html">pulsar::TopicMetadata</a>, including all inherited members.</p>
 <table class="directory">
-  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getPartition</b>(const Message &amp;msg)=0 (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
-  <tr bgcolor="#f0f0f0"><td class="entry"><b>~MessageRoutingPolicy</b>() (defined in <a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_message_routing_policy.html">pulsar::MessageRoutingPolicy</a></td><td class="entry"><span class="mlabel">inline</span><span class="mlabel">virtual</span></td></tr>
+  <tr bgcolor="#f0f0f0" class="even"><td class="entry"><b>getNumPartitions</b>() const =0 (defined in <a class="el" href="classpulsar_1_1_topic_metadata.html">pulsar::TopicMetadata</a>)</td><td class="entry"><a class="el" href="classpulsar_1_1_topic_metadata.html">pulsar::TopicMetadata</a></td><td class="entry"><span class="mlabel">pure virtual</span></td></tr>
 </table></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
diff --git a/content/api/cpp/classpulsar_1_1_message_routing_policy.html b/content/api/cpp/classpulsar_1_1_topic_metadata.html
similarity index 81%
copy from content/api/cpp/classpulsar_1_1_message_routing_policy.html
copy to content/api/cpp/classpulsar_1_1_topic_metadata.html
index 353992c..90191b3 100644
--- a/content/api/cpp/classpulsar_1_1_message_routing_policy.html
+++ b/content/api/cpp/classpulsar_1_1_topic_metadata.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.11"/>
-<title>pulsar-client-cpp: pulsar::MessageRoutingPolicy Class Reference</title>
+<title>pulsar-client-cpp: pulsar::TopicMetadata Class Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -84,26 +84,30 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 
 <div id="nav-path" class="navpath">
   <ul>
-<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_message_routing_policy.html">MessageRoutingPolicy</a></li>  </ul>
+<li class="navelem"><a class="el" href="namespacepulsar.html">pulsar</a></li><li class="navelem"><a class="el" href="classpulsar_1_1_topic_metadata.html">TopicMetadata</a></li>  </ul>
 </div>
 </div><!-- top -->
 <div class="header">
   <div class="summary">
 <a href="#pub-methods">Public Member Functions</a> &#124;
-<a href="classpulsar_1_1_message_routing_policy-members.html">List of all members</a>  </div>
+<a href="classpulsar_1_1_topic_metadata-members.html">List of all members</a>  </div>
   <div class="headertitle">
-<div class="title">pulsar::MessageRoutingPolicy Class Reference<span class="mlabels"><span class="mlabel">abstract</span></span></div>  </div>
+<div class="title">pulsar::TopicMetadata Class Reference<span class="mlabels"><span class="mlabel">abstract</span></span></div>  </div>
 </div><!--header-->
 <div class="contents">
+
+<p><code>#include &lt;<a class="el" href="_topic_metadata_8h_source.html">TopicMetadata.h</a>&gt;</code></p>
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:a35e4fd4022dd7d317f23dc89a7edeab7"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a35e4fd4022dd7d317f23dc89a7edeab7"></a>
-virtual int&#160;</td><td class="memItemRight" valign="bottom"><b>getPartition</b> (const <a class="el" href="classpulsar_1_1_message.html">Message</a> &amp;msg)=0</td></tr>
-<tr class="separator:a35e4fd4022dd7d317f23dc89a7edeab7"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a427a1228dd01108f5748ce92516bf5b1"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a427a1228dd01108f5748ce92516bf5b1"></a>
+virtual int&#160;</td><td class="memItemRight" valign="bottom"><b>getNumPartitions</b> () const =0</td></tr>
+<tr class="separator:a427a1228dd01108f5748ce92516bf5b1"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table>
-<hr/>The documentation for this class was generated from the following file:<ul>
-<li>include/pulsar/<a class="el" href="_message_routing_policy_8h_source.html">MessageRoutingPolicy.h</a></li>
+<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
+<div class="textblock"><p>Metadata of a topic that can be used for message routing. </p>
+</div><hr/>The documentation for this class was generated from the following file:<ul>
+<li>include/pulsar/<a class="el" href="_topic_metadata_8h_source.html">TopicMetadata.h</a></li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
diff --git a/content/api/cpp/deprecated.html b/content/api/cpp/deprecated.html
index 616a5a9..563cd37 100644
--- a/content/api/cpp/deprecated.html
+++ b/content/api/cpp/deprecated.html
@@ -83,6 +83,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <div class="textblock"><dl class="reflist">
 <dt><a class="anchor" id="_deprecated000001"></a>Member <a class="el" href="classpulsar_1_1_broker_consumer_stats.html#ab58b97edf0a420f63c3dc2ed29a05485">pulsar::BrokerConsumerStats::getImpl</a>  () const </dt>
 <dd></dd>
+<dt><a class="anchor" id="_deprecated000002"></a>Member <a class="el" href="classpulsar_1_1_message_routing_policy.html#a8071e740dd2e44ae75a91901e776c310">pulsar::MessageRoutingPolicy::getPartition</a>  (const <a class="el" href="classpulsar_1_1_message.html">Message</a> &amp;msg)</dt>
+<dd>Use int getPartition(const Message&amp; msg, const TopicMetadata&amp; topicMetadata) </dd>
 </dl>
 </div></div><!-- contents -->
 <!-- start footer part -->
diff --git a/content/api/cpp/files.html b/content/api/cpp/files.html
index 569ca57..2ec2601 100644
--- a/content/api/cpp/files.html
+++ b/content/api/cpp/files.html
@@ -98,15 +98,17 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <tr id="row_0_0_6_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_consumer_8h_source.html"><span class="icondoc"></span></a><b>Consumer.h</b></td><td class="desc"></td></tr>
 <tr id="row_0_0_7_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_consumer_configuration_8h_source.html"><span class="icondoc"></span></a><b>ConsumerConfiguration.h</b></td><td class="desc"></td></tr>
 <tr id="row_0_0_8_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_consumer_type_8h_source.html"><span class="icondoc"></span></a><b>ConsumerType.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_9_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_8h_source.html"><span class="icondoc"></span></a><b>Message.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_10_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_builder_8h_source.html"><span class="icondoc"></span></a><b>MessageBuilder.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_11_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_id_8h_source.html"><span class="icondoc"></span></a><b>MessageId.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_12_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_routing_policy_8h_source.html"><span class="icondoc"></span></a><b>MessageRoutingPolicy.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_13_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_producer_8h_source.html"><span class="icondoc"></span></a><b>Producer.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_14_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_producer_configuration_8h_source.html"><span class="icondoc"></span></a><b>ProducerConfiguration.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_15_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_reader_8h_source.html"><span class="icondoc"></span></a><b>Reader.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_16_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_reader_configuration_8h_source.html"><span class="icondoc"></span></a><b>ReaderConfiguration.h</b></td><td class="desc"></td></tr>
-<tr id="row_0_0_17_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_result_8h_source.html"><span class="icondoc"></span></a><b>Result.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_9_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_deprecated_exception_8h_source.html"><span class="icondoc"></span></a><b>DeprecatedException.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_10_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_8h_source.html"><span class="icondoc"></span></a><b>Message.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_11_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_builder_8h_source.html"><span class="icondoc"></span></a><b>MessageBuilder.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_12_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_id_8h_source.html"><span class="icondoc"></span></a><b>MessageId.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_13_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_message_routing_policy_8h_source.html"><span class="icondoc"></span></a><b>MessageRoutingPolicy.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_14_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_producer_8h_source.html"><span class="icondoc"></span></a><b>Producer.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_15_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_producer_configuration_8h_source.html"><span class="icondoc"></span></a><b>ProducerConfiguration.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_16_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_reader_8h_source.html"><span class="icondoc"></span></a><b>Reader.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_17_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_reader_configuration_8h_source.html"><span class="icondoc"></span></a><b>ReaderConfiguration.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_18_" class="even"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_result_8h_source.html"><span class="icondoc"></span></a><b>Result.h</b></td><td class="desc"></td></tr>
+<tr id="row_0_0_19_"><td class="entry"><span style="width:48px;display:inline-block;">&#160;</span><a href="_topic_metadata_8h_source.html"><span class="icondoc"></span></a><b>TopicMetadata.h</b></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
diff --git a/content/api/cpp/functions.html b/content/api/cpp/functions.html
index 4d14bcb..c92f663 100644
--- a/content/api/cpp/functions.html
+++ b/content/api/cpp/functions.html
@@ -227,6 +227,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <li>getLogConfFilePath()
 : <a class="el" href="classpulsar_1_1_client_configuration.html#a529fd8eca1a762badfabbe6a379fd52e">pulsar::ClientConfiguration</a>
 </li>
+<li>getMaxPendingMessagesAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_producer_configuration.html#a4791e6a58ba180382e9fdc1e349a4188">pulsar::ProducerConfiguration</a>
+</li>
+<li>getMaxTotalReceiverQueueSizeAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_consumer_configuration.html#a2ad7b00cae770f1f75ad5791ddf22052">pulsar::ConsumerConfiguration</a>
+</li>
 <li>getMessageId()
 : <a class="el" href="classpulsar_1_1_message.html#a21e6cb758f3ed40507023f76ee9b791d">pulsar::Message</a>
 </li>
@@ -251,6 +257,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <li>getOperationTimeoutSeconds()
 : <a class="el" href="classpulsar_1_1_client_configuration.html#a6e6728b038a53f89481377e86c9e7da5">pulsar::ClientConfiguration</a>
 </li>
+<li>getPartition()
+: <a class="el" href="classpulsar_1_1_message_routing_policy.html#a8071e740dd2e44ae75a91901e776c310">pulsar::MessageRoutingPolicy</a>
+</li>
 <li>getPartitionKey()
 : <a class="el" href="classpulsar_1_1_message.html#aa76ba2a01291a297d4a563b483b359bc">pulsar::Message</a>
 </li>
@@ -371,6 +380,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <li>setLogConfFilePath()
 : <a class="el" href="classpulsar_1_1_client_configuration.html#afffc25fc6be9f26221a206c49154b4cf">pulsar::ClientConfiguration</a>
 </li>
+<li>setMaxPendingMessagesAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_producer_configuration.html#a158f3061d38b91b3c9ccf81545278a61">pulsar::ProducerConfiguration</a>
+</li>
+<li>setMaxTotalReceiverQueueSizeAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_consumer_configuration.html#a9c07888abe996b80c2fd168278a24de3">pulsar::ConsumerConfiguration</a>
+</li>
 <li>setMessageListener()
 : <a class="el" href="classpulsar_1_1_consumer_configuration.html#aeb4301821f8f471c6c542f486df9639d">pulsar::ConsumerConfiguration</a>
 </li>
diff --git a/content/api/cpp/functions_func.html b/content/api/cpp/functions_func.html
index 8572e11..2efcb70 100644
--- a/content/api/cpp/functions_func.html
+++ b/content/api/cpp/functions_func.html
@@ -227,6 +227,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <li>getLogConfFilePath()
 : <a class="el" href="classpulsar_1_1_client_configuration.html#a529fd8eca1a762badfabbe6a379fd52e">pulsar::ClientConfiguration</a>
 </li>
+<li>getMaxPendingMessagesAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_producer_configuration.html#a4791e6a58ba180382e9fdc1e349a4188">pulsar::ProducerConfiguration</a>
+</li>
+<li>getMaxTotalReceiverQueueSizeAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_consumer_configuration.html#a2ad7b00cae770f1f75ad5791ddf22052">pulsar::ConsumerConfiguration</a>
+</li>
 <li>getMessageId()
 : <a class="el" href="classpulsar_1_1_message.html#a21e6cb758f3ed40507023f76ee9b791d">pulsar::Message</a>
 </li>
@@ -251,6 +257,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <li>getOperationTimeoutSeconds()
 : <a class="el" href="classpulsar_1_1_client_configuration.html#a6e6728b038a53f89481377e86c9e7da5">pulsar::ClientConfiguration</a>
 </li>
+<li>getPartition()
+: <a class="el" href="classpulsar_1_1_message_routing_policy.html#a8071e740dd2e44ae75a91901e776c310">pulsar::MessageRoutingPolicy</a>
+</li>
 <li>getPartitionKey()
 : <a class="el" href="classpulsar_1_1_message.html#aa76ba2a01291a297d4a563b483b359bc">pulsar::Message</a>
 </li>
@@ -371,6 +380,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <li>setLogConfFilePath()
 : <a class="el" href="classpulsar_1_1_client_configuration.html#afffc25fc6be9f26221a206c49154b4cf">pulsar::ClientConfiguration</a>
 </li>
+<li>setMaxPendingMessagesAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_producer_configuration.html#a158f3061d38b91b3c9ccf81545278a61">pulsar::ProducerConfiguration</a>
+</li>
+<li>setMaxTotalReceiverQueueSizeAcrossPartitions()
+: <a class="el" href="classpulsar_1_1_consumer_configuration.html#a9c07888abe996b80c2fd168278a24de3">pulsar::ConsumerConfiguration</a>
+</li>
 <li>setMessageListener()
 : <a class="el" href="classpulsar_1_1_consumer_configuration.html#aeb4301821f8f471c6c542f486df9639d">pulsar::ConsumerConfiguration</a>
 </li>
diff --git a/content/api/cpp/hierarchy.html b/content/api/cpp/hierarchy.html
index e953f82..6b5817a 100644
--- a/content/api/cpp/hierarchy.html
+++ b/content/api/cpp/hierarchy.html
@@ -107,6 +107,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <tr id="row_13_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_producer_configuration.html" target="_self">pulsar::ProducerConfiguration</a></td><td class="desc"></td></tr>
 <tr id="row_14_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_reader.html" target="_self">pulsar::Reader</a></td><td class="desc"></td></tr>
 <tr id="row_15_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_reader_configuration.html" target="_self">pulsar::ReaderConfiguration</a></td><td class="desc"></td></tr>
+<tr id="row_16_"><td class="entry"><span style="width:0px;display:inline-block;">&#160;</span><span id="arr_16_" class="arrow" onclick="toggleFolder('16_')">&#9660;</span><span class="icona"><span class="icon">C</span></span><b>runtime_error</b></td><td class="desc"></td></tr>
+<tr id="row_16_0_" class="even"><td class="entry"><span style="width:32px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_deprecated_exception.html" target="_self">pulsar::DeprecatedException</a></td><td class="desc"></td></tr>
+<tr id="row_17_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="classpulsar_1_1_topic_metadata.html" target="_self">pulsar::TopicMetadata</a></td><td class="desc"></td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
diff --git a/content/api/cpp/index.html b/content/api/cpp/index.html
index cc029f8..604251f 100644
--- a/content/api/cpp/index.html
+++ b/content/api/cpp/index.html
@@ -108,7 +108,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
 <div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;$ cd pulsar-client-cpp</div><div class="line"><a name="l00002"></a><span class="lineno">    2</span>&#160;$ cmake .</div><div class="line"><a name="l00003"></a><span class="lineno">    3</span>&#160;$ make</div></div><!-- fragment --><h2>Consumer</h2>
 <div class="fragment"><div class="line">Client client(<span class="stringliteral">&quot;pulsar://localhost:6650&quot;</span>);</div><div class="line"></div><div class="line">Consumer consumer;</div><div class="line"><a class="code" href="namespacepulsar.html#ae85314d6b9e8afd831cf8c66705f2dbb">Result</a> result = client.subscribe(<span class="stringliteral">&quot;persistent://sample/standalone/ns1/my-topic&quot;</span>, <span class="stringliteral">&quot;my-subscribtion-name&quot;</span>,  [...]
 <div class="fragment"><div class="line">Client client(<span class="stringliteral">&quot;pulsar://localhost:6650&quot;</span>);</div><div class="line"></div><div class="line">Producer producer;</div><div class="line"><a class="code" href="namespacepulsar.html#ae85314d6b9e8afd831cf8c66705f2dbb">Result</a> result = client.createProducer(<span class="stringliteral">&quot;persistent://sample/standalone/ns1/my-topic&quot;</span>, producer);</div><div class="line"><span class="keywordflow">if</ [...]
-<div class="fragment"><div class="line">ClientConfiguration config = ClientConfiguration();</div><div class="line">config.setUseTls(<span class="keyword">true</span>);</div><div class="line">std::string certfile = <span class="stringliteral">&quot;/path/to/cacert.pem&quot;</span>;</div><div class="line"></div><div class="line">ParamMap params;</div><div class="line">params[<span class="stringliteral">&quot;tlsCertFile&quot;</span>] = <span class="stringliteral">&quot;/path/to/client-cert [...]
+<div class="fragment"><div class="line">ClientConfiguration config = ClientConfiguration();</div><div class="line">config.setUseTls(<span class="keyword">true</span>);</div><div class="line">std::string certfile = <span class="stringliteral">&quot;/path/to/cacert.pem&quot;</span>;</div><div class="line"></div><div class="line">ParamMap params;</div><div class="line">params[<span class="stringliteral">&quot;tlsCertFile&quot;</span>] = <span class="stringliteral">&quot;/path/to/client-cert [...]
+<p>After you changed code, run auto-formatting by the following command.</p>
+<div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno">    1</span>&#160;make format</div></div><!-- fragment --><p> You need to have the following installed to use the auto-formatting.</p><ul>
+<li><a href="https://clang.llvm.org/">clang-format 5.0</a> </li>
+</ul>
+</div></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
 Generated by &#160;<a href="http://www.doxygen.org/index.html">
diff --git a/content/api/cpp/namespacepulsar.html b/content/api/cpp/namespacepulsar.html
index 16c6bbc..d33d731 100644
--- a/content/api/cpp/namespacepulsar.html
+++ b/content/api/cpp/namespacepulsar.html
@@ -112,6 +112,8 @@ Classes</h2></td></tr>
 <tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_consumer_configuration.html">ConsumerConfiguration</a></td></tr>
 <tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_deprecated_exception.html">DeprecatedException</a></td></tr>
+<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_message.html">Message</a></td></tr>
 <tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_message_builder.html">MessageBuilder</a></td></tr>
@@ -128,6 +130,8 @@ Classes</h2></td></tr>
 <tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_reader_configuration.html">ReaderConfiguration</a></td></tr>
 <tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classpulsar_1_1_topic_metadata.html">TopicMetadata</a></td></tr>
+<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
 </table><table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="typedef-members"></a>
 Typedefs</h2></td></tr>
@@ -342,7 +346,7 @@ const char *&#160;</td><td class="memItemRight" valign="bottom"><b>strResult</b>
 <p><a class="el" href="classpulsar_1_1_client.html">Client</a> Initialized with Invalid Broker Url (VIP Url passed to <a class="el" href="classpulsar_1_1_client.html">Client</a> Constructor) </p>
 </td></tr>
 <tr><td class="fieldname"><a class="anchor" id="ae85314d6b9e8afd831cf8c66705f2dbba60abb5ad06a78a3d6d40b2131534dfeb"></a>ResultOperationNotSupported&#160;</td><td class="fielddoc">
-<p>Service Unit unloaded between client did lookup and producer/consumer got created. </p>
+<p>Service Unit unloaded between client did lookup and producer/consumer got created </p>
 </td></tr>
 <tr><td class="fieldname"><a class="anchor" id="ae85314d6b9e8afd831cf8c66705f2dbbab5cc52655496666d96f35edab07c9e7f"></a>ResultProducerBlockedQuotaExceededException&#160;</td><td class="fielddoc">
 <p><a class="el" href="classpulsar_1_1_producer.html">Producer</a> is blocked. </p>
diff --git a/content/api/cpp/search/all_3.js b/content/api/cpp/search/all_3.js
index a17e855..5fc6939 100644
--- a/content/api/cpp/search/all_3.js
+++ b/content/api/cpp/search/all_3.js
@@ -1,6 +1,7 @@
 var searchData=
 [
   ['deprecated_20list',['Deprecated List',['../deprecated.html',1,'']]],
+  ['deprecatedexception',['DeprecatedException',['../classpulsar_1_1_deprecated_exception.html',1,'pulsar']]],
   ['deserialize',['deserialize',['../classpulsar_1_1_message_id.html#a56addaa1fba001e08c15e0baa7aba2c4',1,'pulsar::MessageId']]],
   ['disablereplication',['disableReplication',['../classpulsar_1_1_message_builder.html#a944858b932548411d9f4f6305134cee7',1,'pulsar::MessageBuilder']]]
 ];
diff --git a/content/api/cpp/search/all_5.js b/content/api/cpp/search/all_5.js
index 27b6256..51417d6 100644
--- a/content/api/cpp/search/all_5.js
+++ b/content/api/cpp/search/all_5.js
@@ -17,6 +17,8 @@ var searchData=
   ['getlastsequenceid',['getLastSequenceId',['../classpulsar_1_1_producer.html#ad5f958205d95c8a556bfbc1dc7b7596c',1,'pulsar::Producer']]],
   ['getlength',['getLength',['../classpulsar_1_1_message.html#a287c9e5fd5ee3bf094377060bdf33970',1,'pulsar::Message']]],
   ['getlogconffilepath',['getLogConfFilePath',['../classpulsar_1_1_client_configuration.html#a529fd8eca1a762badfabbe6a379fd52e',1,'pulsar::ClientConfiguration']]],
+  ['getmaxpendingmessagesacrosspartitions',['getMaxPendingMessagesAcrossPartitions',['../classpulsar_1_1_producer_configuration.html#a4791e6a58ba180382e9fdc1e349a4188',1,'pulsar::ProducerConfiguration']]],
+  ['getmaxtotalreceiverqueuesizeacrosspartitions',['getMaxTotalReceiverQueueSizeAcrossPartitions',['../classpulsar_1_1_consumer_configuration.html#a2ad7b00cae770f1f75ad5791ddf22052',1,'pulsar::ConsumerConfiguration']]],
   ['getmessageid',['getMessageId',['../classpulsar_1_1_message.html#a21e6cb758f3ed40507023f76ee9b791d',1,'pulsar::Message']]],
   ['getmessagelistenerthreads',['getMessageListenerThreads',['../classpulsar_1_1_client_configuration.html#a5e0051dc9e1d106dac05038402c588f5',1,'pulsar::ClientConfiguration']]],
   ['getmsgbacklog',['getMsgBacklog',['../classpulsar_1_1_broker_consumer_stats.html#a453c7d2e95d471d6ca3f3416bb9fc211',1,'pulsar::BrokerConsumerStats']]],
@@ -25,6 +27,7 @@ var searchData=
   ['getmsgrateredeliver',['getMsgRateRedeliver',['../classpulsar_1_1_broker_consumer_stats.html#a16d93551fe5cc0eefb45355c364ec8fb',1,'pulsar::BrokerConsumerStats']]],
   ['getmsgthroughputout',['getMsgThroughputOut',['../classpulsar_1_1_broker_consumer_stats.html#a94f8a62b3c43054350e1e43d261aa24a',1,'pulsar::BrokerConsumerStats']]],
   ['getoperationtimeoutseconds',['getOperationTimeoutSeconds',['../classpulsar_1_1_client_configuration.html#a6e6728b038a53f89481377e86c9e7da5',1,'pulsar::ClientConfiguration']]],
+  ['getpartition',['getPartition',['../classpulsar_1_1_message_routing_policy.html#a8071e740dd2e44ae75a91901e776c310',1,'pulsar::MessageRoutingPolicy']]],
   ['getpartitionkey',['getPartitionKey',['../classpulsar_1_1_message.html#aa76ba2a01291a297d4a563b483b359bc',1,'pulsar::Message']]],
   ['getproducername',['getProducerName',['../classpulsar_1_1_producer.html#a6a43751abd70ca64a1c0f84103a502bf',1,'pulsar::Producer']]],
   ['getproperties',['getProperties',['../classpulsar_1_1_message.html#ae0816817a2804b5d82099b313ad02486',1,'pulsar::Message']]],
diff --git a/content/api/cpp/search/all_c.js b/content/api/cpp/search/all_c.js
index ad2bfb4..34ac800 100644
--- a/content/api/cpp/search/all_c.js
+++ b/content/api/cpp/search/all_c.js
@@ -12,6 +12,8 @@ var searchData=
   ['seteventtimestamp',['setEventTimestamp',['../classpulsar_1_1_message_builder.html#a445ac7f5cac5282ef8248df399995338',1,'pulsar::MessageBuilder']]],
   ['setiothreads',['setIOThreads',['../classpulsar_1_1_client_configuration.html#a5081ce72cb0eb615fc209decdea7ca7a',1,'pulsar::ClientConfiguration']]],
   ['setlogconffilepath',['setLogConfFilePath',['../classpulsar_1_1_client_configuration.html#afffc25fc6be9f26221a206c49154b4cf',1,'pulsar::ClientConfiguration']]],
+  ['setmaxpendingmessagesacrosspartitions',['setMaxPendingMessagesAcrossPartitions',['../classpulsar_1_1_producer_configuration.html#a158f3061d38b91b3c9ccf81545278a61',1,'pulsar::ProducerConfiguration']]],
+  ['setmaxtotalreceiverqueuesizeacrosspartitions',['setMaxTotalReceiverQueueSizeAcrossPartitions',['../classpulsar_1_1_consumer_configuration.html#a9c07888abe996b80c2fd168278a24de3',1,'pulsar::ConsumerConfiguration']]],
   ['setmessagelistener',['setMessageListener',['../classpulsar_1_1_consumer_configuration.html#aeb4301821f8f471c6c542f486df9639d',1,'pulsar::ConsumerConfiguration']]],
   ['setmessagelistenerthreads',['setMessageListenerThreads',['../classpulsar_1_1_client_configuration.html#a1c85175f7b3694565b4bfe029c66f49f',1,'pulsar::ClientConfiguration']]],
   ['setoperationtimeoutseconds',['setOperationTimeoutSeconds',['../classpulsar_1_1_client_configuration.html#aebd024ea26e160328a66192e453b4a00',1,'pulsar::ClientConfiguration']]],
diff --git a/content/api/cpp/search/all_d.js b/content/api/cpp/search/all_d.js
index 2288e0e..4c7c376 100644
--- a/content/api/cpp/search/all_d.js
+++ b/content/api/cpp/search/all_d.js
@@ -1,5 +1,4 @@
 var searchData=
 [
-  ['unsubscribe',['unsubscribe',['../classpulsar_1_1_consumer.html#a542ca0a9473a03ccf8bd8aeed24de490',1,'pulsar::Consumer']]],
-  ['unsubscribeasync',['unsubscribeAsync',['../classpulsar_1_1_consumer.html#a8691920cae838418f33f13690a72771d',1,'pulsar::Consumer']]]
+  ['topicmetadata',['TopicMetadata',['../classpulsar_1_1_topic_metadata.html',1,'pulsar']]]
 ];
diff --git a/content/api/cpp/search/classes_3.js b/content/api/cpp/search/classes_3.js
index a2bb3a5..bdc0084 100644
--- a/content/api/cpp/search/classes_3.js
+++ b/content/api/cpp/search/classes_3.js
@@ -1,7 +1,4 @@
 var searchData=
 [
-  ['message',['Message',['../classpulsar_1_1_message.html',1,'pulsar']]],
-  ['messagebuilder',['MessageBuilder',['../classpulsar_1_1_message_builder.html',1,'pulsar']]],
-  ['messageid',['MessageId',['../classpulsar_1_1_message_id.html',1,'pulsar']]],
-  ['messageroutingpolicy',['MessageRoutingPolicy',['../classpulsar_1_1_message_routing_policy.html',1,'pulsar']]]
+  ['deprecatedexception',['DeprecatedException',['../classpulsar_1_1_deprecated_exception.html',1,'pulsar']]]
 ];
diff --git a/content/api/cpp/search/classes_4.js b/content/api/cpp/search/classes_4.js
index 8593cf4..a2bb3a5 100644
--- a/content/api/cpp/search/classes_4.js
+++ b/content/api/cpp/search/classes_4.js
@@ -1,5 +1,7 @@
 var searchData=
 [
-  ['producer',['Producer',['../classpulsar_1_1_producer.html',1,'pulsar']]],
-  ['producerconfiguration',['ProducerConfiguration',['../classpulsar_1_1_producer_configuration.html',1,'pulsar']]]
+  ['message',['Message',['../classpulsar_1_1_message.html',1,'pulsar']]],
+  ['messagebuilder',['MessageBuilder',['../classpulsar_1_1_message_builder.html',1,'pulsar']]],
+  ['messageid',['MessageId',['../classpulsar_1_1_message_id.html',1,'pulsar']]],
+  ['messageroutingpolicy',['MessageRoutingPolicy',['../classpulsar_1_1_message_routing_policy.html',1,'pulsar']]]
 ];
diff --git a/content/api/cpp/search/classes_5.js b/content/api/cpp/search/classes_5.js
index 9e58fde..8593cf4 100644
--- a/content/api/cpp/search/classes_5.js
+++ b/content/api/cpp/search/classes_5.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['reader',['Reader',['../classpulsar_1_1_reader.html',1,'pulsar']]],
-  ['readerconfiguration',['ReaderConfiguration',['../classpulsar_1_1_reader_configuration.html',1,'pulsar']]]
+  ['producer',['Producer',['../classpulsar_1_1_producer.html',1,'pulsar']]],
+  ['producerconfiguration',['ProducerConfiguration',['../classpulsar_1_1_producer_configuration.html',1,'pulsar']]]
 ];
diff --git a/content/api/cpp/search/classes_6.html b/content/api/cpp/search/classes_6.html
new file mode 100644
index 0000000..2db08a0
--- /dev/null
+++ b/content/api/cpp/search/classes_6.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html><head><title></title>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<link rel="stylesheet" type="text/css" href="search.css"/>
+<script type="text/javascript" src="classes_6.js"></script>
+<script type="text/javascript" src="search.js"></script>
+</head>
+<body class="SRPage">
+<div id="SRIndex">
+<div class="SRStatus" id="Loading">Loading...</div>
+<div id="SRResults"></div>
+<script type="text/javascript"><!--
+createResults();
+--></script>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+<script type="text/javascript"><!--
+document.getElementById("Loading").style.display="none";
+document.getElementById("NoMatches").style.display="none";
+var searchResults = new SearchResults("searchResults");
+searchResults.Search();
+--></script>
+</div>
+</body>
+</html>
diff --git a/content/api/cpp/search/classes_5.js b/content/api/cpp/search/classes_6.js
similarity index 100%
copy from content/api/cpp/search/classes_5.js
copy to content/api/cpp/search/classes_6.js
diff --git a/content/api/cpp/search/classes_7.html b/content/api/cpp/search/classes_7.html
new file mode 100644
index 0000000..fd67346
--- /dev/null
+++ b/content/api/cpp/search/classes_7.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html><head><title></title>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta name="generator" content="Doxygen 1.8.11"/>
+<link rel="stylesheet" type="text/css" href="search.css"/>
+<script type="text/javascript" src="classes_7.js"></script>
+<script type="text/javascript" src="search.js"></script>
+</head>
+<body class="SRPage">
+<div id="SRIndex">
+<div class="SRStatus" id="Loading">Loading...</div>
+<div id="SRResults"></div>
+<script type="text/javascript"><!--
+createResults();
+--></script>
+<div class="SRStatus" id="Searching">Searching...</div>
+<div class="SRStatus" id="NoMatches">No Matches</div>
+<script type="text/javascript"><!--
+document.getElementById("Loading").style.display="none";
+document.getElementById("NoMatches").style.display="none";
+var searchResults = new SearchResults("searchResults");
+searchResults.Search();
+--></script>
+</div>
+</body>
+</html>
diff --git a/content/api/cpp/search/classes_7.js b/content/api/cpp/search/classes_7.js
new file mode 100644
index 0000000..4c7c376
--- /dev/null
+++ b/content/api/cpp/search/classes_7.js
@@ -0,0 +1,4 @@
+var searchData=
+[
+  ['topicmetadata',['TopicMetadata',['../classpulsar_1_1_topic_metadata.html',1,'pulsar']]]
+];
diff --git a/content/api/cpp/search/functions_5.js b/content/api/cpp/search/functions_5.js
index 27b6256..51417d6 100644
--- a/content/api/cpp/search/functions_5.js
+++ b/content/api/cpp/search/functions_5.js
@@ -17,6 +17,8 @@ var searchData=
   ['getlastsequenceid',['getLastSequenceId',['../classpulsar_1_1_producer.html#ad5f958205d95c8a556bfbc1dc7b7596c',1,'pulsar::Producer']]],
   ['getlength',['getLength',['../classpulsar_1_1_message.html#a287c9e5fd5ee3bf094377060bdf33970',1,'pulsar::Message']]],
   ['getlogconffilepath',['getLogConfFilePath',['../classpulsar_1_1_client_configuration.html#a529fd8eca1a762badfabbe6a379fd52e',1,'pulsar::ClientConfiguration']]],
+  ['getmaxpendingmessagesacrosspartitions',['getMaxPendingMessagesAcrossPartitions',['../classpulsar_1_1_producer_configuration.html#a4791e6a58ba180382e9fdc1e349a4188',1,'pulsar::ProducerConfiguration']]],
+  ['getmaxtotalreceiverqueuesizeacrosspartitions',['getMaxTotalReceiverQueueSizeAcrossPartitions',['../classpulsar_1_1_consumer_configuration.html#a2ad7b00cae770f1f75ad5791ddf22052',1,'pulsar::ConsumerConfiguration']]],
   ['getmessageid',['getMessageId',['../classpulsar_1_1_message.html#a21e6cb758f3ed40507023f76ee9b791d',1,'pulsar::Message']]],
   ['getmessagelistenerthreads',['getMessageListenerThreads',['../classpulsar_1_1_client_configuration.html#a5e0051dc9e1d106dac05038402c588f5',1,'pulsar::ClientConfiguration']]],
   ['getmsgbacklog',['getMsgBacklog',['../classpulsar_1_1_broker_consumer_stats.html#a453c7d2e95d471d6ca3f3416bb9fc211',1,'pulsar::BrokerConsumerStats']]],
@@ -25,6 +27,7 @@ var searchData=
   ['getmsgrateredeliver',['getMsgRateRedeliver',['../classpulsar_1_1_broker_consumer_stats.html#a16d93551fe5cc0eefb45355c364ec8fb',1,'pulsar::BrokerConsumerStats']]],
   ['getmsgthroughputout',['getMsgThroughputOut',['../classpulsar_1_1_broker_consumer_stats.html#a94f8a62b3c43054350e1e43d261aa24a',1,'pulsar::BrokerConsumerStats']]],
   ['getoperationtimeoutseconds',['getOperationTimeoutSeconds',['../classpulsar_1_1_client_configuration.html#a6e6728b038a53f89481377e86c9e7da5',1,'pulsar::ClientConfiguration']]],
+  ['getpartition',['getPartition',['../classpulsar_1_1_message_routing_policy.html#a8071e740dd2e44ae75a91901e776c310',1,'pulsar::MessageRoutingPolicy']]],
   ['getpartitionkey',['getPartitionKey',['../classpulsar_1_1_message.html#aa76ba2a01291a297d4a563b483b359bc',1,'pulsar::Message']]],
   ['getproducername',['getProducerName',['../classpulsar_1_1_producer.html#a6a43751abd70ca64a1c0f84103a502bf',1,'pulsar::Producer']]],
   ['getproperties',['getProperties',['../classpulsar_1_1_message.html#ae0816817a2804b5d82099b313ad02486',1,'pulsar::Message']]],
diff --git a/content/api/cpp/search/functions_b.js b/content/api/cpp/search/functions_b.js
index ad2bfb4..34ac800 100644
--- a/content/api/cpp/search/functions_b.js
+++ b/content/api/cpp/search/functions_b.js
@@ -12,6 +12,8 @@ var searchData=
   ['seteventtimestamp',['setEventTimestamp',['../classpulsar_1_1_message_builder.html#a445ac7f5cac5282ef8248df399995338',1,'pulsar::MessageBuilder']]],
   ['setiothreads',['setIOThreads',['../classpulsar_1_1_client_configuration.html#a5081ce72cb0eb615fc209decdea7ca7a',1,'pulsar::ClientConfiguration']]],
   ['setlogconffilepath',['setLogConfFilePath',['../classpulsar_1_1_client_configuration.html#afffc25fc6be9f26221a206c49154b4cf',1,'pulsar::ClientConfiguration']]],
+  ['setmaxpendingmessagesacrosspartitions',['setMaxPendingMessagesAcrossPartitions',['../classpulsar_1_1_producer_configuration.html#a158f3061d38b91b3c9ccf81545278a61',1,'pulsar::ProducerConfiguration']]],
+  ['setmaxtotalreceiverqueuesizeacrosspartitions',['setMaxTotalReceiverQueueSizeAcrossPartitions',['../classpulsar_1_1_consumer_configuration.html#a9c07888abe996b80c2fd168278a24de3',1,'pulsar::ConsumerConfiguration']]],
   ['setmessagelistener',['setMessageListener',['../classpulsar_1_1_consumer_configuration.html#aeb4301821f8f471c6c542f486df9639d',1,'pulsar::ConsumerConfiguration']]],
   ['setmessagelistenerthreads',['setMessageListenerThreads',['../classpulsar_1_1_client_configuration.html#a1c85175f7b3694565b4bfe029c66f49f',1,'pulsar::ClientConfiguration']]],
   ['setoperationtimeoutseconds',['setOperationTimeoutSeconds',['../classpulsar_1_1_client_configuration.html#aebd024ea26e160328a66192e453b4a00',1,'pulsar::ClientConfiguration']]],
diff --git a/content/api/cpp/search/searchdata.js b/content/api/cpp/search/searchdata.js
index c04bb51..f59702a 100644
--- a/content/api/cpp/search/searchdata.js
+++ b/content/api/cpp/search/searchdata.js
@@ -1,7 +1,7 @@
 var indexSectionsWithContent =
 {
-  0: "abcdeghilmprsu",
-  1: "abcmpr",
+  0: "abcdeghilmprstu",
+  1: "abcdmprt",
   2: "p",
   3: "abcdeghilprsu",
   4: "mr",
diff --git a/content/api/python/index.html b/content/api/python/index.html
index 1cb450c..5f9eb16 100644
--- a/content/api/python/index.html
+++ b/content/api/python/index.html
@@ -1336,6 +1336,8 @@ class Authentication:
         * `authParamsString`: Comma-separated list of provider-specific
           configuration params
         """
+        _check_type(str, dynamicLibPath, 'dynamicLibPath')
+        _check_type(str, authParamsString, 'authParamsString')
         self.auth = _pulsar.Authentication(dynamicLibPath, authParamsString)
 
 
@@ -1353,7 +1355,7 @@ class Client:
                  operation_timeout_seconds=30,
                  io_threads=1,
                  message_listener_threads=1,
-                 concurrent_lookup_requests=5000,
+                 concurrent_lookup_requests=50000,
                  log_conf_file_path=None,
                  use_tls=False,
                  tls_trust_certs_file_path=None,
@@ -1394,6 +1396,17 @@ class Client:
           Configure whether the Pulsar client accepts untrusted TLS certificates
           from the broker.
         """
+        _check_type(str, service_url, 'service_url')
+        _check_type_or_none(Authentication, authentication, 'authentication')
+        _check_type(int, operation_timeout_seconds, 'operation_timeout_seconds')
+        _check_type(int, io_threads, 'io_threads')
+        _check_type(int, message_listener_threads, 'message_listener_threads')
+        _check_type(int, concurrent_lookup_requests, 'concurrent_lookup_requests')
+        _check_type_or_none(str, log_conf_file_path, 'log_conf_file_path')
+        _check_type(bool, use_tls, 'use_tls')
+        _check_type_or_none(str, tls_trust_certs_file_path, 'tls_trust_certs_file_path')
+        _check_type(bool, tls_allow_insecure_connection, 'tls_allow_insecure_connection')
+
         conf = _pulsar.ClientConfiguration()
         if authentication:
             conf.authentication(authentication.auth)
@@ -1457,6 +1470,18 @@ class Client:
         * `message_routing_mode`:
           Set the message routing mode for the partitioned producer.
         """
+        _check_type(str, topic, 'topic')
+        _check_type_or_none(str, producer_name, 'producer_name')
+        _check_type_or_none(int, initial_sequence_id, 'initial_sequence_id')
+        _check_type(int, send_timeout_millis, 'send_timeout_millis')
+        _check_type(CompressionType, compression_type, 'compression_type')
+        _check_type(int, max_pending_messages, 'max_pending_messages')
+        _check_type(bool, block_if_queue_full, 'block_if_queue_full')
+        _check_type(bool, batching_enabled, 'batching_enabled')
+        _check_type(int, batching_max_messages, 'batching_max_messages')
+        _check_type(int, batching_max_allowed_size_in_bytes, 'batching_max_allowed_size_in_bytes')
+        _check_type(int, batching_max_publish_delay_ms, 'batching_max_publish_delay_ms')
+
         conf = _pulsar.ProducerConfiguration()
         conf.send_timeout_millis(send_timeout_millis)
         conf.compression_type(compression_type)
@@ -1531,6 +1556,14 @@ class Client:
           Sets the time duration for which the broker-side consumer stats will
           be cached in the client.
         """
+        _check_type(str, topic, 'topic')
+        _check_type(str, subscription_name, 'subscription_name')
+        _check_type(ConsumerType, consumer_type, 'consumer_type')
+        _check_type(int, receiver_queue_size, 'receiver_queue_size')
+        _check_type_or_none(str, consumer_name, 'consumer_name')
+        _check_type_or_none(int, unacked_messages_timeout_ms, 'unacked_messages_timeout_ms')
+        _check_type(int, broker_consumer_stats_cache_time_ms, 'broker_consumer_stats_cache_time_ms')
+
         conf = _pulsar.ConsumerConfiguration()
         conf.consumer_type(consumer_type)
         if message_listener:
@@ -1595,6 +1628,11 @@ class Client:
         * `reader_name`:
           Sets the reader name.
         """
+        _check_type(str, topic, 'topic')
+        _check_type(_pulsar.MessageId, start_message_id, 'start_message_id')
+        _check_type(int, receiver_queue_size, 'receiver_queue_size')
+        _check_type_or_none(str, reader_name, 'reader_name')
+
         conf = _pulsar.ReaderConfiguration()
         if reader_listener:
             conf.reader_listener(reader_listener)
@@ -1739,6 +1777,13 @@ class Producer:
 
     def _build_msg(self, content, properties, partition_key, sequence_id,
                    replication_clusters, disable_replication):
+        _check_type(bytes, content, 'content')
+        _check_type_or_none(dict, properties, 'properties')
+        _check_type_or_none(str, partition_key, 'partition_key')
+        _check_type_or_none(int, sequence_id, 'sequence_id')
+        _check_type_or_none(list, replication_clusters, 'replication_clusters')
+        _check_type(bool, disable_replication, 'disable_replication')
+
         mb = _pulsar.MessageBuilder()
         mb.content(content)
         if properties:
@@ -1800,6 +1845,7 @@ class Consumer:
         if timeout_millis is None:
             return self._consumer.receive()
         else:
+            _check_type(int, timeout_millis, 'timeout_millis')
             return self._consumer.receive(timeout_millis)
 
     def acknowledge(self, message):
@@ -1892,6 +1938,7 @@ class Reader:
         if timeout_millis is None:
             return self._reader.read_next()
         else:
+            _check_type(int, timeout_millis, 'timeout_millis')
             return self._reader.read_next(timeout_millis)
 
     def close(self):
@@ -1900,6 +1947,17 @@ class Reader:
         """
         self._reader.close()
         self._client._consumers.remove(self)
+
+
+def _check_type(var_type, var, name):
+    if not isinstance(var, var_type):
+        raise ValueError("Argument %s is expected to be of type '%s'" % (name, var_type.__name__))
+
+
+def _check_type_or_none(var_type, var, name):
+    if var is not None and not isinstance(var, var_type):
+        raise ValueError("Argument %s is expected to be either None or of type '%s'"
+                         % (name, var_type.__name__))
 </code></pre>
   </div>
 
@@ -1933,6 +1991,8 @@ class Reader:
         * `authParamsString`: Comma-separated list of provider-specific
           configuration params
         """
+        _check_type(str, dynamicLibPath, 'dynamicLibPath')
+        _check_type(str, authParamsString, 'authParamsString')
         self.auth = _pulsar.Authentication(dynamicLibPath, authParamsString)
 </code></pre>
   </div>
@@ -1985,6 +2045,8 @@ class Reader:
     * `authParamsString`: Comma-separated list of provider-specific
       configuration params
     """
+    _check_type(str, dynamicLibPath, 'dynamicLibPath')
+    _check_type(str, authParamsString, 'authParamsString')
     self.auth = _pulsar.Authentication(dynamicLibPath, authParamsString)
 </code></pre>
   </div>
@@ -2020,7 +2082,7 @@ producers and consumers.</p></div>
                  operation_timeout_seconds=30,
                  io_threads=1,
                  message_listener_threads=1,
-                 concurrent_lookup_requests=5000,
+                 concurrent_lookup_requests=50000,
                  log_conf_file_path=None,
                  use_tls=False,
                  tls_trust_certs_file_path=None,
@@ -2061,6 +2123,17 @@ producers and consumers.</p></div>
           Configure whether the Pulsar client accepts untrusted TLS certificates
           from the broker.
         """
+        _check_type(str, service_url, 'service_url')
+        _check_type_or_none(Authentication, authentication, 'authentication')
+        _check_type(int, operation_timeout_seconds, 'operation_timeout_seconds')
+        _check_type(int, io_threads, 'io_threads')
+        _check_type(int, message_listener_threads, 'message_listener_threads')
+        _check_type(int, concurrent_lookup_requests, 'concurrent_lookup_requests')
+        _check_type_or_none(str, log_conf_file_path, 'log_conf_file_path')
+        _check_type(bool, use_tls, 'use_tls')
+        _check_type_or_none(str, tls_trust_certs_file_path, 'tls_trust_certs_file_path')
+        _check_type(bool, tls_allow_insecure_connection, 'tls_allow_insecure_connection')
+
         conf = _pulsar.ClientConfiguration()
         if authentication:
             conf.authentication(authentication.auth)
@@ -2124,6 +2197,18 @@ producers and consumers.</p></div>
         * `message_routing_mode`:
           Set the message routing mode for the partitioned producer.
         """
+        _check_type(str, topic, 'topic')
+        _check_type_or_none(str, producer_name, 'producer_name')
+        _check_type_or_none(int, initial_sequence_id, 'initial_sequence_id')
+        _check_type(int, send_timeout_millis, 'send_timeout_millis')
+        _check_type(CompressionType, compression_type, 'compression_type')
+        _check_type(int, max_pending_messages, 'max_pending_messages')
+        _check_type(bool, block_if_queue_full, 'block_if_queue_full')
+        _check_type(bool, batching_enabled, 'batching_enabled')
+        _check_type(int, batching_max_messages, 'batching_max_messages')
+        _check_type(int, batching_max_allowed_size_in_bytes, 'batching_max_allowed_size_in_bytes')
+        _check_type(int, batching_max_publish_delay_ms, 'batching_max_publish_delay_ms')
+
         conf = _pulsar.ProducerConfiguration()
         conf.send_timeout_millis(send_timeout_millis)
         conf.compression_type(compression_type)
@@ -2198,6 +2283,14 @@ producers and consumers.</p></div>
           Sets the time duration for which the broker-side consumer stats will
           be cached in the client.
         """
+        _check_type(str, topic, 'topic')
+        _check_type(str, subscription_name, 'subscription_name')
+        _check_type(ConsumerType, consumer_type, 'consumer_type')
+        _check_type(int, receiver_queue_size, 'receiver_queue_size')
+        _check_type_or_none(str, consumer_name, 'consumer_name')
+        _check_type_or_none(int, unacked_messages_timeout_ms, 'unacked_messages_timeout_ms')
+        _check_type(int, broker_consumer_stats_cache_time_ms, 'broker_consumer_stats_cache_time_ms')
+
         conf = _pulsar.ConsumerConfiguration()
         conf.consumer_type(consumer_type)
         if message_listener:
@@ -2262,6 +2355,11 @@ producers and consumers.</p></div>
         * `reader_name`:
           Sets the reader name.
         """
+        _check_type(str, topic, 'topic')
+        _check_type(_pulsar.MessageId, start_message_id, 'start_message_id')
+        _check_type(int, receiver_queue_size, 'receiver_queue_size')
+        _check_type_or_none(str, reader_name, 'reader_name')
+
         conf = _pulsar.ReaderConfiguration()
         if reader_listener:
             conf.reader_listener(reader_listener)
@@ -2293,7 +2391,7 @@ producers and consumers.</p></div>
             
   <div class="item">
     <div class="name def" id="pulsar.Client.__init__">
-    <p>def <span class="ident">__init__</span>(</p><p>self, service_url, authentication=None, operation_timeout_seconds=30, io_threads=1, message_listener_threads=1, concurrent_lookup_requests=5000, log_conf_file_path=None, use_tls=False, tls_trust_certs_file_path=None, tls_allow_insecure_connection=False)</p>
+    <p>def <span class="ident">__init__</span>(</p><p>self, service_url, authentication=None, operation_timeout_seconds=30, io_threads=1, message_listener_threads=1, concurrent_lookup_requests=50000, log_conf_file_path=None, use_tls=False, tls_trust_certs_file_path=None, tls_allow_insecure_connection=False)</p>
     </div>
     
 
@@ -2340,7 +2438,7 @@ producers and consumers.</p></div>
              operation_timeout_seconds=30,
              io_threads=1,
              message_listener_threads=1,
-             concurrent_lookup_requests=5000,
+             concurrent_lookup_requests=50000,
              log_conf_file_path=None,
              use_tls=False,
              tls_trust_certs_file_path=None,
@@ -2377,6 +2475,16 @@ producers and consumers.</p></div>
       Configure whether the Pulsar client accepts untrusted TLS certificates
       from the broker.
     """
+    _check_type(str, service_url, 'service_url')
+    _check_type_or_none(Authentication, authentication, 'authentication')
+    _check_type(int, operation_timeout_seconds, 'operation_timeout_seconds')
+    _check_type(int, io_threads, 'io_threads')
+    _check_type(int, message_listener_threads, 'message_listener_threads')
+    _check_type(int, concurrent_lookup_requests, 'concurrent_lookup_requests')
+    _check_type_or_none(str, log_conf_file_path, 'log_conf_file_path')
+    _check_type(bool, use_tls, 'use_tls')
+    _check_type_or_none(str, tls_trust_certs_file_path, 'tls_trust_certs_file_path')
+    _check_type(bool, tls_allow_insecure_connection, 'tls_allow_insecure_connection')
     conf = _pulsar.ClientConfiguration()
     if authentication:
         conf.authentication(authentication.auth)
@@ -2508,6 +2616,17 @@ producers and consumers.</p></div>
     * `message_routing_mode`:
       Set the message routing mode for the partitioned producer.
     """
+    _check_type(str, topic, 'topic')
+    _check_type_or_none(str, producer_name, 'producer_name')
+    _check_type_or_none(int, initial_sequence_id, 'initial_sequence_id')
+    _check_type(int, send_timeout_millis, 'send_timeout_millis')
+    _check_type(CompressionType, compression_type, 'compression_type')
+    _check_type(int, max_pending_messages, 'max_pending_messages')
+    _check_type(bool, block_if_queue_full, 'block_if_queue_full')
+    _check_type(bool, batching_enabled, 'batching_enabled')
+    _check_type(int, batching_max_messages, 'batching_max_messages')
+    _check_type(int, batching_max_allowed_size_in_bytes, 'batching_max_allowed_size_in_bytes')
+    _check_type(int, batching_max_publish_delay_ms, 'batching_max_publish_delay_ms')
     conf = _pulsar.ProducerConfiguration()
     conf.send_timeout_millis(send_timeout_millis)
     conf.compression_type(compression_type)
@@ -2628,6 +2747,10 @@ producers and consumers.</p></div>
     * `reader_name`:
       Sets the reader name.
     """
+    _check_type(str, topic, 'topic')
+    _check_type(_pulsar.MessageId, start_message_id, 'start_message_id')
+    _check_type(int, receiver_queue_size, 'receiver_queue_size')
+    _check_type_or_none(str, reader_name, 'reader_name')
     conf = _pulsar.ReaderConfiguration()
     if reader_listener:
         conf.reader_listener(reader_listener)
@@ -2758,6 +2881,13 @@ def my_listener(consumer, message):
       Sets the time duration for which the broker-side consumer stats will
       be cached in the client.
     """
+    _check_type(str, topic, 'topic')
+    _check_type(str, subscription_name, 'subscription_name')
+    _check_type(ConsumerType, consumer_type, 'consumer_type')
+    _check_type(int, receiver_queue_size, 'receiver_queue_size')
+    _check_type_or_none(str, consumer_name, 'consumer_name')
+    _check_type_or_none(int, unacked_messages_timeout_ms, 'unacked_messages_timeout_ms')
+    _check_type(int, broker_consumer_stats_cache_time_ms, 'broker_consumer_stats_cache_time_ms')
     conf = _pulsar.ConsumerConfiguration()
     conf.consumer_type(consumer_type)
     if message_listener:
@@ -2835,6 +2965,7 @@ def my_listener(consumer, message):
         if timeout_millis is None:
             return self._consumer.receive()
         else:
+            _check_type(int, timeout_millis, 'timeout_millis')
             return self._consumer.receive(timeout_millis)
 
     def acknowledge(self, message):
@@ -3068,6 +3199,7 @@ a new message is available.</p>
     if timeout_millis is None:
         return self._consumer.receive()
     else:
+        _check_type(int, timeout_millis, 'timeout_millis')
         return self._consumer.receive(timeout_millis)
 </code></pre>
   </div>
@@ -3660,6 +3792,13 @@ This string can be stored and later deserialized.</p></div>
 
     def _build_msg(self, content, properties, partition_key, sequence_id,
                    replication_clusters, disable_replication):
+        _check_type(bytes, content, 'content')
+        _check_type_or_none(dict, properties, 'properties')
+        _check_type_or_none(str, partition_key, 'partition_key')
+        _check_type_or_none(int, sequence_id, 'sequence_id')
+        _check_type_or_none(list, replication_clusters, 'replication_clusters')
+        _check_type(bool, disable_replication, 'disable_replication')
+
         mb = _pulsar.MessageBuilder()
         mb.content(content)
         if properties:
@@ -3995,6 +4134,7 @@ and the callback invoked with an error code.</p>
         if timeout_millis is None:
             return self._reader.read_next()
         else:
+            _check_type(int, timeout_millis, 'timeout_millis')
             return self._reader.read_next(timeout_millis)
 
     def close(self):
@@ -4073,6 +4213,7 @@ a new message is available.</p>
     if timeout_millis is None:
         return self._reader.read_next()
     else:
+        _check_type(int, timeout_millis, 'timeout_millis')
         return self._reader.read_next(timeout_millis)
 </code></pre>
   </div>
diff --git a/content/css/style.css b/content/css/style.css
index 542572e..e809a90 100644
--- a/content/css/style.css
+++ b/content/css/style.css
@@ -513,7 +513,7 @@ html {
   width: device-width; }
 html {
   -ms-overflow-style: scrollbar;
-  -webkit-tap-highlight-color: transparent; }
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
 
 body {
   font-family: "Noto Sans", Helvetica, sans-serif;
@@ -972,48 +972,48 @@ pre {
   width: auto; }
 
 .col-1 {
-  flex: 0 0 8.33333%;
-  max-width: 8.33333%; }
+  flex: 0 0 8.3333333333%;
+  max-width: 8.3333333333%; }
 
 .col-2 {
-  flex: 0 0 16.66667%;
-  max-width: 16.66667%; }
+  flex: 0 0 16.6666666667%;
+  max-width: 16.6666666667%; }
 
 .col-3 {
   flex: 0 0 25%;
   max-width: 25%; }
 
 .col-4 {
-  flex: 0 0 33.33333%;
-  max-width: 33.33333%; }
+  flex: 0 0 33.3333333333%;
+  max-width: 33.3333333333%; }
 
 .col-5 {
-  flex: 0 0 41.66667%;
-  max-width: 41.66667%; }
+  flex: 0 0 41.6666666667%;
+  max-width: 41.6666666667%; }
 
 .col-6 {
   flex: 0 0 50%;
   max-width: 50%; }
 
 .col-7 {
-  flex: 0 0 58.33333%;
-  max-width: 58.33333%; }
+  flex: 0 0 58.3333333333%;
+  max-width: 58.3333333333%; }
 
 .col-8 {
-  flex: 0 0 66.66667%;
-  max-width: 66.66667%; }
+  flex: 0 0 66.6666666667%;
+  max-width: 66.6666666667%; }
 
 .col-9 {
   flex: 0 0 75%;
   max-width: 75%; }
 
 .col-10 {
-  flex: 0 0 83.33333%;
-  max-width: 83.33333%; }
+  flex: 0 0 83.3333333333%;
+  max-width: 83.3333333333%; }
 
 .col-11 {
-  flex: 0 0 91.66667%;
-  max-width: 91.66667%; }
+  flex: 0 0 91.6666666667%;
+  max-width: 91.6666666667%; }
 
 .col-12 {
   flex: 0 0 100%;
@@ -1023,37 +1023,37 @@ pre {
   right: auto; }
 
 .pull-1 {
-  right: 8.33333%; }
+  right: 8.3333333333%; }
 
 .pull-2 {
-  right: 16.66667%; }
+  right: 16.6666666667%; }
 
 .pull-3 {
   right: 25%; }
 
 .pull-4 {
-  right: 33.33333%; }
+  right: 33.3333333333%; }
 
 .pull-5 {
-  right: 41.66667%; }
+  right: 41.6666666667%; }
 
 .pull-6 {
   right: 50%; }
 
 .pull-7 {
-  right: 58.33333%; }
+  right: 58.3333333333%; }
 
 .pull-8 {
-  right: 66.66667%; }
+  right: 66.6666666667%; }
 
 .pull-9 {
   right: 75%; }
 
 .pull-10 {
-  right: 83.33333%; }
+  right: 83.3333333333%; }
 
 .pull-11 {
-  right: 91.66667%; }
+  right: 91.6666666667%; }
 
 .pull-12 {
   right: 100%; }
@@ -1062,73 +1062,73 @@ pre {
   left: auto; }
 
 .push-1 {
-  left: 8.33333%; }
+  left: 8.3333333333%; }
 
 .push-2 {
-  left: 16.66667%; }
+  left: 16.6666666667%; }
 
 .push-3 {
   left: 25%; }
 
 .push-4 {
-  left: 33.33333%; }
+  left: 33.3333333333%; }
 
 .push-5 {
-  left: 41.66667%; }
+  left: 41.6666666667%; }
 
 .push-6 {
   left: 50%; }
 
 .push-7 {
-  left: 58.33333%; }
+  left: 58.3333333333%; }
 
 .push-8 {
-  left: 66.66667%; }
+  left: 66.6666666667%; }
 
 .push-9 {
   left: 75%; }
 
 .push-10 {
-  left: 83.33333%; }
+  left: 83.3333333333%; }
 
 .push-11 {
-  left: 91.66667%; }
+  left: 91.6666666667%; }
 
 .push-12 {
   left: 100%; }
 
 .offset-1 {
-  margin-left: 8.33333%; }
+  margin-left: 8.3333333333%; }
 
 .offset-2 {
-  margin-left: 16.66667%; }
+  margin-left: 16.6666666667%; }
 
 .offset-3 {
   margin-left: 25%; }
 
 .offset-4 {
-  margin-left: 33.33333%; }
+  margin-left: 33.3333333333%; }
 
 .offset-5 {
-  margin-left: 41.66667%; }
+  margin-left: 41.6666666667%; }
 
 .offset-6 {
   margin-left: 50%; }
 
 .offset-7 {
-  margin-left: 58.33333%; }
+  margin-left: 58.3333333333%; }
 
 .offset-8 {
-  margin-left: 66.66667%; }
+  margin-left: 66.6666666667%; }
 
 .offset-9 {
   margin-left: 75%; }
 
 .offset-10 {
-  margin-left: 83.33333%; }
+  margin-left: 83.3333333333%; }
 
 .offset-11 {
-  margin-left: 91.66667%; }
+  margin-left: 91.6666666667%; }
 
 @media (min-width: 576px) {
   .col-sm {
@@ -1141,48 +1141,48 @@ pre {
     width: auto; }
 
   .col-sm-1 {
-    flex: 0 0 8.33333%;
-    max-width: 8.33333%; }
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%; }
 
   .col-sm-2 {
-    flex: 0 0 16.66667%;
-    max-width: 16.66667%; }
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%; }
 
   .col-sm-3 {
     flex: 0 0 25%;
     max-width: 25%; }
 
   .col-sm-4 {
-    flex: 0 0 33.33333%;
-    max-width: 33.33333%; }
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%; }
 
   .col-sm-5 {
-    flex: 0 0 41.66667%;
-    max-width: 41.66667%; }
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%; }
 
   .col-sm-6 {
     flex: 0 0 50%;
     max-width: 50%; }
 
   .col-sm-7 {
-    flex: 0 0 58.33333%;
-    max-width: 58.33333%; }
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%; }
 
   .col-sm-8 {
-    flex: 0 0 66.66667%;
-    max-width: 66.66667%; }
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%; }
 
   .col-sm-9 {
     flex: 0 0 75%;
     max-width: 75%; }
 
   .col-sm-10 {
-    flex: 0 0 83.33333%;
-    max-width: 83.33333%; }
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%; }
 
   .col-sm-11 {
-    flex: 0 0 91.66667%;
-    max-width: 91.66667%; }
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%; }
 
   .col-sm-12 {
     flex: 0 0 100%;
@@ -1192,37 +1192,37 @@ pre {
     right: auto; }
 
   .pull-sm-1 {
-    right: 8.33333%; }
+    right: 8.3333333333%; }
 
   .pull-sm-2 {
-    right: 16.66667%; }
+    right: 16.6666666667%; }
 
   .pull-sm-3 {
     right: 25%; }
 
   .pull-sm-4 {
-    right: 33.33333%; }
+    right: 33.3333333333%; }
 
   .pull-sm-5 {
-    right: 41.66667%; }
+    right: 41.6666666667%; }
 
   .pull-sm-6 {
     right: 50%; }
 
   .pull-sm-7 {
-    right: 58.33333%; }
+    right: 58.3333333333%; }
 
   .pull-sm-8 {
-    right: 66.66667%; }
+    right: 66.6666666667%; }
 
   .pull-sm-9 {
     right: 75%; }
 
   .pull-sm-10 {
-    right: 83.33333%; }
+    right: 83.3333333333%; }
 
   .pull-sm-11 {
-    right: 91.66667%; }
+    right: 91.6666666667%; }
 
   .pull-sm-12 {
     right: 100%; }
@@ -1231,37 +1231,37 @@ pre {
     left: auto; }
 
   .push-sm-1 {
-    left: 8.33333%; }
+    left: 8.3333333333%; }
 
   .push-sm-2 {
-    left: 16.66667%; }
+    left: 16.6666666667%; }
 
   .push-sm-3 {
     left: 25%; }
 
   .push-sm-4 {
-    left: 33.33333%; }
+    left: 33.3333333333%; }
 
   .push-sm-5 {
-    left: 41.66667%; }
+    left: 41.6666666667%; }
 
   .push-sm-6 {
     left: 50%; }
 
   .push-sm-7 {
-    left: 58.33333%; }
+    left: 58.3333333333%; }
 
   .push-sm-8 {
-    left: 66.66667%; }
+    left: 66.6666666667%; }
 
   .push-sm-9 {
     left: 75%; }
 
   .push-sm-10 {
-    left: 83.33333%; }
+    left: 83.3333333333%; }
 
   .push-sm-11 {
-    left: 91.66667%; }
+    left: 91.6666666667%; }
 
   .push-sm-12 {
     left: 100%; }
@@ -1270,37 +1270,37 @@ pre {
     margin-left: 0%; }
 
   .offset-sm-1 {
-    margin-left: 8.33333%; }
+    margin-left: 8.3333333333%; }
 
   .offset-sm-2 {
-    margin-left: 16.66667%; }
+    margin-left: 16.6666666667%; }
 
   .offset-sm-3 {
     margin-left: 25%; }
 
   .offset-sm-4 {
-    margin-left: 33.33333%; }
+    margin-left: 33.3333333333%; }
 
   .offset-sm-5 {
-    margin-left: 41.66667%; }
+    margin-left: 41.6666666667%; }
 
   .offset-sm-6 {
     margin-left: 50%; }
 
   .offset-sm-7 {
-    margin-left: 58.33333%; }
+    margin-left: 58.3333333333%; }
 
   .offset-sm-8 {
-    margin-left: 66.66667%; }
+    margin-left: 66.6666666667%; }
 
   .offset-sm-9 {
     margin-left: 75%; }
 
   .offset-sm-10 {
-    margin-left: 83.33333%; }
+    margin-left: 83.3333333333%; }
 
   .offset-sm-11 {
-    margin-left: 91.66667%; } }
+    margin-left: 91.6666666667%; } }
 @media (min-width: 768px) {
   .col-md {
     flex-basis: 0;
@@ -1312,48 +1312,48 @@ pre {
     width: auto; }
 
   .col-md-1 {
-    flex: 0 0 8.33333%;
-    max-width: 8.33333%; }
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%; }
 
   .col-md-2 {
-    flex: 0 0 16.66667%;
-    max-width: 16.66667%; }
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%; }
 
   .col-md-3 {
     flex: 0 0 25%;
     max-width: 25%; }
 
   .col-md-4 {
-    flex: 0 0 33.33333%;
-    max-width: 33.33333%; }
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%; }
 
   .col-md-5 {
-    flex: 0 0 41.66667%;
-    max-width: 41.66667%; }
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%; }
 
   .col-md-6 {
     flex: 0 0 50%;
     max-width: 50%; }
 
   .col-md-7 {
-    flex: 0 0 58.33333%;
-    max-width: 58.33333%; }
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%; }
 
   .col-md-8 {
-    flex: 0 0 66.66667%;
-    max-width: 66.66667%; }
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%; }
 
   .col-md-9 {
     flex: 0 0 75%;
     max-width: 75%; }
 
   .col-md-10 {
-    flex: 0 0 83.33333%;
-    max-width: 83.33333%; }
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%; }
 
   .col-md-11 {
-    flex: 0 0 91.66667%;
-    max-width: 91.66667%; }
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%; }
 
   .col-md-12 {
     flex: 0 0 100%;
@@ -1363,37 +1363,37 @@ pre {
     right: auto; }
 
   .pull-md-1 {
-    right: 8.33333%; }
+    right: 8.3333333333%; }
 
   .pull-md-2 {
-    right: 16.66667%; }
+    right: 16.6666666667%; }
 
   .pull-md-3 {
     right: 25%; }
 
   .pull-md-4 {
-    right: 33.33333%; }
+    right: 33.3333333333%; }
 
   .pull-md-5 {
-    right: 41.66667%; }
+    right: 41.6666666667%; }
 
   .pull-md-6 {
     right: 50%; }
 
   .pull-md-7 {
-    right: 58.33333%; }
+    right: 58.3333333333%; }
 
   .pull-md-8 {
-    right: 66.66667%; }
+    right: 66.6666666667%; }
 
   .pull-md-9 {
     right: 75%; }
 
   .pull-md-10 {
-    right: 83.33333%; }
+    right: 83.3333333333%; }
 
   .pull-md-11 {
-    right: 91.66667%; }
+    right: 91.6666666667%; }
 
   .pull-md-12 {
     right: 100%; }
@@ -1402,37 +1402,37 @@ pre {
     left: auto; }
 
   .push-md-1 {
-    left: 8.33333%; }
+    left: 8.3333333333%; }
 
   .push-md-2 {
-    left: 16.66667%; }
+    left: 16.6666666667%; }
 
   .push-md-3 {
     left: 25%; }
 
   .push-md-4 {
-    left: 33.33333%; }
+    left: 33.3333333333%; }
 
   .push-md-5 {
-    left: 41.66667%; }
+    left: 41.6666666667%; }
 
   .push-md-6 {
     left: 50%; }
 
   .push-md-7 {
-    left: 58.33333%; }
+    left: 58.3333333333%; }
 
   .push-md-8 {
-    left: 66.66667%; }
+    left: 66.6666666667%; }
 
   .push-md-9 {
     left: 75%; }
 
   .push-md-10 {
-    left: 83.33333%; }
+    left: 83.3333333333%; }
 
   .push-md-11 {
-    left: 91.66667%; }
+    left: 91.6666666667%; }
 
   .push-md-12 {
     left: 100%; }
@@ -1441,37 +1441,37 @@ pre {
     margin-left: 0%; }
 
   .offset-md-1 {
-    margin-left: 8.33333%; }
+    margin-left: 8.3333333333%; }
 
   .offset-md-2 {
-    margin-left: 16.66667%; }
+    margin-left: 16.6666666667%; }
 
   .offset-md-3 {
     margin-left: 25%; }
 
   .offset-md-4 {
-    margin-left: 33.33333%; }
+    margin-left: 33.3333333333%; }
 
   .offset-md-5 {
-    margin-left: 41.66667%; }
+    margin-left: 41.6666666667%; }
 
   .offset-md-6 {
     margin-left: 50%; }
 
   .offset-md-7 {
-    margin-left: 58.33333%; }
+    margin-left: 58.3333333333%; }
 
   .offset-md-8 {
-    margin-left: 66.66667%; }
+    margin-left: 66.6666666667%; }
 
   .offset-md-9 {
     margin-left: 75%; }
 
   .offset-md-10 {
-    margin-left: 83.33333%; }
+    margin-left: 83.3333333333%; }
 
   .offset-md-11 {
-    margin-left: 91.66667%; } }
+    margin-left: 91.6666666667%; } }
 @media (min-width: 992px) {
   .col-lg {
     flex-basis: 0;
@@ -1483,48 +1483,48 @@ pre {
     width: auto; }
 
   .col-lg-1 {
-    flex: 0 0 8.33333%;
-    max-width: 8.33333%; }
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%; }
 
   .col-lg-2 {
-    flex: 0 0 16.66667%;
-    max-width: 16.66667%; }
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%; }
 
   .col-lg-3 {
     flex: 0 0 25%;
     max-width: 25%; }
 
   .col-lg-4 {
-    flex: 0 0 33.33333%;
-    max-width: 33.33333%; }
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%; }
 
   .col-lg-5 {
-    flex: 0 0 41.66667%;
-    max-width: 41.66667%; }
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%; }
 
   .col-lg-6 {
     flex: 0 0 50%;
     max-width: 50%; }
 
   .col-lg-7 {
-    flex: 0 0 58.33333%;
-    max-width: 58.33333%; }
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%; }
 
   .col-lg-8 {
-    flex: 0 0 66.66667%;
-    max-width: 66.66667%; }
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%; }
 
   .col-lg-9 {
     flex: 0 0 75%;
     max-width: 75%; }
 
   .col-lg-10 {
-    flex: 0 0 83.33333%;
-    max-width: 83.33333%; }
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%; }
 
   .col-lg-11 {
-    flex: 0 0 91.66667%;
-    max-width: 91.66667%; }
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%; }
 
   .col-lg-12 {
     flex: 0 0 100%;
@@ -1534,37 +1534,37 @@ pre {
     right: auto; }
 
   .pull-lg-1 {
-    right: 8.33333%; }
+    right: 8.3333333333%; }
 
   .pull-lg-2 {
-    right: 16.66667%; }
+    right: 16.6666666667%; }
 
   .pull-lg-3 {
     right: 25%; }
 
   .pull-lg-4 {
-    right: 33.33333%; }
+    right: 33.3333333333%; }
 
   .pull-lg-5 {
-    right: 41.66667%; }
+    right: 41.6666666667%; }
 
   .pull-lg-6 {
     right: 50%; }
 
   .pull-lg-7 {
-    right: 58.33333%; }
+    right: 58.3333333333%; }
 
   .pull-lg-8 {
-    right: 66.66667%; }
+    right: 66.6666666667%; }
 
   .pull-lg-9 {
     right: 75%; }
 
   .pull-lg-10 {
-    right: 83.33333%; }
+    right: 83.3333333333%; }
 
   .pull-lg-11 {
-    right: 91.66667%; }
+    right: 91.6666666667%; }
 
   .pull-lg-12 {
     right: 100%; }
@@ -1573,37 +1573,37 @@ pre {
     left: auto; }
 
   .push-lg-1 {
-    left: 8.33333%; }
+    left: 8.3333333333%; }
 
   .push-lg-2 {
-    left: 16.66667%; }
+    left: 16.6666666667%; }
 
   .push-lg-3 {
     left: 25%; }
 
   .push-lg-4 {
-    left: 33.33333%; }
+    left: 33.3333333333%; }
 
   .push-lg-5 {
-    left: 41.66667%; }
+    left: 41.6666666667%; }
 
   .push-lg-6 {
     left: 50%; }
 
   .push-lg-7 {
-    left: 58.33333%; }
+    left: 58.3333333333%; }
 
   .push-lg-8 {
-    left: 66.66667%; }
+    left: 66.6666666667%; }
 
   .push-lg-9 {
     left: 75%; }
 
   .push-lg-10 {
-    left: 83.33333%; }
+    left: 83.3333333333%; }
 
   .push-lg-11 {
-    left: 91.66667%; }
+    left: 91.6666666667%; }
 
   .push-lg-12 {
     left: 100%; }
@@ -1612,37 +1612,37 @@ pre {
     margin-left: 0%; }
 
   .offset-lg-1 {
-    margin-left: 8.33333%; }
+    margin-left: 8.3333333333%; }
 
   .offset-lg-2 {
-    margin-left: 16.66667%; }
+    margin-left: 16.6666666667%; }
 
   .offset-lg-3 {
     margin-left: 25%; }
 
   .offset-lg-4 {
-    margin-left: 33.33333%; }
+    margin-left: 33.3333333333%; }
 
   .offset-lg-5 {
-    margin-left: 41.66667%; }
+    margin-left: 41.6666666667%; }
 
   .offset-lg-6 {
     margin-left: 50%; }
 
   .offset-lg-7 {
-    margin-left: 58.33333%; }
+    margin-left: 58.3333333333%; }
 
   .offset-lg-8 {
-    margin-left: 66.66667%; }
+    margin-left: 66.6666666667%; }
 
   .offset-lg-9 {
     margin-left: 75%; }
 
   .offset-lg-10 {
-    margin-left: 83.33333%; }
+    margin-left: 83.3333333333%; }
 
   .offset-lg-11 {
-    margin-left: 91.66667%; } }
+    margin-left: 91.6666666667%; } }
 @media (min-width: 1200px) {
   .col-xl {
     flex-basis: 0;
@@ -1654,48 +1654,48 @@ pre {
     width: auto; }
 
   .col-xl-1 {
-    flex: 0 0 8.33333%;
-    max-width: 8.33333%; }
+    flex: 0 0 8.3333333333%;
+    max-width: 8.3333333333%; }
 
   .col-xl-2 {
-    flex: 0 0 16.66667%;
-    max-width: 16.66667%; }
+    flex: 0 0 16.6666666667%;
+    max-width: 16.6666666667%; }
 
   .col-xl-3 {
     flex: 0 0 25%;
     max-width: 25%; }
 
   .col-xl-4 {
-    flex: 0 0 33.33333%;
-    max-width: 33.33333%; }
+    flex: 0 0 33.3333333333%;
+    max-width: 33.3333333333%; }
 
   .col-xl-5 {
-    flex: 0 0 41.66667%;
-    max-width: 41.66667%; }
+    flex: 0 0 41.6666666667%;
+    max-width: 41.6666666667%; }
 
   .col-xl-6 {
     flex: 0 0 50%;
     max-width: 50%; }
 
   .col-xl-7 {
-    flex: 0 0 58.33333%;
-    max-width: 58.33333%; }
+    flex: 0 0 58.3333333333%;
+    max-width: 58.3333333333%; }
 
   .col-xl-8 {
-    flex: 0 0 66.66667%;
-    max-width: 66.66667%; }
+    flex: 0 0 66.6666666667%;
+    max-width: 66.6666666667%; }
 
   .col-xl-9 {
     flex: 0 0 75%;
     max-width: 75%; }
 
   .col-xl-10 {
-    flex: 0 0 83.33333%;
-    max-width: 83.33333%; }
+    flex: 0 0 83.3333333333%;
+    max-width: 83.3333333333%; }
 
   .col-xl-11 {
-    flex: 0 0 91.66667%;
-    max-width: 91.66667%; }
+    flex: 0 0 91.6666666667%;
+    max-width: 91.6666666667%; }
 
   .col-xl-12 {
     flex: 0 0 100%;
@@ -1705,37 +1705,37 @@ pre {
     right: auto; }
 
   .pull-xl-1 {
-    right: 8.33333%; }
+    right: 8.3333333333%; }
 
   .pull-xl-2 {
-    right: 16.66667%; }
+    right: 16.6666666667%; }
 
   .pull-xl-3 {
     right: 25%; }
 
   .pull-xl-4 {
-    right: 33.33333%; }
+    right: 33.3333333333%; }
 
   .pull-xl-5 {
-    right: 41.66667%; }
+    right: 41.6666666667%; }
 
   .pull-xl-6 {
     right: 50%; }
 
   .pull-xl-7 {
-    right: 58.33333%; }
+    right: 58.3333333333%; }
 
   .pull-xl-8 {
-    right: 66.66667%; }
+    right: 66.6666666667%; }
 
   .pull-xl-9 {
     right: 75%; }
 
   .pull-xl-10 {
-    right: 83.33333%; }
+    right: 83.3333333333%; }
 
   .pull-xl-11 {
-    right: 91.66667%; }
+    right: 91.6666666667%; }
 
   .pull-xl-12 {
     right: 100%; }
@@ -1744,37 +1744,37 @@ pre {
     left: auto; }
 
   .push-xl-1 {
-    left: 8.33333%; }
+    left: 8.3333333333%; }
 
   .push-xl-2 {
-    left: 16.66667%; }
+    left: 16.6666666667%; }
 
   .push-xl-3 {
     left: 25%; }
 
   .push-xl-4 {
-    left: 33.33333%; }
+    left: 33.3333333333%; }
 
   .push-xl-5 {
-    left: 41.66667%; }
+    left: 41.6666666667%; }
 
   .push-xl-6 {
     left: 50%; }
 
   .push-xl-7 {
-    left: 58.33333%; }
+    left: 58.3333333333%; }
 
   .push-xl-8 {
-    left: 66.66667%; }
+    left: 66.6666666667%; }
 
   .push-xl-9 {
     left: 75%; }
 
   .push-xl-10 {
-    left: 83.33333%; }
+    left: 83.3333333333%; }
 
   .push-xl-11 {
-    left: 91.66667%; }
+    left: 91.6666666667%; }
 
   .push-xl-12 {
     left: 100%; }
@@ -1783,37 +1783,37 @@ pre {
     margin-left: 0%; }
 
   .offset-xl-1 {
-    margin-left: 8.33333%; }
+    margin-left: 8.3333333333%; }
 
   .offset-xl-2 {
-    margin-left: 16.66667%; }
+    margin-left: 16.6666666667%; }
 
   .offset-xl-3 {
     margin-left: 25%; }
 
   .offset-xl-4 {
-    margin-left: 33.33333%; }
+    margin-left: 33.3333333333%; }
 
   .offset-xl-5 {
-    margin-left: 41.66667%; }
+    margin-left: 41.6666666667%; }
 
   .offset-xl-6 {
     margin-left: 50%; }
 
   .offset-xl-7 {
-    margin-left: 58.33333%; }
+    margin-left: 58.3333333333%; }
 
   .offset-xl-8 {
-    margin-left: 66.66667%; }
+    margin-left: 66.6666666667%; }
 
   .offset-xl-9 {
     margin-left: 75%; }
 
   .offset-xl-10 {
-    margin-left: 83.33333%; }
+    margin-left: 83.3333333333%; }
 
   .offset-xl-11 {
-    margin-left: 91.66667%; } }
+    margin-left: 91.6666666667%; } }
 .table {
   width: 100%;
   max-width: 100%;
@@ -2029,7 +2029,7 @@ select.form-control-sm:not([size]):not([multiple]), .input-group-sm > select.for
 select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.form-control:not([size]):not([multiple]),
 .input-group-lg > select.input-group-addon:not([size]):not([multiple]),
 .input-group-lg > .input-group-btn > select.btn:not([size]):not([multiple]) {
-  height: 3.16667rem; }
+  height: 3.1666666667rem; }
 
 .form-group {
   margin-bottom: 1rem; }
@@ -3906,7 +3906,7 @@ button.list-group-item-danger {
     border: 0; }
 
 .embed-responsive-21by9::before {
-  padding-top: 42.85714%; }
+  padding-top: 42.8571428571%; }
 
 .embed-responsive-16by9::before {
   padding-top: 56.25%; }
@@ -6901,7 +6901,7 @@ a.text-gray-dark:focus, a.text-gray-dark:hover {
 
 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
-  font-size: 1.33333em;
+  font-size: 1.3333333333em;
   line-height: 0.75em;
   vertical-align: -15%; }
 
@@ -6918,24 +6918,24 @@ a.text-gray-dark:focus, a.text-gray-dark:hover {
   font-size: 5em; }
 
 .fa-fw {
-  width: 1.28571em;
+  width: 1.2857142857em;
   text-align: center; }
 
 .fa-ul {
   padding-left: 0;
-  margin-left: 2.14286em;
+  margin-left: 2.1428571429em;
   list-style-type: none; }
   .fa-ul > li {
     position: relative; }
 
 .fa-li {
   position: absolute;
-  left: -2.14286em;
-  width: 2.14286em;
-  top: 0.14286em;
+  left: -2.1428571429em;
+  width: 2.1428571429em;
+  top: 0.1428571429em;
   text-align: center; }
   .fa-li.fa-lg {
-    left: -1.85714em; }
+    left: -1.8571428571em; }
 
 .fa-border {
   padding: .2em .25em .15em;
@@ -9414,143 +9414,135 @@ span.popover-term {
  */
 @media screen and (min-width: 769px) {
   .rest-api-container article, .docs-container article {
-    -webkit-box-shadow: 2px 2px 1rem 0px #dddddd;
-    -moz-box-shadow: 2px 2px 1rem 0px #dddddd;
-    box-shadow: 2px 2px 1rem 0px #dddddd;
-    padding: 2% 3%;
-    margin-bottom: 50px; } }
-.rest-api-container, .docs-container {
-  margin-top: 50px; }
-  .rest-api-container blockquote, .docs-container blockquote {
-    border: 1px solid #bcc5c5;
-    background-color: #f2f4f4;
-    padding: 0.75rem; }
-  .rest-api-container h4 + ul, .docs-container h4 + ul {
-    margin-top: 1rem; }
-  .rest-api-container ul ul, .docs-container ul ul {
-    margin: 8px 0; }
-  .rest-api-container article section.docs-header, .docs-container article section.docs-header {
-    margin-bottom: 35px; }
-    .rest-api-container article section.docs-header .tags, .docs-container article section.docs-header .tags {
-      margin-top: 20px; }
-      .rest-api-container article section.docs-header .tags button, .docs-container article section.docs-header .tags button {
-        padding: 4px 8px;
-        font-size: 14px; }
-    .rest-api-container article section.docs-header h1.docs-title, .docs-container article section.docs-header h1.docs-title {
-      font-size: 40px;
-      line-height: 3.2rem; }
-    .rest-api-container article section.docs-header span.docs-lead, .docs-container article section.docs-header span.docs-lead {
-      margin: 20px 0 0 0;
-      font-size: 16px;
-      font-weight: lighter; }
-    .rest-api-container article section.docs-header .tag-group, .docs-container article section.docs-header .tag-group {
-      margin-top: 20px; }
-  .rest-api-container article section.content, .docs-container article section.content {
-    font-size: 1rem; }
-    .rest-api-container article section.content li, .docs-container article section.content li {
-      margin-left: 22px;
-      font-size: 100%; }
-    .rest-api-container article section.content h3 + h4, .docs-container article section.content h3 + h4 {
+    padding: 0 2%;
+    margin-bottom: 2rem; } }
+.rest-api-container blockquote, .docs-container blockquote {
+  border: 1px solid #bcc5c5;
+  background-color: #f2f4f4;
+  padding: 0.75rem; }
+.rest-api-container h4 + ul, .docs-container h4 + ul {
+  margin-top: 1rem; }
+.rest-api-container ul ul, .docs-container ul ul {
+  margin: 8px 0; }
+.rest-api-container article section.docs-header, .docs-container article section.docs-header {
+  margin-bottom: 35px; }
+  .rest-api-container article section.docs-header .tags, .docs-container article section.docs-header .tags {
+    margin-top: 20px; }
+    .rest-api-container article section.docs-header .tags button, .docs-container article section.docs-header .tags button {
+      padding: 4px 8px;
+      font-size: 14px; }
+  .rest-api-container article section.docs-header h1.docs-title, .docs-container article section.docs-header h1.docs-title {
+    font-size: 40px;
+    line-height: 3.2rem; }
+  .rest-api-container article section.docs-header span.docs-lead, .docs-container article section.docs-header span.docs-lead {
+    margin: 20px 0 0 0;
+    font-size: 16px;
+    font-weight: lighter; }
+  .rest-api-container article section.docs-header .tag-group, .docs-container article section.docs-header .tag-group {
+    margin-top: 20px; }
+.rest-api-container article section.content, .docs-container article section.content {
+  font-size: 1rem; }
+  .rest-api-container article section.content li, .docs-container article section.content li {
+    margin-left: 22px;
+    font-size: 100%; }
+  .rest-api-container article section.content h3 + h4, .docs-container article section.content h3 + h4 {
+    margin-top: 20px; }
+  .rest-api-container article section.content h2:not(.cli-command-title), .docs-container article section.content h2:not(.cli-command-title) {
+    margin-top: 35px; }
+  .rest-api-container article section.content h3:not(.cli-command-title), .docs-container article section.content h3:not(.cli-command-title) {
+    margin-top: 35px; }
+  .rest-api-container article section.content a:hover, .docs-container article section.content a:hover {
+    text-decoration: none; }
+  .rest-api-container article section.content h2 + p, .rest-api-container article section.content h3 + p, .rest-api-container article section.content h4 + p, .rest-api-container article section.content h5 + p, .rest-api-container article section.content h6 + p, .docs-container article section.content h2 + p, .docs-container article section.content h3 + p, .docs-container article section.content h4 + p, .docs-container article section.content h5 + p, .docs-container article section.conten [...]
+    margin-top: 15px; }
+  .rest-api-container article section.content .topic, .docs-container article section.content .topic {
+    color: #bcc5c5;
+    background-color: #232937;
+    font-size: 1rem;
+    font-family: "Inconsolata", monospace;
+    padding: 10px 0 10px 20px;
+    border-radius: 0; }
+    .rest-api-container article section.content .topic .property, .docs-container article section.content .topic .property {
+      color: #b1cc00; }
+    .rest-api-container article section.content .topic .cluster, .docs-container article section.content .topic .cluster {
+      color: #e25418; }
+    .rest-api-container article section.content .topic .namespace, .docs-container article section.content .topic .namespace {
+      color: #3797db; }
+    .rest-api-container article section.content .topic .t, .docs-container article section.content .topic .t {
+      color: #d33682; }
+    .rest-api-container article section.content .topic + p, .docs-container article section.content .topic + p {
       margin-top: 20px; }
-    .rest-api-container article section.content h2:not(.cli-command-title), .docs-container article section.content h2:not(.cli-command-title) {
-      margin-top: 35px; }
-    .rest-api-container article section.content h3:not(.cli-command-title), .docs-container article section.content h3:not(.cli-command-title) {
-      margin-top: 35px; }
-    .rest-api-container article section.content a:hover, .docs-container article section.content a:hover {
-      text-decoration: none; }
-    .rest-api-container article section.content h2 + p, .rest-api-container article section.content h3 + p, .rest-api-container article section.content h4 + p, .rest-api-container article section.content h5 + p, .rest-api-container article section.content h6 + p, .docs-container article section.content h2 + p, .docs-container article section.content h3 + p, .docs-container article section.content h4 + p, .docs-container article section.content h5 + p, .docs-container article section.cont [...]
-      margin-top: 15px; }
-    .rest-api-container article section.content .topic, .docs-container article section.content .topic {
-      color: #bcc5c5;
-      background-color: #232937;
-      font-size: 1rem;
-      font-family: "Inconsolata", monospace;
-      padding: 10px 0 10px 20px;
-      border-radius: 0; }
-      .rest-api-container article section.content .topic .property, .docs-container article section.content .topic .property {
-        color: #b1cc00; }
-      .rest-api-container article section.content .topic .cluster, .docs-container article section.content .topic .cluster {
-        color: #e25418; }
-      .rest-api-container article section.content .topic .namespace, .docs-container article section.content .topic .namespace {
-        color: #3797db; }
-      .rest-api-container article section.content .topic .t, .docs-container article section.content .topic .t {
-        color: #d33682; }
-      .rest-api-container article section.content .topic + p, .docs-container article section.content .topic + p {
-        margin-top: 20px; }
-    .rest-api-container article section.content .highlighter-rouge, .docs-container article section.content .highlighter-rouge {
-      font-family: "Inconsolata", monospace; }
-      .rest-api-container article section.content .highlighter-rouge + h2, .docs-container article section.content .highlighter-rouge + h2 {
-        margin-top: 40px; }
-      .rest-api-container article section.content .highlighter-rouge .highlight, .docs-container article section.content .highlighter-rouge .highlight {
-        padding: 15px; }
-        .rest-api-container article section.content .highlighter-rouge .highlight code, .docs-container article section.content .highlighter-rouge .highlight code {
-          font-size: 1rem; }
-    .rest-api-container article section.content code.highlighter-rouge, .docs-container article section.content code.highlighter-rouge {
-      color: #188fff;
-      padding: .2rem .3rem;
-      background-color: #f8f9f9;
-      border-radius: 0; }
-    .rest-api-container article section.content em, .docs-container article section.content em {
-      margin-right: 2px; }
-    .rest-api-container article section.content p img, .docs-container article section.content p img {
-      display: block;
-      margin: 20px auto;
-      max-width: 100%; }
-      .rest-api-container article section.content p img[alt="Maven Central"], .docs-container article section.content p img[alt="Maven Central"] {
-        width: 20%;
+  .rest-api-container article section.content .highlighter-rouge, .docs-container article section.content .highlighter-rouge {
+    font-family: "Inconsolata", monospace; }
+    .rest-api-container article section.content .highlighter-rouge .highlight, .docs-container article section.content .highlighter-rouge .highlight {
+      margin: 0;
+      padding: 1rem; }
+      .rest-api-container article section.content .highlighter-rouge .highlight pre.highlight, .docs-container article section.content .highlighter-rouge .highlight pre.highlight {
         margin: 0;
         padding: 0; }
-    .rest-api-container article section.content img.inline, .docs-container article section.content img.inline {
-      margin: initial;
-      width: initial; }
-    .rest-api-container article section.content p, .docs-container article section.content p {
-      font-size: 1rem; }
-      .rest-api-container article section.content p + .highlighter-rouge, .docs-container article section.content p + .highlighter-rouge {
-        margin-top: 15px; }
-    .rest-api-container article section.content h2 + p, .rest-api-container article section.content h3 + p, .docs-container article section.content h2 + p, .docs-container article section.content h3 + p {
-      margin-top: 20px; }
-    .rest-api-container article section.content table, .docs-container article section.content table {
-      margin: 25px 0;
+        .rest-api-container article section.content .highlighter-rouge .highlight pre.highlight code, .docs-container article section.content .highlighter-rouge .highlight pre.highlight code {
+          margin: 0;
+          padding: 0;
+          font-size: 1rem; }
+  .rest-api-container article section.content code.highlighter-rouge, .docs-container article section.content code.highlighter-rouge {
+    color: #188fff;
+    background-color: #f8f9f9;
+    border-radius: 0; }
+  .rest-api-container article section.content em, .docs-container article section.content em {
+    margin-right: 2px; }
+  .rest-api-container article section.content p img, .docs-container article section.content p img {
+    display: block;
+    margin: 20px auto;
+    max-width: 100%; }
+    .rest-api-container article section.content p img[alt="Maven Central"], .docs-container article section.content p img[alt="Maven Central"] {
+      width: 20%;
+      margin: 0;
+      padding: 0; }
+  .rest-api-container article section.content img.inline, .docs-container article section.content img.inline {
+    margin: initial;
+    width: initial; }
+  .rest-api-container article section.content p, .docs-container article section.content p {
+    font-size: 1rem; }
+  .rest-api-container article section.content h2 + p, .rest-api-container article section.content h3 + p, .docs-container article section.content h2 + p, .docs-container article section.content h3 + p {
+    margin-top: 20px; }
+  .rest-api-container article section.content table, .docs-container article section.content table {
+    margin: 25px 0;
+    width: 100%; }
+    .rest-api-container article section.content table thead, .docs-container article section.content table thead {
+      font-size: 16px;
+      border-bottom: 1px solid black; }
+      .rest-api-container article section.content table thead tr th, .docs-container article section.content table thead tr th {
+        padding-right: 1rem; }
+    .rest-api-container article section.content table tbody tr td, .docs-container article section.content table tbody tr td {
+      padding: 5px 1rem 5px 0;
+      overflow-x: scroll; }
+      .rest-api-container article section.content table tbody tr td code, .docs-container article section.content table tbody tr td code {
+        font-size: inherit; }
+      .rest-api-container article section.content table tbody tr td em, .docs-container article section.content table tbody tr td em {
+        font-size: 12px;
+        font-style: normal; }
+    .rest-api-container article section.content table tbody tr + tr, .docs-container article section.content table tbody tr + tr {
+      border-top: 1px solid #ddd;
+      margin-top: 10px; }
+    .rest-api-container article section.content table.config, .docs-container article section.content table.config {
+      overflow-x: scroll;
       width: 100%; }
-      .rest-api-container article section.content table thead, .docs-container article section.content table thead {
-        font-size: 16px;
-        border-bottom: 1px solid black; }
-        .rest-api-container article section.content table thead tr th, .docs-container article section.content table thead tr th {
-          padding-right: 1rem; }
-      .rest-api-container article section.content table tbody tr td, .docs-container article section.content table tbody tr td {
-        padding: 5px 1rem 5px 0;
-        overflow-x: scroll; }
-        .rest-api-container article section.content table tbody tr td code, .docs-container article section.content table tbody tr td code {
-          font-size: inherit; }
-        .rest-api-container article section.content table tbody tr td em, .docs-container article section.content table tbody tr td em {
-          font-size: 12px;
-          font-style: normal; }
-      .rest-api-container article section.content table tbody tr + tr, .docs-container article section.content table tbody tr + tr {
-        border-top: 1px solid #ddd;
-        margin-top: 10px; }
-      .rest-api-container article section.content table.config, .docs-container article section.content table.config {
-        overflow-x: scroll;
-        width: 100%; }
-        .rest-api-container article section.content table.config thead tr th:nth-child(2), .rest-api-container article section.content table.config thead tr th:nth-child(3), .docs-container article section.content table.config thead tr th:nth-child(2), .docs-container article section.content table.config thead tr th:nth-child(3) {
+      .rest-api-container article section.content table.config thead tr th:nth-child(2), .rest-api-container article section.content table.config thead tr th:nth-child(3), .docs-container article section.content table.config thead tr th:nth-child(2), .docs-container article section.content table.config thead tr th:nth-child(3) {
+        padding-left: 10px; }
+      .rest-api-container article section.content table.config td, .rest-api-container article section.content table.config td p, .docs-container article section.content table.config td, .docs-container article section.content table.config td p {
+        font-size: 12px; }
+      .rest-api-container article section.content table.config td, .docs-container article section.content table.config td {
+        padding: 5px 0; }
+        .rest-api-container article section.content table.config td:nth-child(1), .rest-api-container article section.content table.config td:nth-child(2), .docs-container article section.content table.config td:nth-child(1), .docs-container article section.content table.config td:nth-child(2) {
+          max-width: 225px;
+          overflow: auto;
+          white-space: nowrap; }
+        .rest-api-container article section.content table.config td:nth-child(2), .rest-api-container article section.content table.config td:nth-child(3), .docs-container article section.content table.config td:nth-child(2), .docs-container article section.content table.config td:nth-child(3) {
           padding-left: 10px; }
-        .rest-api-container article section.content table.config td, .rest-api-container article section.content table.config td p, .docs-container article section.content table.config td, .docs-container article section.content table.config td p {
-          font-size: 12px; }
-        .rest-api-container article section.content table.config td, .docs-container article section.content table.config td {
-          padding: 5px 0; }
-          .rest-api-container article section.content table.config td:nth-child(1), .rest-api-container article section.content table.config td:nth-child(2), .docs-container article section.content table.config td:nth-child(1), .docs-container article section.content table.config td:nth-child(2) {
-            max-width: 225px;
-            overflow: auto;
-            white-space: nowrap; }
-          .rest-api-container article section.content table.config td:nth-child(2), .rest-api-container article section.content table.config td:nth-child(3), .docs-container article section.content table.config td:nth-child(2), .docs-container article section.content table.config td:nth-child(3) {
-            padding-left: 10px; }
-          .rest-api-container article section.content table.config td + td, .docs-container article section.content table.config td + td {
-            border-left: 1px solid #ddd; }
-      .rest-api-container article section.content table.env-var th:first-child, .docs-container article section.content table.env-var th:first-child {
-        min-width: 200px; }
-    .rest-api-container article section.content p + table, .rest-api-container article section.content table + p, .rest-api-container article section.content table + h4, .rest-api-container article section.content h4 + .highlighter-rouge, .docs-container article section.content p + table, .docs-container article section.content table + p, .docs-container article section.content table + h4, .docs-container article section.content h4 + .highlighter-rouge {
-      margin-top: 15px; }
-    .rest-api-container article section.content .highlighter-rouge + table, .rest-api-container article section.content .highlighter-rouge + h4, .docs-container article section.content .highlighter-rouge + table, .docs-container article section.content .highlighter-rouge + h4 {
-      margin-top: 20px; }
+        .rest-api-container article section.content table.config td + td, .docs-container article section.content table.config td + td {
+          border-left: 1px solid #ddd; }
+    .rest-api-container article section.content table.env-var th:first-child, .docs-container article section.content table.env-var th:first-child {
+      min-width: 200px; }
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/content/docs/latest/adaptors/KafkaWrapper/index.html b/content/docs/latest/adaptors/KafkaWrapper/index.html
index 8286dd1..413c501 100644
--- a/content/docs/latest/adaptors/KafkaWrapper/index.html
+++ b/content/docs/latest/adaptors/KafkaWrapper/index.html
@@ -1350,23 +1350,21 @@ the Pulsar Kafka wrapper:</p>
 
 <p>Remove:</p>
 
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.kafka<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>kakfa-clients<span class="nt">&lt;/artifactId&gt;</span>
   <span class="nt">&lt;version&gt;</span>0.10.2.1<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Include dependency for Pulsar Kafka wrapper:</p>
 
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.pulsar<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>pulsar-client-kafka<span class="nt">&lt;/artifactId&gt;</span>
   <span class="nt">&lt;version&gt;</span>1.21.0-incubating<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>With the new dependency, the existing code should work without any changes. The only
 thing that needs to be adjusted is the configuration, to make sure to point the
@@ -1375,7 +1373,7 @@ Pulsar topic.</p>
 
 <h2 id="producer-example">Producer example</h2>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="c1">// Topic needs to be a regular Pulsar topic</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// Topic needs to be a regular Pulsar topic</span>
 <span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://sample/standalone/ns/my-topic"</span><span class="o">;</span>
 
 <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
@@ -1393,12 +1391,11 @@ Pulsar topic.</p>
 <span class="o">}</span>
 
 <span class="n">producer</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="consumer-example">Consumer example</h2>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://sample/standalone/ns/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://sample/standalone/ns/my-topic"</span><span class="o">;</span>
 
 <span class="n">Properties</span> <span class="n">props</span> <span class="o">=</span> <span class="k">new</span> <span class="n">Properties</span><span class="o">();</span>
 <span class="c1">// Point to a Pulsar service</span>
@@ -1420,8 +1417,7 @@ Pulsar topic.</p>
     <span class="c1">// Commit last offset</span>
     <span class="n">consumer</span><span class="o">.</span><span class="na">commitSync</span><span class="o">();</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="complete-examples">Complete Examples</h2>
 
diff --git a/content/docs/latest/adaptors/PulsarSpark/index.html b/content/docs/latest/adaptors/PulsarSpark/index.html
index 2624f75..27c0bbe 100644
--- a/content/docs/latest/adaptors/PulsarSpark/index.html
+++ b/content/docs/latest/adaptors/PulsarSpark/index.html
@@ -845,9 +845,9 @@
           
           
           
-          <li><a href="/docs/latest/adaptors/PulsarSpark/">Spark Streaming Pulsar receiver</a></li>
           
           
+          <li><a href="/docs/latest/adaptors/PulsarSpark/">Spark Streaming Pulsar receiver</a></li>
           
           
           
@@ -1037,9 +1037,9 @@
           
           
           
-          <li><a href="/docs/latest/adaptors/PulsarSpark/">Spark Streaming Pulsar receiver</a></li>
           
           
+          <li><a href="/docs/latest/adaptors/PulsarSpark/">Spark Streaming Pulsar receiver</a></li>
           
           
           
@@ -1155,6 +1155,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1295,8 +1297,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/admin-api/overview/">The Pulsar admin interface</a></li>
           
           
@@ -1360,7 +1360,7 @@
 
 <p>If you’re using Maven, add this to your <code class="highlighter-rouge">pom.xml</code>:</p>
 
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="c">&lt;!-- in your &lt;properties&gt; block --&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c">&lt;!-- in your &lt;properties&gt; block --&gt;</span>
 <span class="nt">&lt;pulsar.version&gt;</span>1.21.0-incubating<span class="nt">&lt;/pulsar.version&gt;</span>
 
 <span class="c">&lt;!-- in your &lt;dependencies&gt; block --&gt;</span>
@@ -1369,26 +1369,24 @@
   <span class="nt">&lt;artifactId&gt;</span>pulsar-spark<span class="nt">&lt;/artifactId&gt;</span>
   <span class="nt">&lt;version&gt;</span>${pulsar.version}<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="gradle">Gradle</h3>
 
 <p>If you’re using Gradle, add this to your <code class="highlighter-rouge">build.gradle</code> file:</p>
 
-<div class="language-groovy highlighter-rouge"><pre class="highlight"><code><span class="kt">def</span> <span class="n">pulsarVersion</span> <span class="o">=</span> <span class="s2">"1.21.0-incubating"</span>
+<div class="language-groovy highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">def</span> <span class="n">pulsarVersion</span> <span class="o">=</span> <span class="s2">"1.21.0-incubating"</span>
 
 <span class="n">dependencies</span> <span class="o">{</span>
     <span class="n">compile</span> <span class="nl">group:</span> <span class="s1">'org.apache.pulsar'</span><span class="o">,</span> <span class="nl">name:</span> <span class="s1">'pulsar-spark'</span><span class="o">,</span> <span class="nl">version:</span> <span class="n">pulsarVersion</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="usage">Usage</h2>
 
 <p>Pass an instance of <code class="highlighter-rouge">SparkStreamingPulsarReceiver</code> to the <code class="highlighter-rouge">receiverStream</code> method in <code class="highlighter-rouge">JavaStreamingContext</code>:</p>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">SparkConf</span> <span class="n">conf</span> <span class="o">=</span> <span class="k">new</span> <span class="n">SparkConf</span><span class="o">().</span><span class="na">setMaster</span><span class="o">(</span><span class="s">"local[*]"</span><span class="o">).</span><span class="na">setAppName</span><span class="o">(</span><span class="s">"pulsar-spark"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">SparkConf</span> <span class="n">conf</span> <span class="o">=</span> <span class="k">new</span> <span class="n">SparkConf</span><span class="o">().</span><span class="na">setMaster</span><span class="o">(</span><span class="s">"local[*]"</span><span class="o">).</span><span class="na">setAppName</span><span class="o">(</span><span class="s">"pulsar-spark"</span><span class="o [...]
 <span class="n">JavaStreamingContext</span> <span class="n">jssc</span> <span class="o">=</span> <span class="k">new</span> <span class="n">JavaStreamingContext</span><span class="o">(</span><span class="n">conf</span><span class="o">,</span> <span class="n">Durations</span><span class="o">.</span><span class="na">seconds</span><span class="o">(</span><span class="mi">5</span><span class="o">));</span>
 
 <span class="n">ClientConfiguration</span> <span class="n">clientConf</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ClientConfiguration</span><span class="o">();</span>
@@ -1399,8 +1397,7 @@
 
 <span class="n">JavaReceiverInputDStream</span><span class="o">&lt;</span><span class="kt">byte</span><span class="o">[]&gt;</span> <span class="n">msgs</span> <span class="o">=</span> <span class="n">jssc</span>
         <span class="o">.</span><span class="na">receiverStream</span><span class="o">(</span><span class="k">new</span> <span class="n">SparkStreamingPulsarReceiver</span><span class="o">(</span><span class="n">clientConf</span><span class="o">,</span> <span class="n">consConf</span><span class="o">,</span> <span class="n">url</span><span class="o">,</span> <span class="n">topic</span><span class="o">,</span> <span class="n">subs</span><span class="o">));</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="example">Example</h2>
 
diff --git a/content/docs/latest/adaptors/PulsarStorm/index.html b/content/docs/latest/adaptors/PulsarStorm/index.html
index 32f5f84..3a76c0a 100644
--- a/content/docs/latest/adaptors/PulsarStorm/index.html
+++ b/content/docs/latest/adaptors/PulsarStorm/index.html
@@ -849,9 +849,9 @@
           
           
           
-          <li><a href="/docs/latest/adaptors/PulsarStorm/">Pulsar adaptor for Apache Storm</a></li>
           
           
+          <li><a href="/docs/latest/adaptors/PulsarStorm/">Pulsar adaptor for Apache Storm</a></li>
           
           
           
@@ -963,6 +963,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1103,8 +1105,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/admin-api/overview/">The Pulsar admin interface</a></li>
           
           
@@ -1164,13 +1164,12 @@
 
 <p>Include dependency for Pulsar Storm Adaptor:</p>
 
-<div class="language-xml highlighter-rouge"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
+<div class="language-xml highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nt">&lt;dependency&gt;</span>
   <span class="nt">&lt;groupId&gt;</span>org.apache.pulsar<span class="nt">&lt;/groupId&gt;</span>
   <span class="nt">&lt;artifactId&gt;</span>pulsar-storm<span class="nt">&lt;/artifactId&gt;</span>
   <span class="nt">&lt;version&gt;</span>${pulsar.version}<span class="nt">&lt;/version&gt;</span>
 <span class="nt">&lt;/dependency&gt;</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="pulsar-spout">Pulsar Spout</h2>
 
@@ -1178,7 +1177,7 @@
 
 <p>The tuples that fail to be processed by the downstream bolts will be re-injected by the spout with an exponential backoff, within a configurable timeout (the default is 60 seconds) or a configurable number of retries, whichever comes first, after which it is <span class="popover-term" tabindex="0" title="What is an acknowledgement (ack)?" data-placement="top" data-content="A message sent to a Pulsar broker by a consumer that a message has been successfully processed. An acknowledgemen [...]
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="c1">// Configure a Pulsar Client</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// Configure a Pulsar Client</span>
 <span class="n">ClientConfiguration</span> <span class="n">clientConf</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ClientConfiguration</span><span class="o">();</span>
 
 <span class="c1">// Configure a Pulsar Consumer</span>
@@ -1208,8 +1207,7 @@
 
 <span class="c1">// Create a Pulsar Spout</span>
 <span class="n">PulsarSpout</span> <span class="n">spout</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PulsarSpout</span><span class="o">(</span><span class="n">spoutConf</span><span class="o">,</span> <span class="n">clientConf</span><span class="o">,</span> <span class="n">consumerConf</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="pulsar-bolt">Pulsar Bolt</h2>
 
@@ -1217,7 +1215,7 @@
 
 <p>A partitioned topic can also be used to publish messages on different topics. In the implementation of the <code class="highlighter-rouge">TupleToMessageMapper</code>, a “key” will need to be provided in the message which will send the messages with the same key to the same topic. Here’s an example bolt:</p>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="c1">// Configure a Pulsar Client</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">// Configure a Pulsar Client</span>
 <span class="n">ClientConfiguration</span> <span class="n">clientConf</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ClientConfiguration</span><span class="o">();</span>
 
 <span class="c1">// Configure a Pulsar Producer  </span>
@@ -1248,8 +1246,7 @@
 
 <span class="c1">// Create a Pulsar Bolt</span>
 <span class="n">PulsarBolt</span> <span class="n">bolt</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PulsarBolt</span><span class="o">(</span><span class="n">boltConf</span><span class="o">,</span> <span class="n">clientConf</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="example">Example</h2>
 
diff --git a/content/docs/latest/admin-api/brokers/index.html b/content/docs/latest/admin-api/brokers/index.html
index b377f16..da840ee 100644
--- a/content/docs/latest/admin-api/brokers/index.html
+++ b/content/docs/latest/admin-api/brokers/index.html
@@ -818,13 +818,11 @@
 
 <h4 id="pulsar-admin">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin brokers list use
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin brokers list use
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>broker1.use.org.com:8080
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>broker1.use.org.com:8080
+</code></pre></div></div>
 
 <h6 id="rest">REST</h6>
 
@@ -834,9 +832,8 @@
 
 <h6 id="java">Java</h6>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">brokers</span><span class="o">().</span><span class="na">getActiveBrokers</span><span class="o">(</span><span class="n">clusterName</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">brokers</span><span class="o">().</span><span class="na">getActiveBrokers</span><span class="o">(</span><span class="n">clusterName</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="list-of-namespaces-owned-by-a-given-broker">list of namespaces owned by a given broker</h4>
 
@@ -844,29 +841,26 @@
 
 <h6 id="cli">CLI</h6>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin brokers namespaces use <span class="se">\</span>
-  --url broker1.use.org.com:8080
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin brokers namespaces use <span class="se">\</span>
+  <span class="nt">--url</span> broker1.use.org.com:8080
+</code></pre></div></div>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"my-property/use/my-ns/0x00000000_0xffffffff"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-    </span><span class="nt">"broker_assignment"</span><span class="p">:</span><span class="w"> </span><span class="s2">"shared"</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"is_controlled"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"is_active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"my-property/use/my-ns/0x00000000_0xffffffff"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+    </span><span class="s2">"broker_assignment"</span><span class="p">:</span><span class="w"> </span><span class="s2">"shared"</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"is_controlled"</span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"is_active"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="w">
   </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 <h6 id="rest-1">REST</h6>
 
 <div class="highlighter-rouge endpoint"><pre class="highlight"><code class="method get">GET</code><code class="url">/admin/brokers/<span class="endpoint">:cluster</span>/<span class="endpoint">:broker</span>:/ownedNamespaces</code></pre></div>
 
 <h6 id="java-1">Java</h6>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">brokers</span><span class="o">().</span><span class="na">getOwnedNamespaces</span><span class="o">(</span><span class="n">cluster</span><span class="o">,</span><span class="n">brokerUrl</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">brokers</span><span class="o">().</span><span class="na">getOwnedNamespaces</span><span class="o">(</span><span class="n">cluster</span><span class="o">,</span><span class="n">brokerUrl</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="dynamic-broker-configuration">Dynamic broker configuration</h3>
 
@@ -885,9 +879,8 @@
 
 <p>The <a href="../../reference/CliTools#pulsar-admin-brokers-update-dynamic-config"><code class="highlighter-rouge">update-dynamic-config</code></a> subcommand will update existing configuration. It takes two arguments: the name of the parameter and the new value. Here’s an example for the <a href="../../reference/Configuration#broker-brokerShutdownTimeoutMs"><code class="highlighter-rouge">brokerShutdownTimeoutMs</code></a> parameter:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin brokers update-dynamic-config brokerShutdownTimeoutMs 100
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin brokers update-dynamic-config brokerShutdownTimeoutMs 100
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -897,9 +890,8 @@
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">brokers</span><span class="o">().</span><span class="na">updateDynamicConfiguration</span><span class="o">(</span><span class="n">configName</span><span class="o">,</span> <span class="n">configValue</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">brokers</span><span class="o">().</span><span class="na">updateDynamicConfiguration</span><span class="o">(</span><span class="n">configName</span><span class="o">,</span> <span class="n">configValue</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="list-updated-values">List updated values</h3>
 
@@ -907,10 +899,9 @@
 
 <h4 id="pulsar-admin-2">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin brokers list-dynamic-config
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin brokers list-dynamic-config
 brokerShutdownTimeoutMs
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -920,9 +911,8 @@ brokerShutdownTimeoutMs
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">brokers</span><span class="o">().</span><span class="na">getDynamicConfigurationNames</span><span class="o">();</span>
-</code></pre>
-</div>
+<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">brokers</span><span class="o">().</span><span class="na">getDynamicConfigurationNames</span><span class="o">();</span>
+</code></pre></div></div>
 
 <h3 id="list-all">List all</h3>
 
@@ -930,10 +920,9 @@ brokerShutdownTimeoutMs
 
 <h4 id="pulsar-admin-3">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin brokers get-all-dynamic-config
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin brokers get-all-dynamic-config
 brokerShutdownTimeoutMs:100
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -943,9 +932,8 @@ brokerShutdownTimeoutMs:100
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">brokers</span><span class="o">().</span><span class="na">getAllDynamicConfigurations</span><span class="o">();</span>
-</code></pre>
-</div>
+<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">brokers</span><span class="o">().</span><span class="na">getAllDynamicConfigurations</span><span class="o">();</span>
+</code></pre></div></div>
 
       </section>
     </article>
diff --git a/content/docs/latest/admin-api/clusters/index.html b/content/docs/latest/admin-api/clusters/index.html
index 2acae81..18f0999 100644
--- a/content/docs/latest/admin-api/clusters/index.html
+++ b/content/docs/latest/admin-api/clusters/index.html
@@ -813,11 +813,10 @@
 
 <p>You can provision a new cluster using the <a href="../../reference/CliTools#pulsar-admin-clusters-create"><code class="highlighter-rouge">create</code></a> subcommand. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin clusters create cluster-1 <span class="se">\</span>
-  --url http://my-cluster.org.com:8080 <span class="se">\</span>
-  --broker-url pulsar://my-cluster.org.com:6650
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin clusters create cluster-1 <span class="se">\</span>
+  <span class="nt">--url</span> http://my-cluster.org.com:8080 <span class="se">\</span>
+  <span class="nt">--broker-url</span> pulsar://my-cluster.org.com:6650
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -827,15 +826,14 @@
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">ClusterData</span> <span class="n">clusterData</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ClusterData</span><span class="o">(</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ClusterData</span> <span class="n">clusterData</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ClusterData</span><span class="o">(</span>
         <span class="n">serviceUrl</span><span class="o">,</span>
         <span class="n">serviceUrlTls</span><span class="o">,</span>
         <span class="n">brokerServiceUrl</span><span class="o">,</span>
         <span class="n">brokerServiceUrlTls</span>
 <span class="o">);</span>
 <span class="n">admin</span><span class="o">.</span><span class="na">clusters</span><span class="o">().</span><span class="na">createCluster</span><span class="o">(</span><span class="n">clusterName</span><span class="o">,</span> <span class="n">clusterData</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="initialize-cluster-metadata">Initialize cluster metadata</h3>
 
@@ -883,16 +881,15 @@
 
 <p>Here’s an example cluster metadata initialization command:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code>bin/pulsar initialize-cluster-metadata <span class="se">\</span>
-  --cluster us-west <span class="se">\</span>
-  --zookeeper zk1.us-west.example.com:2181 <span class="se">\</span>
-  --global-zookeeper zk1.us-west.example.com:2184 <span class="se">\</span>
-  --web-service-url http://pulsar.us-west.example.com:8080/ <span class="se">\</span>
-  --web-service-url-tls https://pulsar.us-west.example.com:8443/ <span class="se">\</span>
-  --broker-service-url pulsar://pulsar.us-west.example.com:6650/ <span class="se">\</span>
-  --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651/
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>bin/pulsar initialize-cluster-metadata <span class="se">\</span>
+  <span class="nt">--cluster</span> us-west <span class="se">\</span>
+  <span class="nt">--zookeeper</span> zk1.us-west.example.com:2181 <span class="se">\</span>
+  <span class="nt">--global-zookeeper</span> zk1.us-west.example.com:2184 <span class="se">\</span>
+  <span class="nt">--web-service-url</span> http://pulsar.us-west.example.com:8080/ <span class="se">\</span>
+  <span class="nt">--web-service-url-tls</span> https://pulsar.us-west.example.com:8443/ <span class="se">\</span>
+  <span class="nt">--broker-service-url</span> pulsar://pulsar.us-west.example.com:6650/ <span class="se">\</span>
+  <span class="nt">--broker-service-url-tls</span> pulsar+ssl://pulsar.us-west.example.com:6651/
+</code></pre></div></div>
 
 <p>You’ll need to use <code class="highlighter-rouge">--*-tls</code> flags only if you’re using <a href="../../admin/Authz#tls-client-auth">TLS authentication</a> in your instance.</p>
 
@@ -904,7 +901,7 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-clusters-get"><code class="highlighter-rouge">get</code></a> subcommand and specify the name of the cluster. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin clusters get cluster-1
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin clusters get cluster-1
 <span class="o">{</span>
     <span class="s2">"serviceUrl"</span>: <span class="s2">"http://my-cluster.org.com:8080/"</span>,
     <span class="s2">"serviceUrlTls"</span>: null,
@@ -912,8 +909,7 @@
     <span class="s2">"brokerServiceUrlTls"</span>: null
     <span class="s2">"peerClusterNames"</span>: null
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -923,9 +919,8 @@
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">clusters</span><span class="o">().</span><span class="na">getCluster</span><span class="o">(</span><span class="n">clusterName</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">clusters</span><span class="o">().</span><span class="na">getCluster</span><span class="o">(</span><span class="n">clusterName</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="update">Update</h3>
 
@@ -935,11 +930,10 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-clusters-update"><code class="highlighter-rouge">update</code></a> subcommand and specify new configuration values using flags.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin clusters update cluster-1 <span class="se">\</span>
-  --url http://my-cluster.org.com:4081 <span class="se">\</span>
-  --broker-url pulsar://my-cluster.org.com:3350
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin clusters update cluster-1 <span class="se">\</span>
+  <span class="nt">--url</span> http://my-cluster.org.com:4081 <span class="se">\</span>
+  <span class="nt">--broker-url</span> pulsar://my-cluster.org.com:3350
+</code></pre></div></div>
 
 <h4 id="rest">REST</h4>
 
@@ -949,15 +943,14 @@
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">ClusterData</span> <span class="n">clusterData</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ClusterData</span><span class="o">(</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">ClusterData</span> <span class="n">clusterData</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ClusterData</span><span class="o">(</span>
         <span class="n">serviceUrl</span><span class="o">,</span>
         <span class="n">serviceUrlTls</span><span class="o">,</span>
         <span class="n">brokerServiceUrl</span><span class="o">,</span>
         <span class="n">brokerServiceUrlTls</span>
 <span class="o">);</span>
 <span class="n">admin</span><span class="o">.</span><span class="na">clusters</span><span class="o">().</span><span class="na">updateCluster</span><span class="o">(</span><span class="n">clusterName</span><span class="o">,</span> <span class="n">clusterData</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="delete">Delete</h3>
 
@@ -967,9 +960,8 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-clusters-delete"><code class="highlighter-rouge">delete</code></a> subcommand and specify the name of the cluster.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin clusters delete cluster-1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin clusters delete cluster-1
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -979,9 +971,8 @@
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">clusters</span><span class="o">().</span><span class="na">deleteCluster</span><span class="o">(</span><span class="n">clusterName</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">clusters</span><span class="o">().</span><span class="na">deleteCluster</span><span class="o">(</span><span class="n">clusterName</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="list">List</h3>
 
@@ -991,11 +982,10 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-clusters-list"><code class="highlighter-rouge">list</code></a> subcommand.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin clusters list
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin clusters list
 cluster-1
 cluster-2
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-3">REST API</h4>
 
@@ -1005,9 +995,8 @@ cluster-2
 
 <h6 id="java-4">Java</h6>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">clusters</span><span class="o">().</span><span class="na">getClusters</span><span class="o">();</span>
-</code></pre>
-</div>
+<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">clusters</span><span class="o">().</span><span class="na">getClusters</span><span class="o">();</span>
+</code></pre></div></div>
 
 <h3 id="update-peer-cluster-data">Update peer-cluster data</h3>
 
@@ -1017,9 +1006,8 @@ cluster-2
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-clusters-update-peer-clusters"><code class="highlighter-rouge">update-peer-clusters</code></a> subcommand and specify the list of peer-cluster names.</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin update-peer-clusters cluster-1 --peer-clusters cluster-2
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin update-peer-clusters cluster-1 --peer-clusters cluster-2
+</code></pre></div></div>
 
 <h4 id="rest-api-4">REST API</h4>
 
@@ -1029,9 +1017,8 @@ cluster-2
 
 <h4 id="java-5">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">clusters</span><span class="o">().</span><span class="na">updatePeerClusterNames</span><span class="o">(</span><span class="n">clusterName</span><span class="o">,</span> <span class="n">peerClusterList</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">clusters</span><span class="o">().</span><span class="na">updatePeerClusterNames</span><span class="o">(</span><span class="n">clusterName</span><span class="o">,</span> <span class="n">peerClusterList</span><span class="o">);</span>
+</code></pre></div></div>
 
       </section>
     </article>
diff --git a/content/docs/latest/admin-api/namespaces/index.html b/content/docs/latest/admin-api/namespaces/index.html
index 8359b0a..25fe6ba 100644
--- a/content/docs/latest/admin-api/namespaces/index.html
+++ b/content/docs/latest/admin-api/namespaces/index.html
@@ -784,9 +784,8 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-create"><code class="highlighter-rouge">create</code></a> subcommand and specify the namespace by name:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces create <span class="nb">test</span>-property/cl1/ns1
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces create test-property/cl1/ns1
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -796,9 +795,8 @@
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">createNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">createNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="get-policies">Get policies</h3>
 
@@ -808,7 +806,7 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-policies"><code class="highlighter-rouge">policies</code></a> subcommand and specify the namespace:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces policies <span class="nb">test</span>-property/cl1/ns1
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces policies test-property/cl1/ns1
 <span class="o">{</span>
   <span class="s2">"auth_policies"</span>: <span class="o">{</span>
     <span class="s2">"namespace_auth"</span>: <span class="o">{}</span>,
@@ -830,8 +828,7 @@
   <span class="s2">"retention_policies"</span>: null,
   <span class="s2">"deleted"</span>: <span class="nb">false</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -841,9 +838,8 @@
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">getPolicies</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">getPolicies</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="list-namespaces-within-a-property">List namespaces within a property</h3>
 
@@ -853,11 +849,10 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-list"><code class="highlighter-rouge">list</code></a> subcommand and specify the property:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces list <span class="nb">test</span>-property
-<span class="nb">test</span>-property/cl1/ns1
-<span class="nb">test</span>-property/cl2/ns2
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces list test-property
+test-property/cl1/ns1
+test-property/cl2/ns2
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -867,9 +862,8 @@
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">getNamespaces</span><span class="o">(</span><span class="n">property</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">getNamespaces</span><span class="o">(</span><span class="n">property</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="list-namespaces-within-a-cluster">List namespaces within a cluster</h3>
 
@@ -879,11 +873,10 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-list-cluster"><code class="highlighter-rouge">list-cluster</code></a> subcommand and specify the cluster:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces list-cluster <span class="nb">test</span>-property/cl1
-<span class="nb">test</span>-property/cl1/ns1
-<span class="nb">test</span>-property/cl1/ns1
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces list-cluster test-property/cl1
+test-property/cl1/ns1
+test-property/cl1/ns1
+</code></pre></div></div>
 
 <h4 id="rest-api-3">REST API</h4>
 
@@ -893,9 +886,8 @@
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">getNamespaces</span><span class="o">(</span><span class="n">property</span><span class="o">,</span> <span class="n">cluster</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">getNamespaces</span><span class="o">(</span><span class="n">property</span><span class="o">,</span> <span class="n">cluster</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="delete">Delete</h3>
 
@@ -905,9 +897,8 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-delete"><code class="highlighter-rouge">delete</code></a> subcommand and specify the namespace:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces delete <span class="nb">test</span>-property/cl1/ns1
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces delete test-property/cl1/ns1
+</code></pre></div></div>
 
 <h4 id="rest">REST</h4>
 
@@ -917,9 +908,8 @@
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">deleteNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">deleteNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h4 id="set-replication-cluster">set replication cluster</h4>
 
@@ -927,22 +917,19 @@
 
 <h6 id="cli">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces set-clusters test-property/cl1/ns1 \
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces set-clusters test-property/cl1/ns1 \
   --clusters cl2
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h6 id="rest-1">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>&lt;div class="highlighter-rouge endpoint"&gt;&lt;pre class="highlight"&gt;&lt;code class="method post"&gt;POST&lt;/code&gt;&lt;code class="url"&gt;/admin/namespaces/&lt;span class="endpoint"&gt;:property&lt;/span&gt;/&lt;span class="endpoint"&gt;:cluster&lt;/span&gt;/&lt;span class="endpoint"&gt;:namespace&lt;/span&gt;/replication&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>&lt;div class="highlighter-rouge endpoint"&gt;&lt;pre class="highlight"&gt;&lt;code class="method post"&gt;POST&lt;/code&gt;&lt;code class="url"&gt;/admin/namespaces/&lt;span class="endpoint"&gt;:property&lt;/span&gt;/&lt;span class="endpoint"&gt;:cluster&lt;/span&gt;/&lt;span class="endpoint"&gt;:namespace&lt;/span&gt;/replication&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;
+</code></pre></div></div>
 
 <h6 id="java-5">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">setNamespaceReplicationClusters</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">clusters</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">setNamespaceReplicationClusters</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">clusters</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="get-replication-cluster">get replication cluster</h4>
 
@@ -950,25 +937,21 @@
 
 <h6 id="cli-1">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces get-clusters test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces get-clusters test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>cl2
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>cl2
+</code></pre></div></div>
 
 <h6 id="rest-2">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/replication
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/replication
+</code></pre></div></div>
 
 <h6 id="java-6">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">getNamespaceReplicationClusters</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">getNamespaceReplicationClusters</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="set-backlog-quota-policies">set backlog quota policies</h4>
 
@@ -990,25 +973,21 @@
 
 <h6 id="cli-2">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces set-backlog-quota --limit 10 --policy producer_request_hold test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces set-backlog-quota --limit 10 --policy producer_request_hold test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-3">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/backlogQuota
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/backlogQuota
+</code></pre></div></div>
 
 <h6 id="java-7">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">setBacklogQuota</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="k">new</span> <span class="n">BacklogQuota</span><span class="o">(</span><span class="n">limit</span><span class="o">,</span> <span class="n">policy</span><span class="o">))</span>
-</code></pre>
-</div>
+<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">setBacklogQuota</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="k">new</span> <span class="n">BacklogQuota</span><span class="o">(</span><span class="n">limit</span><span class="o">,</span> <span class="n">policy</ [...]
+</code></pre></div></div>
 
 <h4 id="get-backlog-quota-policies">get backlog quota policies</h4>
 
@@ -1016,30 +995,26 @@
 
 <h6 id="cli-3">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces get-backlog-quotas test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces get-backlog-quotas test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-    </span><span class="nt">"destination_storage"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"policy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"producer_request_hold"</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+    </span><span class="s2">"destination_storage"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"policy"</span><span class="p">:</span><span class="w"> </span><span class="s2">"producer_request_hold"</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">          
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h6 id="rest-4">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/backlogQuotaMap
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/backlogQuotaMap
+</code></pre></div></div>
 
 <h6 id="java-8">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">getBacklogQuotaMap</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">getBacklogQuotaMap</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="remove-backlog-quota-policies">remove backlog quota policies</h4>
 
@@ -1047,25 +1022,21 @@
 
 <h6 id="cli-4">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces remove-backlog-quota test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces remove-backlog-quota test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-5">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>DELETE /admin/namespaces/{property}/{cluster}/{namespace}/backlogQuota
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>DELETE /admin/namespaces/{property}/{cluster}/{namespace}/backlogQuota
+</code></pre></div></div>
 
 <h6 id="java-9">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">removeBacklogQuota</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">backlogQuotaType</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">removeBacklogQuota</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">backlogQuotaType</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="set-persistence-policies">set persistence policies</h4>
 
@@ -1088,25 +1059,21 @@
 
 <h6 id="cli-5">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper-ensemble 3 --bookkeeper-write-quorum 2 --ml-mark-delete-max-rate 0 test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper-ensemble 3 --bookkeeper-write-quorum 2 --ml-mark-delete-max-rate 0 test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-6">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>POST /admin/persistent/{property}/{cluster}/{namespace}/persistence
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>POST /admin/persistent/{property}/{cluster}/{namespace}/persistence
+</code></pre></div></div>
 
 <h6 id="java-10">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">setPersistence</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span><span class="k">new</span> <span class="n">PersistencePolicies</span><span class="o">(</span><span class="n">bookkeeperEnsemble</span><span class="o">,</span> <span class="n">bookkeeperWri [...]
-</code></pre>
-</div>
+<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">setPersistence</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span><span class="k">new</span> <span class="n">PersistencePolicies</span><span class="o">(</span><span class="n">bookkeeperEnsemble</span><span class="o">,</span> <span  [...]
+</code></pre></div></div>
 
 <h4 id="get-persistence-policies">get persistence policies</h4>
 
@@ -1114,30 +1081,26 @@
 
 <h6 id="cli-6">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces get-persistence test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces get-persistence test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"bookkeeperEnsemble"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"bookkeeperWriteQuorum"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"bookkeeperAckQuorum"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"managedLedgerMaxMarkDeleteRate"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"bookkeeperEnsemble"</span><span class="p">:</span><span class="w"> </span><span class="mi">3</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"bookkeeperWriteQuorum"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"bookkeeperAckQuorum"</span><span class="p">:</span><span class="w"> </span><span class="mi">2</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"managedLedgerMaxMarkDeleteRate"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h6 id="rest-7">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/persistence
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/persistence
+</code></pre></div></div>
 
 <h6 id="java-11">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">getPersistence</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">getPersistence</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="unload-namespace-bundle">unload namespace bundle</h4>
 
@@ -1145,25 +1108,21 @@
 
 <h6 id="cli-7">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-property/pstg-gq1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-property/pstg-gq1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-8">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>PUT /admin/namespaces/{property}/{cluster}/{namespace}/unload
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>PUT /admin/namespaces/{property}/{cluster}/{namespace}/unload
+</code></pre></div></div>
 
 <h6 id="java-12">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">unloadNamespaceBundle</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">bundle</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">unloadNamespaceBundle</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">bundle</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="set-message-ttl">set message-ttl</h4>
 
@@ -1171,25 +1130,21 @@
 
 <h6 id="cli-8">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-9">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/messageTTL
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/messageTTL
+</code></pre></div></div>
 
 <h6 id="java-13">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">setNamespaceMessageTTL</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">messageTTL</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">setNamespaceMessageTTL</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">messageTTL</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="get-message-ttl">get message-ttl</h4>
 
@@ -1197,25 +1152,21 @@
 
 <h6 id="cli-9">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces get-message-ttl test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces get-message-ttl test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>100
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>100
+</code></pre></div></div>
 
 <h6 id="rest-10">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/messageTTL
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/messageTTL
+</code></pre></div></div>
 
 <h6 id="java-14">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">getNamespaceReplicationClusters</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">getNamespaceReplicationClusters</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="split-bundle">split bundle</h4>
 
@@ -1223,25 +1174,21 @@
 
 <h6 id="cli-10">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-11">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>PUT /admin/namespaces/{property}/{cluster}/{namespace}/{bundle}/split
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>PUT /admin/namespaces/{property}/{cluster}/{namespace}/{bundle}/split
+</code></pre></div></div>
 
 <h6 id="java-15">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">splitNamespaceBundle</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">bundle</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">splitNamespaceBundle</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">bundle</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="clear-backlog">clear backlog</h4>
 
@@ -1249,25 +1196,21 @@
 
 <h6 id="cli-11">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces clear-backlog --sub my-subscription test-property/pstg-gq1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces clear-backlog --sub my-subscription test-property/pstg-gq1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-12">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/clearBacklog
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/clearBacklog
+</code></pre></div></div>
 
 <h6 id="java-16">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">clearNamespaceBacklogForSubscription</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">subscription</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">clearNamespaceBacklogForSubscription</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">subscription</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="clear-bundle-backlog">clear bundle backlog</h4>
 
@@ -1275,25 +1218,21 @@
 
 <h6 id="cli-12">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub my-subscription test-property/pstg-gq1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub my-subscription test-property/pstg-gq1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-13">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/{bundle}/clearBacklog
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/{bundle}/clearBacklog
+</code></pre></div></div>
 
 <h6 id="java-17">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">clearNamespaceBundleBacklogForSubscription</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">bundle</span><span class="o">,</span> <span class="n">subscription</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">clearNamespaceBundleBacklogForSubscription</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">bundle</span><span class="o">,</span> <span class="n">subscription</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="set-retention">set retention</h4>
 
@@ -1301,25 +1240,21 @@
 
 <h6 id="cli-13">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin set-retention --size 10 --time 100 test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin set-retention --size 10 --time 100 test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>N/A
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>N/A
+</code></pre></div></div>
 
 <h6 id="rest-14">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/retention
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/retention
+</code></pre></div></div>
 
 <h6 id="java-18">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">setRetention</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="k">new</span> <span class="n">RetentionPolicies</span><span class="o">(</span><span class="n">retentionTimeInMin</span><span class="o">,</span> <span class="n">retentionSizeInM [...]
-</code></pre>
-</div>
+<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">setRetention</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="k">new</span> <span class="n">RetentionPolicies</span><span class="o">(</span><span class="n">retentionTimeInMin</span><span class="o">,</span> <span cla [...]
+</code></pre></div></div>
 
 <h4 id="get-retention">get retention</h4>
 
@@ -1327,28 +1262,24 @@
 
 <h6 id="cli-14">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces get-retention test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces get-retention test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-    </span><span class="nt">"retentionTimeInMinutes"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"retentionSizeInMB"</span><span class="p">:</span><span class="w"> </span><span class="mi">100</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+    </span><span class="s2">"retentionTimeInMinutes"</span><span class="p">:</span><span class="w"> </span><span class="mi">10</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"retentionSizeInMB"</span><span class="p">:</span><span class="w"> </span><span class="mi">100</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h6 id="rest-15">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/retention
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/retention
+</code></pre></div></div>
 
 <h6 id="java-19">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">getRetention</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">getRetention</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="set-dispatch-throttling">set dispatch throttling</h4>
 
@@ -1359,21 +1290,18 @@ disables the throttling.</p>
 
 <h6 id="cli-15">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces set-dispatch-rate test-property/cl1/ns1 --msg-dispatch-rate 1000 --byte-dispatch-rate 1048576 --dispatch-rate-period 1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces set-dispatch-rate test-property/cl1/ns1 --msg-dispatch-rate 1000 --byte-dispatch-rate 1048576 --dispatch-rate-period 1
+</code></pre></div></div>
 
 <h6 id="rest-16">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/dispatchRate
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>POST /admin/namespaces/{property}/{cluster}/{namespace}/dispatchRate
+</code></pre></div></div>
 
 <h6 id="java-20">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">setDispatchRate</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="mi">1000</span><span class="o">,</span> <span class="mi">1048576</span><span class="o">,</span> <span class="mi">1</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">setDispatchRate</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="mi">1000</span><span class="o">,</span> <span class="mi">1048576</span><span class="o">,</span> <span class="mi">1</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h4 id="get-configured-message-rate">get configured message-rate</h4>
 
@@ -1381,29 +1309,25 @@ disables the throttling.</p>
 
 <h6 id="cli-16">CLI</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ pulsar-admin namespaces get-dispatch-rate test-property/cl1/ns1
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ pulsar-admin namespaces get-dispatch-rate test-property/cl1/ns1
+</code></pre></div></div>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"dispatchThrottlingRatePerTopicInMsg"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">1000</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"dispatchThrottlingRatePerTopicInByte"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">1048576</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"ratePeriodInSecond"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"dispatchThrottlingRatePerTopicInMsg"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">1000</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"dispatchThrottlingRatePerTopicInByte"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">1048576</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"ratePeriodInSecond"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h6 id="rest-17">REST</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/dispatchRate
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>GET /admin/namespaces/{property}/{cluster}/{namespace}/dispatchRate
+</code></pre></div></div>
 
 <h6 id="java-21">Java</h6>
 
-<div class="language-java highlighter-rouge"><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">getDispatchRate</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
-</code></pre>
-</div>
+<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">getDispatchRate</span><span class="o">(</span><span class="n">namespace</span><span class="o">)</span>
+</code></pre></div></div>
 
 <h3 id="namespace-isolation">Namespace isolation</h3>
 
@@ -1419,9 +1343,8 @@ disables the throttling.</p>
 
 <h5 id="example">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces unload my-prop/my-cluster/my-ns
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces unload my-prop/my-cluster/my-ns
+</code></pre></div></div>
 
 <h4 id="rest-api-4">REST API</h4>
 
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 6f2cb2f..a3b0ca5 100644
--- a/content/docs/latest/admin-api/non-persistent-topics/index.html
+++ b/content/docs/latest/admin-api/non-persistent-topics/index.html
@@ -847,62 +847,60 @@ persisting messages.</p>
   </li>
 </ul>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgDropRate"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgDropRate"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgDropRate"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
+      </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgDropRate"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">],</span><span class="w">
-  </span><span class="nt">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-    </span><span class="nt">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
-       </span><span class="nt">"consumers"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nt">"msgRateOut"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">20343.506296021893</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"msgThroughputOut"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">2.0979855364233278</span><span class="err">E</span><span class="mi">7</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"msgRateRedeliver"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"consumerName"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"fe3c0"</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"availablePermits"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">950</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"unackedMessages"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"blockedConsumerOnUnackedMsgs"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"address"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"/10.73.210.249:60578"</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"connectedSince"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"2017-07-26 15:13:48.026-0700"</span><span class="p">,</span><span class="w">
-        </span><span class="nt">"clientVersion"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"1.19-incubating-SNAPSHOT"</span><span class="w">
+  </span><span class="s2">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+    </span><span class="s2">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+      </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
+       </span><span class="s2">"consumers"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="s2">"msgRateOut"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">20343.506296021893</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"msgThroughputOut"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">2.0979855364233278E7</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"msgRateRedeliver"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"consumerName"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"fe3c0"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"availablePermits"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">950</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"unackedMessages"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"blockedConsumerOnUnackedMsgs"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="kc">false</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"address"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"/10.73.210.249:60578"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"connectedSince"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"2017-07-26 15:13:48.026-0700"</span><span class="p">,</span><span class="w">
+        </span><span class="s2">"clientVersion"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="s2">"1.19-incubating-SNAPSHOT"</span><span class="w">
       </span><span class="p">}</span><span class="w"> </span><span class="p">],</span><span class="w">
-      </span><span class="nt">"msgDropRate"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">432.2390921571593</span><span class="w">
+      </span><span class="s2">"msgDropRate"</span><span class="w"> </span><span class="p">:</span><span class="w"> </span><span class="mf">432.2390921571593</span><span class="w">
 
     </span><span class="p">}</span><span class="w">
   </span><span class="p">},</span><span class="w">
-  </span><span class="nt">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
+  </span><span class="s2">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h4 id="pulsar-admin">pulsar-admin</h4>
 
 <p>Topic stats can be fetched using <a href="../../reference/CliTools#stats"><code class="highlighter-rouge">stats</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin non-persistent stats <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin non-persistent stats <span class="se">\</span>
   non-persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -910,10 +908,9 @@ persisting messages.</p>
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-internal-stats">Get internal stats</h3>
 
@@ -923,7 +920,7 @@ persisting messages.</p>
 
 <p>Topic internal-stats can be fetched using <a href="../../reference/CliTools#stats-internal"><code class="highlighter-rouge">stats-internal</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin non-persistent stats-internal <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin non-persistent stats-internal <span class="se">\</span>
   non-persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
 <span class="o">{</span>
@@ -941,8 +938,7 @@ persisting messages.</p>
   <span class="o">}</span>
 <span class="o">}</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -950,10 +946,9 @@ persisting messages.</p>
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="create-partitioned-topic">Create partitioned topic</h3>
 
@@ -961,11 +956,10 @@ persisting messages.</p>
 
 <h4 id="pulsar-admin-2">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin non-persistent create-partitioned-topic <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin non-persistent create-partitioned-topic <span class="se">\</span>
   non-persistent://my-property/my-cluster-my-namespace/my-topic <span class="se">\</span>
-  --partitions 4
-</code></pre>
-</div>
+  <span class="nt">--partitions</span> 4
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -973,11 +967,10 @@ persisting messages.</p>
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">topicName</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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">topicName</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-my-namespace/my-topic"</span><span class="o">;</span>
 <span class="kt">int</span> <span class="n">numPartitions</span> <span class="o">=</span> <span class="mi">4</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">createPartitionedTopic</span><span class="o">(</span><span class="n">topicName</span><span class="o">,</span> <span class="n">numPartitions</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-metadata">Get metadata</h3>
 
@@ -1000,13 +993,12 @@ persisting messages.</p>
 
 <h4 id="pulsar-admin-3">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin non-persistent get-partitioned-topic-metadata <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin non-persistent get-partitioned-topic-metadata <span class="se">\</span>
   non-persistent://my-property/my-cluster-my-namespace/my-topic
 <span class="o">{</span>
   <span class="s2">"partitions"</span>: 4
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-3">REST API</h4>
 
@@ -1014,10 +1006,9 @@ persisting messages.</p>
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">topicName</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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">topicName</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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">getPartitionedTopicMetadata</span><span class="o">(</span><span class="n">topicName</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="unload-topic">Unload topic</h3>
 
@@ -1027,10 +1018,9 @@ persisting messages.</p>
 
 <p>Topic can be unloaded using <a href="../../reference/CliTools#unload"><code class="highlighter-rouge">unload</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin non-persistent unload <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin non-persistent unload <span class="se">\</span>
   non-persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-4">REST API</h4>
 
@@ -1040,10 +1030,9 @@ persisting messages.</p>
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"non-persistent://my-property/my-cluster-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">destination</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
       </section>
     </article>
diff --git a/content/docs/latest/admin-api/overview/index.html b/content/docs/latest/admin-api/overview/index.html
index 6ec56d9..823d612 100644
--- a/content/docs/latest/admin-api/overview/index.html
+++ b/content/docs/latest/admin-api/overview/index.html
@@ -771,6 +771,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -887,8 +889,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/deployment/aws-cluster/">Deploying a Pulsar cluster on AWS using Terraform and Ansible</a></li>
           
           
@@ -985,9 +985,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>
           
           
           
@@ -1363,6 +1363,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1503,8 +1505,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/admin-api/overview/">The Pulsar admin interface</a></li>
           
           
@@ -1565,9 +1565,8 @@
   <li>
     <p>The <code class="highlighter-rouge">pulsar-admin</code> CLI tool, which is available in the <code class="highlighter-rouge">bin</code> folder of your <a href="../../getting-started/LocalCluster">Pulsar installation</a>:</p>
 
-    <div class="language-shell highlighter-rouge"><pre class="highlight"><code> <span class="nv">$ </span>bin/pulsar-admin
-</code></pre>
-    </div>
+    <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code> <span class="nv">$ </span>bin/pulsar-admin
+</code></pre></div>    </div>
 
     <p>Full documentation for this tool can be found in the <a href="../../reference/CliTools#pulsar-admin">Pulsar command-line tools</a> doc.</p>
   </li>
@@ -1726,7 +1725,7 @@
 
 <p>To use the Java admin API, instantiate a <a target="_blank" href="/api/admin/org/apache/pulsar/client/admin/PulsarAdmin.html"><code class="highlighter-rouge">PulsarAdmin</code></a> object, specifying a URL for 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 th [...]
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">URL</span> <span class="n">url</span> <span class="o">=</span> <span class="k">new</span> <span class="n">URL</span><span class="o">(</span><span class="s">"http://localhost:8080"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">URL</span> <span class="n">url</span> <span class="o">=</span> <span class="k">new</span> <span class="n">URL</span><span class="o">(</span><span class="s">"http://localhost:8080"</span><span class="o">);</span>
 <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="c1">//Pass auth-plugin class fully-qualified name if Pulsar-security enabled</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><span class="c1">//Pass auth-param if auth-plugin class requires it</span>
 <span class="kt">boolean</span> <span class="n">useTls</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
@@ -1740,8 +1739,7 @@
 <span class="n">config</span><span class="o">.</span><span class="na">setTlsTrustCertsFilePath</span><span class="o">(</span><span class="n">tlsTrustCertsFilePath</span><span class="o">);</span>
 
 <span class="n">PulsarAdmin</span> <span class="n">admin</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PulsarAdmin</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">config</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 
       </section>
diff --git a/content/docs/latest/admin-api/partitioned-topics/index.html b/content/docs/latest/admin-api/partitioned-topics/index.html
index de89fe4..84baccd 100644
--- a/content/docs/latest/admin-api/partitioned-topics/index.html
+++ b/content/docs/latest/admin-api/partitioned-topics/index.html
@@ -881,11 +881,10 @@
 
 <p>You can create partitioned topics using the <a href="../../reference/CliTools#pulsar-admin-persistent-create-partitioned-topic"><code class="highlighter-rouge">create-partitioned-topic</code></a> command and specifying the topic name as an argument and the number of partitions using the <code class="highlighter-rouge">-p</code> or <code class="highlighter-rouge">--partitions</code> flag. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin persistent create-partitioned-topic <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin persistent create-partitioned-topic <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic <span class="se">\</span>
-  --partitions 4
-</code></pre>
-</div>
+  <span class="nt">--partitions</span> 4
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -895,11 +894,10 @@
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-my-namespace/my-topic"</span><span class="o">;</span>
 <span class="kt">int</span> <span class="n">numPartitions</span> <span class="o">=</span> <span class="mi">4</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">createPartitionedTopic</span><span class="o">(</span><span class="n">topicName</span><span class="o">,</span> <span class="n">numPartitions</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-metadata">Get metadata</h3>
 
@@ -924,13 +922,12 @@
 
 <p>You can see the number of partitions in a partitioned topic using the <a href="../../reference/CliTools#pulsar-admin-persistent-get-partitioned-topic"><code class="highlighter-rouge">get-partitioned-topic-metadata</code></a> subcommand. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent get-partitioned-topic-metadata <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent get-partitioned-topic-metadata <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic
 <span class="o">{</span>
   <span class="s2">"partitions"</span>: 4
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -940,10 +937,9 @@
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">getPartitionedTopicMetadata</span><span class="o">(</span><span class="n">topicName</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="update">Update</h3>
 
@@ -957,11 +953,10 @@
 
 <p>Partitioned topics can be updated using the <a href="../../reference/CliTools#pulsar-admin-persistent-update-partitioned-topic"><code class="highlighter-rouge">update-partitioned-topic</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent update-partitioned-topic <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent update-partitioned-topic <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic <span class="se">\</span>
-  --partitions 8
-</code></pre>
-</div>
+  <span class="nt">--partitions</span> 8
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -971,9 +966,8 @@
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">updatePartitionedTopic</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">,</span> <span class="n">numPartitions</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">updatePartitionedTopic</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">,</span> <span class="n">numPartitions</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="delete">Delete</h3>
 
@@ -981,10 +975,9 @@
 
 <p>Partitioned topics can be deleted using the <a href="../../reference/CliTools#pulsar-admin-persistent-delete-partitioned-topic"><code class="highlighter-rouge">delete-partitioned-topic</code></a> command, specifying the topic by name:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin persistent delete-partitioned-topic <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin persistent delete-partitioned-topic <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-3">REST API</h4>
 
@@ -994,9 +987,8 @@
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><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">persistentTopic</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">delete</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="list">List</h3>
 
@@ -1004,11 +996,10 @@
 
 <h4 id="pulsar-admin-4">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent list prop-1/cluster-1/namespace
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent list prop-1/cluster-1/namespace
 persistent://property/cluster/namespace/topic
 persistent://property/cluster/namespace/topic
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-4">REST API</h4>
 
@@ -1018,46 +1009,44 @@ persistent://property/cluster/namespace/topic
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getList</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">getList</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="stats">Stats</h3>
 
 <p>It shows current statistics of a given partitioned topic. Here’s an example payload:</p>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+      </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">],</span><span class="w">
-  </span><span class="nt">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-    </span><span class="nt">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"consumers"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
+  </span><span class="s2">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+    </span><span class="s2">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+      </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"consumers"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">},</span><span class="w">
-  </span><span class="nt">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
+  </span><span class="s2">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <p>The following stats are available:</p>
 
@@ -1248,11 +1237,10 @@ persistent://property/cluster/namespace/topic
 
 <p><a href="../../reference/CliTools#pulsar-admin-persistent-partitioned-stats"><code class="highlighter-rouge">partitioned-stats</code></a></p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent partitioned-stats <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent partitioned-stats <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-  --per-partition        
-</code></pre>
-</div>
+  <span class="nt">--per-partition</span>        
+</code></pre></div></div>
 
 <h4 id="rest-api-5">REST API</h4>
 
@@ -1262,9 +1250,8 @@ persistent://property/cluster/namespace/topic
 
 <h4 id="java-5">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><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">persistentTopic</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">getStats</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="internal-stats">Internal stats</h3>
 
@@ -1435,49 +1422,47 @@ persistent://property/cluster/namespace/topic
   </tbody>
 </table>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"entriesAddedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449518</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"numberOfEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"totalSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"currentLedgerEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"currentLedgerSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"lastLedgerCreatedTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 03:00:23.825"</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"lastLedgerCreationFailureTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"waitingCursorsCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"pendingAddEntriesCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"lastConfirmedEntry"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3232"</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"LedgerOpened"</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"ledgers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"entriesAddedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449518</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"numberOfEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"totalSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"currentLedgerEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"currentLedgerSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"lastLedgerCreatedTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 03:00:23.825"</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"lastLedgerCreationFailureTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"waitingCursorsCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"pendingAddEntriesCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"lastConfirmedEntry"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3232"</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"LedgerOpened"</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"ledgers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"ledgerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">324711539</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"entries"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+      </span><span class="s2">"ledgerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">324711539</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"entries"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">],</span><span class="w">
-  </span><span class="nt">"cursors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-    </span><span class="nt">"my-subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"markDeletePosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3133"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"readPosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3233"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"waitingReadOp"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"pendingReadOps"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"messagesConsumedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449501</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"cursorLedger"</span><span class="p">:</span><span class="w"> </span><span class="mi">324702104</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"cursorLedgerLastEntry"</span><span class="p">:</span><span class="w"> </span><span class="mi">21</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"individuallyDeletedMessages"</span><span class="p">:</span><span class="w"> </span><span class="s2">"[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"lastLedgerSwitchTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 01:30:19.313"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Open"</span><span class="w">
+  </span><span class="s2">"cursors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+    </span><span class="s2">"my-subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+      </span><span class="s2">"markDeletePosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3133"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"readPosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3233"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"waitingReadOp"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"pendingReadOps"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"messagesConsumedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449501</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"cursorLedger"</span><span class="p">:</span><span class="w"> </span><span class="mi">324702104</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"cursorLedgerLastEntry"</span><span class="p">:</span><span class="w"> </span><span class="mi">21</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"individuallyDeletedMessages"</span><span class="p">:</span><span class="w"> </span><span class="s2">"[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"lastLedgerSwitchTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 01:30:19.313"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Open"</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h4 id="pulsar-admin-6">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent stats-internal <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent stats-internal <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-6">REST API</h4>
 
@@ -1487,9 +1472,8 @@ persistent://property/cluster/namespace/topic
 
 <h4 id="java-6">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><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">persistentTopic</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">getInternalStats</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">);</span>
+</code></pre></div></div>
 
 
       </section>
diff --git a/content/docs/latest/admin-api/permissions/index.html b/content/docs/latest/admin-api/permissions/index.html
index 7721ad4..e1de75d 100644
--- a/content/docs/latest/admin-api/permissions/index.html
+++ b/content/docs/latest/admin-api/permissions/index.html
@@ -797,39 +797,35 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-grant-permission"><code class="highlighter-rouge">grant-permission</code></a> subcommand and specify a namespace, actions using the <code class="highlighter-rouge">--actions</code> flag, and a role using the <code class="highlighter-rouge">--role</code> flag:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-  --actions produce,consume <span class="se">\</span>
-  --role admin10
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+  <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+  <span class="nt">--role</span> admin10
+</code></pre></div></div>
 
 <p>Wildcard authorization can be performed when <code class="highlighter-rouge">authorizationAllowWildcardsMatching</code> is set to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">broker.conf</code>.</p>
 
 <p>e.g.</p>
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-                        --actions produce,consume <span class="se">\</span>
-                        --role <span class="s1">'my.role.*'</span>
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+                        <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+                        <span class="nt">--role</span> <span class="s1">'my.role.*'</span>
+</code></pre></div></div>
 
 <p>Then, roles <code class="highlighter-rouge">my.role.1</code>, <code class="highlighter-rouge">my.role.2</code>, <code class="highlighter-rouge">my.role.foo</code>, <code class="highlighter-rouge">my.role.bar</code>, etc. can produce and consume.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-                        --actions produce,consume <span class="se">\</span>
-                        --role <span class="s1">'*.role.my'</span>
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+                        <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+                        <span class="nt">--role</span> <span class="s1">'*.role.my'</span>
+</code></pre></div></div>
 
 <p>Then, roles <code class="highlighter-rouge">1.role.my</code>, <code class="highlighter-rouge">2.role.my</code>, <code class="highlighter-rouge">foo.role.my</code>, <code class="highlighter-rouge">bar.role.my</code>, etc. can produce and consume.</p>
 
 <p><strong>Note</strong>: A wildcard matching works at <strong>the beginning or end of the role name only</strong>.</p>
 
 <p>e.g.</p>
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-                        --actions produce,consume <span class="se">\</span>
-                        --role <span class="s1">'my.*.role'</span>
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+                        <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+                        <span class="nt">--role</span> <span class="s1">'my.*.role'</span>
+</code></pre></div></div>
 
 <p>In this case, only the role <code class="highlighter-rouge">my.*.role</code> has permissions.<br />
 Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter-rouge">my.2.role</code>, <code class="highlighter-rouge">my.foo.role</code>, <code class="highlighter-rouge">my.bar.role</code>, etc. <strong>cannot</strong> produce and consume.</p>
@@ -842,9 +838,8 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">grantPermissionOnNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">role</span><span class="o">,</span> <span class="n">getAuthActions</span><span class="o">(</span><span class="n">actions</span><span class="o">));</span>
-</code></pre>
-</div>
+<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">grantPermissionOnNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">role</span><span class="o">,</span> <span class="n">getAuthActions</span><span class="o">(</span><span class="n">actions</span><span cla [...]
+</code></pre></div></div>
 
 <h3 id="get-permission">Get permission</h3>
 
@@ -854,15 +849,14 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-permissions"><code class="highlighter-rouge">permissions</code></a> subcommand and specify a namespace:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces permissions <span class="nb">test</span>-property/cl1/ns1
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces permissions test-property/cl1/ns1
 <span class="o">{</span>
   <span class="s2">"admin10"</span>: <span class="o">[</span>
     <span class="s2">"produce"</span>,
     <span class="s2">"consume"</span>
   <span class="o">]</span>
 <span class="o">}</span>   
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -872,9 +866,8 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">getPermissions</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">getPermissions</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="revoke-permissions">Revoke permissions</h3>
 
@@ -884,10 +877,9 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-revoke-permission"><code class="highlighter-rouge">revoke-permission</code></a> subcommand and specify a namespace and a role using the <code class="highlighter-rouge">--role</code> flag:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces revoke-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-  --role admin10
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces revoke-permission test-property/cl1/ns1 <span class="se">\</span>
+  <span class="nt">--role</span> admin10
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -897,9 +889,8 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><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 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>
 
 
       </section>
diff --git a/content/docs/latest/admin-api/persistent-topics/index.html b/content/docs/latest/admin-api/persistent-topics/index.html
index 8f4f060..9f9e013 100644
--- a/content/docs/latest/admin-api/persistent-topics/index.html
+++ b/content/docs/latest/admin-api/persistent-topics/index.html
@@ -802,11 +802,10 @@
 
 <p>List of topics can be fetched using <a href="../../reference/CliTools#list"><code class="highlighter-rouge">list</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent list <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent list <span class="se">\</span>
   my-property/my-cluster/my-namespace <span class="se">\</span>
   my-topic
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -816,10 +815,9 @@
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">namespace</span> <span class="o">=</span> <span class="s">"my-property/my-cluster-my-namespace"</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">namespace</span> <span class="o">=</span> <span class="s">"my-property/my-cluster-my-namespace"</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">getList</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="grant-permission">Grant permission</h3>
 
@@ -829,12 +827,11 @@
 
 <p>Permission can be granted using <a href="../../reference/CliTools#grant-permission"><code class="highlighter-rouge">grant-permission</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent grant-permission <span class="se">\</span>
-  --actions produce,consume --role application1 <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent grant-permission <span class="se">\</span>
+  <span class="nt">--actions</span> produce,consume <span class="nt">--role</span> application1 <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -844,12 +841,11 @@
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-permission">Get permission</h3>
 
@@ -859,7 +855,7 @@
 
 <p>TODO: admin</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent permissions <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent permissions <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
 <span class="o">{</span>
@@ -868,8 +864,7 @@
         <span class="s2">"produce"</span>
     <span class="o">]</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -879,10 +874,9 @@
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="revoke-permission">Revoke permission</h3>
 
@@ -892,8 +886,8 @@
 
 <p>Permission can be revoked using <a href="../../reference/CliTools#revoke-permission"><code class="highlighter-rouge">revoke-permission</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent revoke-permission <span class="se">\</span>
-  --role application1 <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent revoke-permission <span class="se">\</span>
+  <span class="nt">--role</span> application1 <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
 <span class="o">{</span>
@@ -902,8 +896,7 @@
         <span class="s2">"produce"</span>
     <span class="o">]</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-3">REST API</h4>
 
@@ -913,11 +906,10 @@
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="delete-topic">Delete topic</h3>
 
@@ -927,10 +919,9 @@
 
 <p>Topic can be deleted using <a href="../../reference/CliTools#delete"><code class="highlighter-rouge">delete</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent delete <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent delete <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-4">REST API</h4>
 
@@ -940,10 +931,9 @@
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="unload-topic">Unload topic</h3>
 
@@ -953,10 +943,9 @@
 
 <p>Topic can be unloaded using <a href="../../reference/CliTools#unload"><code class="highlighter-rouge">unload</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent unload <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent unload <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-5">REST API</h4>
 
@@ -966,10 +955,9 @@
 
 <h4 id="java-5">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-stats">Get stats</h3>
 
@@ -1056,47 +1044,45 @@
   </li>
 </ul>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+      </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">],</span><span class="w">
-  </span><span class="nt">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-    </span><span class="nt">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"consumers"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
+  </span><span class="s2">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+    </span><span class="s2">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+      </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"consumers"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">},</span><span class="w">
-  </span><span class="nt">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
+  </span><span class="s2">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h4 id="pulsar-admin-6">pulsar-admin</h4>
 
 <p>Topic stats can be fetched using <a href="../../reference/CliTools#stats"><code class="highlighter-rouge">stats</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent stats <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent stats <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-6">REST API</h4>
 
@@ -1106,10 +1092,9 @@
 
 <h4 id="java-6">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-internal-stats">Get internal stats</h3>
 
@@ -1187,51 +1172,49 @@
   </li>
 </ul>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-    </span><span class="nt">"entriesAddedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449518</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"numberOfEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"totalSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"currentLedgerEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"currentLedgerSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"lastLedgerCreatedTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 03:00:23.825"</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"lastLedgerCreationFailureTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"waitingCursorsCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"pendingAddEntriesCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"lastConfirmedEntry"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3232"</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"LedgerOpened"</span><span class="p">,</span><span class="w">
-    </span><span class="nt">"ledgers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+    </span><span class="s2">"entriesAddedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449518</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"numberOfEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"totalSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"currentLedgerEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"currentLedgerSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"lastLedgerCreatedTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 03:00:23.825"</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"lastLedgerCreationFailureTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"waitingCursorsCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"pendingAddEntriesCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"lastConfirmedEntry"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3232"</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"LedgerOpened"</span><span class="p">,</span><span class="w">
+    </span><span class="s2">"ledgers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
         </span><span class="p">{</span><span class="w">
-            </span><span class="nt">"ledgerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">324711539</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"entries"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+            </span><span class="s2">"ledgerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">324711539</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"entries"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
         </span><span class="p">}</span><span class="w">
     </span><span class="p">],</span><span class="w">
-    </span><span class="nt">"cursors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-        </span><span class="nt">"my-subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-            </span><span class="nt">"markDeletePosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3133"</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"readPosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3233"</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"waitingReadOp"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"pendingReadOps"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"messagesConsumedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449501</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"cursorLedger"</span><span class="p">:</span><span class="w"> </span><span class="mi">324702104</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"cursorLedgerLastEntry"</span><span class="p">:</span><span class="w"> </span><span class="mi">21</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"individuallyDeletedMessages"</span><span class="p">:</span><span class="w"> </span><span class="s2">"[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]"</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"lastLedgerSwitchTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 01:30:19.313"</span><span class="p">,</span><span class="w">
-            </span><span class="nt">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Open"</span><span class="w">
+    </span><span class="s2">"cursors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+        </span><span class="s2">"my-subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+            </span><span class="s2">"markDeletePosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3133"</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"readPosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3233"</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"waitingReadOp"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"pendingReadOps"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"messagesConsumedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449501</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"cursorLedger"</span><span class="p">:</span><span class="w"> </span><span class="mi">324702104</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"cursorLedgerLastEntry"</span><span class="p">:</span><span class="w"> </span><span class="mi">21</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"individuallyDeletedMessages"</span><span class="p">:</span><span class="w"> </span><span class="s2">"[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]"</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"lastLedgerSwitchTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 01:30:19.313"</span><span class="p">,</span><span class="w">
+            </span><span class="s2">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Open"</span><span class="w">
         </span><span class="p">}</span><span class="w">
     </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h4 id="pulsar-admin-7">pulsar-admin</h4>
 
 <p>Topic internal-stats can be fetched using <a href="../../reference/CliTools#stats-internal"><code class="highlighter-rouge">stats-internal</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent stats-internal <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent stats-internal <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-7">REST API</h4>
 
@@ -1241,10 +1224,9 @@
 
 <h4 id="java-7">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="peek-messages">Peek messages</h3>
 
@@ -1252,15 +1234,14 @@
 
 <h4 id="pulsar-admin-8">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent peek-messages <span class="se">\</span>
-  --count 10 --subscription my-subscription <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent peek-messages <span class="se">\</span>
+  <span class="nt">--count</span> 10 <span class="nt">--subscription</span> my-subscription <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
 Message ID: 315674752:0  
 Properties:  <span class="o">{</span>  <span class="s2">"X-Pulsar-publish-time"</span> : <span class="s2">"2015-07-13 17:40:28.451"</span>  <span class="o">}</span>
 msg-payload
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-8">REST API</h4>
 
@@ -1270,12 +1251,11 @@ msg-payload
 
 <h4 id="java-8">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="skip-messages">Skip messages</h3>
 
@@ -1283,11 +1263,10 @@ msg-payload
 
 <h4 id="pulsar-admin-9">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent skip <span class="se">\</span>
-  --count 10 --subscription my-subscription <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent skip <span class="se">\</span>
+  <span class="nt">--count</span> 10 <span class="nt">--subscription</span> my-subscription <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-9">REST API</h4>
 
@@ -1297,12 +1276,11 @@ msg-payload
 
 <h4 id="java-9">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="skip-all-messages">Skip all messages</h3>
 
@@ -1310,11 +1288,10 @@ msg-payload
 
 <h4 id="pulsar-admin-10">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent skip-all <span class="se">\</span>
-  --subscription my-subscription <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent skip-all <span class="se">\</span>
+  <span class="nt">--subscription</span> my-subscription <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-10">REST API</h4>
 
@@ -1324,11 +1301,10 @@ msg-payload
 
 <h4 id="java-10">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="reset-cursor">Reset cursor</h3>
 
@@ -1336,11 +1312,10 @@ msg-payload
 
 <h4 id="pulsar-admin-11">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent reset-cursor <span class="se">\</span>
-  --subscription my-subscription --time 10 <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent reset-cursor <span class="se">\</span>
+  <span class="nt">--subscription</span> my-subscription <span class="nt">--time</span> 10 <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-11">REST API</h4>
 
@@ -1350,12 +1325,11 @@ msg-payload
 
 <h4 id="java-11">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="lookup-of-topic">Lookup of topic</h3>
 
@@ -1363,12 +1337,11 @@ msg-payload
 
 <h4 id="pulsar-admin-12">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent lookup <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent lookup <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
  <span class="s2">"pulsar://broker1.org.com:4480"</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-12">REST API</h4>
 
@@ -1376,10 +1349,9 @@ msg-payload
 
 <h4 id="java-12">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-bundle">Get bundle</h3>
 
@@ -1387,12 +1359,11 @@ msg-payload
 
 <h4 id="pulsar-admin-13">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent bundle-range <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent bundle-range <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
  <span class="s2">"0x00000000_0xffffffff"</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-13">REST API</h4>
 
@@ -1400,10 +1371,9 @@ msg-payload
 
 <h4 id="java-13">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-subscriptions">Get subscriptions</h3>
 
@@ -1411,12 +1381,11 @@ msg-payload
 
 <h4 id="pulsar-admin-14">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent subscriptions <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent subscriptions <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
 
  my-subscription
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-14">REST API</h4>
 
@@ -1426,10 +1395,9 @@ msg-payload
 
 <h4 id="java-14">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="unsubscribe">Unsubscribe</h3>
 
@@ -1437,11 +1405,10 @@ msg-payload
 
 <h4 id="pulsar-admin-15">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent unsubscribe <span class="se">\</span>
-  --subscription my-subscription <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent unsubscribe <span class="se">\</span>
+  <span class="nt">--subscription</span> my-subscription <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-15">REST API</h4>
 
@@ -1451,11 +1418,10 @@ msg-payload
 
 <h4 id="java-15">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">destination</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
       </section>
     </article>
diff --git a/content/docs/latest/admin-api/properties/index.html b/content/docs/latest/admin-api/properties/index.html
index a3b2319..333d2c5 100644
--- a/content/docs/latest/admin-api/properties/index.html
+++ b/content/docs/latest/admin-api/properties/index.html
@@ -779,16 +779,14 @@
 
 <p>You can list all of the properties associated with an <span class="popover-term" tabindex="0" title="What is a Pulsar instance?" data-placement="top" data-content="A group of Pulsar clusters that act together as a single unit." data-toggle="popover" data-trigger="focus">instance</span> using the <a href="../../reference/CliTools#pulsar-admin-properties-list"><code class="highlighter-rouge">list</code></a> subcommand:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin properties list
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin properties list
+</code></pre></div></div>
 
 <p>That will return a simple list, like this:</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>my-property-1
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>my-property-1
 my-property-2
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="create">Create</h3>
 
@@ -796,19 +794,17 @@ my-property-2
 
 <p>You can create a new property using the <a href="../../reference/CliTools#pulsar-admin-properties-create"><code class="highlighter-rouge">create</code></a> subcommand:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin properties create my-property
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin properties create my-property
+</code></pre></div></div>
 
 <p>When creating a property, you can assign admin roles using the <code class="highlighter-rouge">-r</code>/<code class="highlighter-rouge">--admin-roles</code> flag. You can specify multiple roles as a comma-separated list. Here are some examples:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin properties create my-property <span class="se">\</span>
-  --admin-roles role1,role2,role3
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin properties create my-property <span class="se">\</span>
+  <span class="nt">--admin-roles</span> role1,role2,role3
 
-<span class="gp">$ </span>pulsar-admin properties create my-property <span class="se">\</span>
-  -r role1
-</code></pre>
-</div>
+<span class="nv">$ </span>pulsar-admin properties create my-property <span class="se">\</span>
+  <span class="nt">-r</span> role1
+</code></pre></div></div>
 
 <h3 id="get-configuration">Get configuration</h3>
 
@@ -816,7 +812,7 @@ my-property-2
 
 <p>You can see a property’s configuration as a JSON object using the <a href="../../reference/CliTools#pulsar-admin-properties-get"><code class="highlighter-rouge">get</code></a> subcommand and specifying the name of the property:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin properties get my-property
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin properties get my-property
 <span class="o">{</span>
   <span class="s2">"adminRoles"</span>: <span class="o">[</span>
     <span class="s2">"admin1"</span>,
@@ -827,8 +823,7 @@ my-property-2
     <span class="s2">"cl2"</span>
   <span class="o">]</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="delete">Delete</h3>
 
@@ -836,9 +831,8 @@ my-property-2
 
 <p>You can delete a property using the <a href="../../reference/CliTools#pulsar-admin-properties-delete"><code class="highlighter-rouge">delete</code></a> subcommand and specifying the property name:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin properties delete my-property
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin properties delete my-property
+</code></pre></div></div>
 
 <h3 id="updating">Updating</h3>
 
diff --git a/content/docs/latest/admin/Authz/index.html b/content/docs/latest/admin/Authz/index.html
index d461b5e..58769ad 100644
--- a/content/docs/latest/admin/Authz/index.html
+++ b/content/docs/latest/admin/Authz/index.html
@@ -771,6 +771,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -887,8 +889,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/deployment/aws-cluster/">Deploying a Pulsar cluster on AWS using Terraform and Ansible</a></li>
           
           
@@ -977,9 +977,9 @@
           
           
           
-          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
+          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
           
@@ -1169,9 +1169,9 @@
           
           
           
-          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
+          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
           
@@ -1361,9 +1361,9 @@
           
           
           
-          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
+          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
           
@@ -1553,9 +1553,9 @@
           
           
           
-          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
+          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
           
@@ -1745,6 +1745,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1885,8 +1887,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/admin-api/overview/">The Pulsar admin interface</a></li>
           
           
@@ -1945,9 +1945,9 @@
           
           
           
-          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
+          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
           
@@ -1977,9 +1977,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>
           
           
           
@@ -2163,15 +2163,13 @@
 
 <h6 id="linux">Linux</h6>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>CA.pl -newca
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>CA.pl <span class="nt">-newca</span>
+</code></pre></div></div>
 
 <h6 id="macos">MacOS</h6>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>$ /System/Library/OpenSSL/misc/CA.pl -newca
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ /System/Library/OpenSSL/misc/CA.pl -newca
+</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>
 
@@ -2186,34 +2184,31 @@
 
 <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"><pre class="highlight"><code><span class="gp">$ </span>openssl req <span class="se">\</span>
-  -newkey rsa:2048 <span class="se">\</span>
-  -sha256 <span class="se">\</span>
-  -nodes <span class="se">\</span>
-  -out broker-cert.csr <span class="se">\</span>
-  -outform PEM
-</code></pre>
-</div>
+<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>
 
 <p>Convert the key to <a href="https://en.wikipedia.org/wiki/PKCS_8">PKCS 8</a> format:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>openssl pkcs8 <span class="se">\</span>
-  -topk8 <span class="se">\</span>
-  -inform PEM <span class="se">\</span>
-  -outform PEM <span class="se">\</span>
-  -in privkey.pem <span class="se">\</span>
-  -out broker-key.pem <span class="se">\</span>
-  -nocrypt
-</code></pre>
-</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>
+</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>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>openssl ca <span class="se">\</span>
-  -out broker-cert.pem <span class="se">\</span>
-  -infiles broker-cert.csr
-</code></pre>
-</div>
+<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
+</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>
 
@@ -2229,7 +2224,7 @@
 
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="c"># Enable TLS and point the broker to the right certs
+<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>
@@ -2239,8 +2234,7 @@
 </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>
+</code></pre></div></div>
 
 <!--
 
@@ -2275,11 +2269,10 @@
 
 <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-properties highlighter-rouge"><pre class="highlight"><code><span class="py">tlsEnabled</span><span class="p">=</span><span class="s">true</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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="configure-clients">Configure clients</h4>
 
@@ -2296,14 +2289,13 @@
 
 <p>You’ll need to add the following authentication parameters to that file to use TLS with Pulsar’s CLI tools:</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="py">serviceUrl</span><span class="p">=</span><span class="s">https://broker.example.com:8443/</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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="athenz">Athenz</h3>
 
@@ -2377,7 +2369,7 @@
 
 <p>In the <code class="highlighter-rouge">conf/broker.conf</code> configuration file in your Pulsar installation, you need to provide the class name of the Athenz authentication provider as well as a comma-separated list of provider domain names.</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="c"># Add the Athenz auth provider
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Add the Athenz 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.AuthenticationProviderAthenz</span>
@@ -2387,8 +2379,7 @@
 </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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <!--
 
@@ -2433,7 +2424,7 @@
 
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="c"># URL for the broker
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># URL for the broker
 </span><span class="py">serviceUrl</span><span class="p">=</span><span class="s">https://broker.example.com:8443/</span>
 
 <span class="c"># Set Athenz auth plugin and its parameters
@@ -2444,8 +2435,7 @@
 </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>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="authorization">Authorization</h2>
 
@@ -2488,11 +2478,10 @@
 
 <p>Properties are managed using the <a href="../../reference/CliTools#pulsar-admin"><code class="highlighter-rouge">pulsar-admin</code></a> tool. Here’s an example property creation command:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin properties create my-property <span class="se">\</span>
-  --admin-roles my-admin-role <span class="se">\</span>
-  --allowed-clusters us-west,us-east
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin properties create my-property <span class="se">\</span>
+  <span class="nt">--admin-roles</span> my-admin-role <span class="se">\</span>
+  <span class="nt">--allowed-clusters</span> us-west,us-east
+</code></pre></div></div>
 
 <p>This command will create a new property <code class="highlighter-rouge">my-property</code> that will be allowed to use the clusters <code class="highlighter-rouge">us-west</code> and <code class="highlighter-rouge">us-east</code>.</p>
 
@@ -2557,39 +2546,35 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-grant-permission"><code class="highlighter-rouge">grant-permission</code></a> subcommand and specify a namespace, actions using the <code class="highlighter-rouge">--actions</code> flag, and a role using the <code class="highlighter-rouge">--role</code> flag:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-  --actions produce,consume <span class="se">\</span>
-  --role admin10
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+  <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+  <span class="nt">--role</span> admin10
+</code></pre></div></div>
 
 <p>Wildcard authorization can be performed when <code class="highlighter-rouge">authorizationAllowWildcardsMatching</code> is set to <code class="highlighter-rouge">true</code> in <code class="highlighter-rouge">broker.conf</code>.</p>
 
 <p>e.g.</p>
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-                        --actions produce,consume <span class="se">\</span>
-                        --role <span class="s1">'my.role.*'</span>
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+                        <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+                        <span class="nt">--role</span> <span class="s1">'my.role.*'</span>
+</code></pre></div></div>
 
 <p>Then, roles <code class="highlighter-rouge">my.role.1</code>, <code class="highlighter-rouge">my.role.2</code>, <code class="highlighter-rouge">my.role.foo</code>, <code class="highlighter-rouge">my.role.bar</code>, etc. can produce and consume.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-                        --actions produce,consume <span class="se">\</span>
-                        --role <span class="s1">'*.role.my'</span>
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+                        <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+                        <span class="nt">--role</span> <span class="s1">'*.role.my'</span>
+</code></pre></div></div>
 
 <p>Then, roles <code class="highlighter-rouge">1.role.my</code>, <code class="highlighter-rouge">2.role.my</code>, <code class="highlighter-rouge">foo.role.my</code>, <code class="highlighter-rouge">bar.role.my</code>, etc. can produce and consume.</p>
 
 <p><strong>Note</strong>: A wildcard matching works at <strong>the beginning or end of the role name only</strong>.</p>
 
 <p>e.g.</p>
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces grant-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-                        --actions produce,consume <span class="se">\</span>
-                        --role <span class="s1">'my.*.role'</span>
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces grant-permission test-property/cl1/ns1 <span class="se">\</span>
+                        <span class="nt">--actions</span> produce,consume <span class="se">\</span>
+                        <span class="nt">--role</span> <span class="s1">'my.*.role'</span>
+</code></pre></div></div>
 
 <p>In this case, only the role <code class="highlighter-rouge">my.*.role</code> has permissions.<br />
 Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter-rouge">my.2.role</code>, <code class="highlighter-rouge">my.foo.role</code>, <code class="highlighter-rouge">my.bar.role</code>, etc. <strong>cannot</strong> produce and consume.</p>
@@ -2602,9 +2587,8 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">grantPermissionOnNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">role</span><span class="o">,</span> <span class="n">getAuthActions</span><span class="o">(</span><span class="n">actions</span><span class="o">));</span>
-</code></pre>
-</div>
+<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">grantPermissionOnNamespace</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">role</span><span class="o">,</span> <span class="n">getAuthActions</span><span class="o">(</span><span class="n">actions</span><span cla [...]
+</code></pre></div></div>
 
 <h3 id="get-permission">Get permission</h3>
 
@@ -2614,15 +2598,14 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-permissions"><code class="highlighter-rouge">permissions</code></a> subcommand and specify a namespace:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces permissions <span class="nb">test</span>-property/cl1/ns1
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces permissions test-property/cl1/ns1
 <span class="o">{</span>
   <span class="s2">"admin10"</span>: <span class="o">[</span>
     <span class="s2">"produce"</span>,
     <span class="s2">"consume"</span>
   <span class="o">]</span>
 <span class="o">}</span>   
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -2632,9 +2615,8 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">getPermissions</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">getPermissions</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="revoke-permissions">Revoke permissions</h3>
 
@@ -2644,10 +2626,9 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-revoke-permission"><code class="highlighter-rouge">revoke-permission</code></a> subcommand and specify a namespace and a role using the <code class="highlighter-rouge">--role</code> flag:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces revoke-permission <span class="nb">test</span>-property/cl1/ns1 <span class="se">\</span>
-  --role admin10
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces revoke-permission test-property/cl1/ns1 <span class="se">\</span>
+  <span class="nt">--role</span> admin10
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -2657,9 +2638,8 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><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 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>
 
@@ -2667,9 +2647,8 @@ Roles <code class="highlighter-rouge">my.1.role</code>, <code class="highlighter
 
 <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>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><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 class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><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>
 
 <!--
 
@@ -2705,7 +2684,7 @@ needs to be able to publish to other clusters’ topics.</p>
 
 <h2 id="pulsar-admin-authentication">Pulsar admin authentication</h2>
 
-<div class="language-java highlighter-rouge"><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>
+<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>
 <span class="kt">boolean</span> <span class="n">useTls</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
 <span class="kt">boolean</span> <span class="n">tlsAllowInsecureConnection</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
@@ -2718,12 +2697,11 @@ needs to be able to publish to other clusters’ topics.</p>
 <span class="n">config</span><span class="o">.</span><span class="na">setTlsTrustCertsFilePath</span><span class="o">(</span><span class="n">tlsTrustCertsFilePath</span><span class="o">);</span>
 
 <span class="n">PulsarAdmin</span> <span class="n">admin</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PulsarAdmin</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">config</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>To use TLS:</p>
 
-<div class="language-java highlighter-rouge"><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>
+<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>
 <span class="kt">boolean</span> <span class="n">useTls</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
 <span class="kt">boolean</span> <span class="n">tlsAllowInsecureConnection</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
@@ -2736,8 +2714,7 @@ needs to be able to publish to other clusters’ topics.</p>
 <span class="n">config</span><span class="o">.</span><span class="na">setTlsTrustCertsFilePath</span><span class="o">(</span><span class="n">tlsTrustCertsFilePath</span><span class="o">);</span>
 
 <span class="n">PulsarAdmin</span> <span class="n">admin</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PulsarAdmin</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">config</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
       </section>
     </article>
diff --git a/content/docs/latest/admin/Dashboard/index.html b/content/docs/latest/admin/Dashboard/index.html
index b981078..6647043 100644
--- a/content/docs/latest/admin/Dashboard/index.html
+++ b/content/docs/latest/admin/Dashboard/index.html
@@ -776,18 +776,16 @@
 
 <p>To generate the Docker image:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>docker build -t pulsar-dashboard dashboard
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>docker build <span class="nt">-t</span> pulsar-dashboard dashboard
+</code></pre></div></div>
 
 <p>To run the dashboard:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span><span class="nv">SERVICE_URL</span><span class="o">=</span>http://broker.example.com:8080/
-<span class="gp">$ </span>docker run -p 80:80 <span class="se">\</span>
-  -e <span class="nv">SERVICE_URL</span><span class="o">=</span><span class="nv">$SERVICE_URL</span> <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ SERVICE_URL</span><span class="o">=</span>http://broker.example.com:8080/
+<span class="nv">$ </span>docker run <span class="nt">-p</span> 80:80 <span class="se">\</span>
+  <span class="nt">-e</span> <span class="nv">SERVICE_URL</span><span class="o">=</span><span class="nv">$SERVICE_URL</span> <span class="se">\</span>
   apachepulsar/pulsar-dashboard
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>You need to specify only one service URL for a Pulsar cluster. Internally, the collector will figure out all the existing clusters and the brokers from where it needs to pull the metrics. If you’re connecting the dashboard to Pulsar running in <span class="popover-term" tabindex="0" title="What is a standalone Pulsar broker?" data-placement="top" data-content="A lightweight Pulsar broker in which all components run in a single Java Virtual Machine (JVM) process. Standalone clusters ca [...]
 
diff --git a/content/docs/latest/admin/GeoReplication/index.html b/content/docs/latest/admin/GeoReplication/index.html
index 19b1157..2bc5120 100644
--- a/content/docs/latest/admin/GeoReplication/index.html
+++ b/content/docs/latest/admin/GeoReplication/index.html
@@ -841,11 +841,10 @@
 
 <p>At creation time, specify all the intended clusters:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin properties create my-property <span class="se">\</span>
-  --admin-roles my-admin-role <span class="se">\</span>
-  --allowed-clusters us-west,us-east,us-cent
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin properties create my-property <span class="se">\</span>
+  <span class="nt">--admin-roles</span> my-admin-role <span class="se">\</span>
+  <span class="nt">--allowed-clusters</span> us-west,us-east,us-cent
+</code></pre></div></div>
 
 <p>To update permissions of an existing property, use <code class="highlighter-rouge">update</code> instead of <code class="highlighter-rouge">create</code>.</p>
 
@@ -855,16 +854,14 @@
 
 <p>Global namespaces need to be created in the <code class="highlighter-rouge">global</code> virtual cluster. For example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin namespaces create my-property/global/my-namespace
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin namespaces create my-property/global/my-namespace
+</code></pre></div></div>
 
 <p>Initially, the namespace is not assigned to any cluster. You can assign the namespace to clusters using the <code class="highlighter-rouge">set-clusters</code> subcommand:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin namespaces <span class="nb">set</span>-clusters my-property/global/my-namespace <span class="se">\</span>
-  --clusters us-west,us-east,us-cent
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin namespaces set-clusters my-property/global/my-namespace <span class="se">\</span>
+  <span class="nt">--clusters</span> us-west,us-east,us-cent
+</code></pre></div></div>
 
 <p>The replication clusters for a namespace can be changed at any time, with no disruption to ongoing traffic. Replication channels will be immediately set up or stopped in all the clusters as soon as the configuration changes.</p>
 
@@ -878,7 +875,7 @@
 
 <p>Below is an example for the <a href="../../clients/Java">Java API</a>. Note the use of the <code class="highlighter-rouge">setReplicationClusters</code> method when constructing the <a target="_blank" href="/api/client/org/apache/pulsar/client/api/Message.html"><code class="highlighter-rouge">Message</code></a> object:</p>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">restrictReplicationTo</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;&gt;;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">restrictReplicationTo</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;&gt;;</span>
 <span class="n">restrictReplicationTo</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="s">"us-west"</span><span class="o">);</span>
 <span class="n">restrictReplicationTo</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="s">"us-east"</span><span class="o">);</span>
 
@@ -888,16 +885,14 @@
         <span class="o">.</span><span class="na">build</span><span class="o">();</span>
 
 <span class="n">producer</span><span class="o">.</span><span class="na">send</span><span class="o">(</span><span class="n">message</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="topic-stats">Topic stats</h4>
 
 <p>Topic-specific statistics for global topics are available via the <a href="../../reference/CliTools#pulsar-admin"><code class="highlighter-rouge">pulsar-admin</code></a> tool and <a href="../../reference/RestApi">REST API</a>:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin persistent stats persistent://my-property/global/my-namespace/my-topic
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin persistent stats persistent://my-property/global/my-namespace/my-topic
+</code></pre></div></div>
 
 <p>Each cluster reports its own local stats, including incoming and outgoing replication rates and backlogs.</p>
 
diff --git a/content/docs/latest/admin/ModularLoadManager/index.html b/content/docs/latest/admin/ModularLoadManager/index.html
index 30dd4dd..9a91e99 100644
--- a/content/docs/latest/admin/ModularLoadManager/index.html
+++ b/content/docs/latest/admin/ModularLoadManager/index.html
@@ -775,11 +775,10 @@
   <li>
     <p>Using the <code class="highlighter-rouge">pulsar-admin</code> tool. Here’s an example:</p>
 
-    <div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin update-dynamic-config <span class="se">\</span>
-  --config loadManagerClassName <span class="se">\</span>
-  --value org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl
-</code></pre>
-    </div>
+    <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin update-dynamic-config <span class="se">\</span>
+  <span class="nt">--config</span> loadManagerClassName <span class="se">\</span>
+  <span class="nt">--value</span> org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl
+</code></pre></div>    </div>
 
     <p>You can use the same method to change back to the original value. In either case, any mistake in specifying the load manager will cause Pulsar to default to <code class="highlighter-rouge">SimpleLoadManagerImpl</code>.</p>
   </li>
@@ -793,75 +792,72 @@
   <li>
     <p>Use <code class="highlighter-rouge">pulsar-admin</code> to examine the <code class="highlighter-rouge">loadManagerClassName</code> element:</p>
 
-    <div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin brokers get-all-dynamic-config
+    <div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin brokers get-all-dynamic-config
 <span class="o">{</span>
   <span class="s2">"loadManagerClassName"</span> : <span class="s2">"org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl"</span>
 <span class="o">}</span>
-</code></pre>
-    </div>
+</code></pre></div>    </div>
 
     <p>If there is no <code class="highlighter-rouge">loadManagerClassName</code> element, then the default load manager is used.</p>
   </li>
   <li>
     <p>Consult a ZooKeeper load report. With the module load manager, the load report in <code class="highlighter-rouge">/loadbalance/brokers/...</code> will have many differences. for example the <code class="highlighter-rouge">systemResourceUsage</code> sub-elements (<code class="highlighter-rouge">bandwidthIn</code>, <code class="highlighter-rouge">bandwidthOut</code>, etc.) are now all at the top level. Here is an example load report from the module load manager:</p>
 
-    <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="w"> </span><span class="p">{</span><span class="w">
-   </span><span class="nt">"bandwidthIn"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-     </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
-     </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">4.256510416666667</span><span class="w">
+    <div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="w"> </span><span class="p">{</span><span class="w">
+   </span><span class="s2">"bandwidthIn"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+     </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
+     </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">4.256510416666667</span><span class="w">
    </span><span class="p">},</span><span class="w">
-   </span><span class="nt">"bandwidthOut"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-     </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
-     </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">5.287239583333333</span><span class="w">
+   </span><span class="s2">"bandwidthOut"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+     </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
+     </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">5.287239583333333</span><span class="w">
    </span><span class="p">},</span><span class="w">
-   </span><span class="nt">"bundles"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
-   </span><span class="nt">"cpu"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-     </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">2400.0</span><span class="p">,</span><span class="w">
-     </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">5.7353247655435915</span><span class="w">
+   </span><span class="s2">"bundles"</span><span class="p">:</span><span class="w"> </span><span class="p">[],</span><span class="w">
+   </span><span class="s2">"cpu"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+     </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">2400.0</span><span class="p">,</span><span class="w">
+     </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">5.7353247655435915</span><span class="w">
    </span><span class="p">},</span><span class="w">
-   </span><span class="nt">"directMemory"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-     </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">16384.0</span><span class="p">,</span><span class="w">
-     </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">1.0</span><span class="w">
+   </span><span class="s2">"directMemory"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+     </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">16384.0</span><span class="p">,</span><span class="w">
+     </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">1.0</span><span class="w">
    </span><span class="p">}</span><span class="w">
  </span><span class="p">}</span><span class="w">
-</span></code></pre>
-    </div>
+</span></code></pre></div>    </div>
 
     <p>With the simple load manager, the load report in <code class="highlighter-rouge">/loadbalance/brokers/...</code> will look like this:</p>
 
-    <div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="w"> </span><span class="p">{</span><span class="w">
-   </span><span class="nt">"systemResourceUsage"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-     </span><span class="nt">"bandwidthIn"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-       </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
-       </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
+    <div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="w"> </span><span class="p">{</span><span class="w">
+   </span><span class="s2">"systemResourceUsage"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+     </span><span class="s2">"bandwidthIn"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+       </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
+       </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
      </span><span class="p">},</span><span class="w">
-     </span><span class="nt">"bandwidthOut"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-       </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
-       </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
+     </span><span class="s2">"bandwidthOut"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+       </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">10240000.0</span><span class="p">,</span><span class="w">
+       </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
      </span><span class="p">},</span><span class="w">
-     </span><span class="nt">"cpu"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-       </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">2400.0</span><span class="p">,</span><span class="w">
-       </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
+     </span><span class="s2">"cpu"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+       </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">2400.0</span><span class="p">,</span><span class="w">
+       </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">0.0</span><span class="w">
      </span><span class="p">},</span><span class="w">
-     </span><span class="nt">"directMemory"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-       </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">16384.0</span><span class="p">,</span><span class="w">
-       </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">1.0</span><span class="w">
+     </span><span class="s2">"directMemory"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+       </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">16384.0</span><span class="p">,</span><span class="w">
+       </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">1.0</span><span class="w">
      </span><span class="p">},</span><span class="w">
-     </span><span class="nt">"memory"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-       </span><span class="nt">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">8192.0</span><span class="p">,</span><span class="w">
-       </span><span class="nt">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">3903.0</span><span class="w">
+     </span><span class="s2">"memory"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+       </span><span class="s2">"limit"</span><span class="p">:</span><span class="w"> </span><span class="mf">8192.0</span><span class="p">,</span><span class="w">
+       </span><span class="s2">"usage"</span><span class="p">:</span><span class="w"> </span><span class="mf">3903.0</span><span class="w">
      </span><span class="p">}</span><span class="w">
    </span><span class="p">}</span><span class="w">
  </span><span class="p">}</span><span class="w">
-</span></code></pre>
-    </div>
+</span></code></pre></div>    </div>
   </li>
   <li>
     <p>The command-line <a href="../../reference/CliTools/#pulsar-perf-monitor-brokers">broker monitor</a> will have a different output format depending on which load manager implementation is being used.</p>
 
     <p>Here is an example from the modular load manager:</p>
 
-    <div class="highlighter-rouge"><pre class="highlight"><code> ===================================================================================================================
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> ===================================================================================================================
  ||SYSTEM         |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
  ||               |0.00           |48.33          |0.01           |0.00           |0.00           |48.33          ||
  ||COUNT          |TOPIC          |BUNDLE         |PRODUCER       |CONSUMER       |BUNDLE +       |BUNDLE -       ||
@@ -873,12 +869,11 @@
  ||LONG           |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
  ||               |0.00           |0.00           |0.00           |0.00           |0.00           |0.00           ||
  ===================================================================================================================
-</code></pre>
-    </div>
+</code></pre></div>    </div>
 
     <p>Here is an example from the simple load manager:</p>
 
-    <div class="highlighter-rouge"><pre class="highlight"><code> ===================================================================================================================
+    <div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> ===================================================================================================================
  ||COUNT          |TOPIC          |BUNDLE         |PRODUCER       |CONSUMER       |BUNDLE +       |BUNDLE -       ||
  ||               |4              |4              |0              |2              |0              |0              ||
  ||RAW SYSTEM     |CPU %          |MEMORY %       |DIRECT %       |BW IN %        |BW OUT %       |MAX %          ||
@@ -890,8 +885,7 @@
  ||ALLOC MSG      |MSG/S IN       |MSG/S OUT      |TOTAL          |KB/S IN        |KB/S OUT       |TOTAL          ||
  ||               |54.84          |134.48         |189.31         |126.54         |320.96         |447.50         ||
  ===================================================================================================================
-</code></pre>
-    </div>
+</code></pre></div>    </div>
   </li>
 </ol>
 
diff --git a/content/docs/latest/admin/ZooKeeperBookKeeper/index.html b/content/docs/latest/admin/ZooKeeperBookKeeper/index.html
index 9d693ef..cbeb94e 100644
--- a/content/docs/latest/admin/ZooKeeperBookKeeper/index.html
+++ b/content/docs/latest/admin/ZooKeeperBookKeeper/index.html
@@ -840,11 +840,10 @@
 
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="../../reference/Configuration#zookeeper"><code class="highlighter-rouge">conf/zookeeper.conf</code></a> file. Add a <code class="highlighter-rouge">server.N</code> line for each node in the cluster to the configuration, where <code class="highlighter-rouge">N</code> is the number of the ZooKeeper node. Here’s an example for a three-node cluster:</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="py">server.1</span><span class="p">=</span><span class="s">zk1.us-west.example.com:2888:3888</span>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">server.1</span><span class="p">=</span><span class="s">zk1.us-west.example.com:2888:3888</span>
 <span class="py">server.2</span><span class="p">=</span><span class="s">zk2.us-west.example.com:2888:3888</span>
 <span class="py">server.3</span><span class="p">=</span><span class="s">zk3.us-west.example.com:2888:3888</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>On each host, you need to specify the ID of the node in each node’s <code class="highlighter-rouge">myid</code> file, which is in each server’s <code class="highlighter-rouge">data/zookeeper</code> folder by default (this can be changed via the <a href="../../reference/Configuration#zookeeper-dataDir"><code class="highlighter-rouge">dataDir</code></a> parameter).</p>
 
@@ -879,18 +878,16 @@
 
 <p>On a ZooKeeper server at <code class="highlighter-rouge">zk1.us-west.example.com</code>, for example, you could set the <code class="highlighter-rouge">myid</code> value like this:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>mkdir -p data/zookeeper
-<span class="gp">$ </span><span class="nb">echo </span>1 &gt; data/zookeeper/myid
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span><span class="nb">mkdir</span> <span class="nt">-p</span> data/zookeeper
+<span class="nv">$ </span><span class="nb">echo </span>1 <span class="o">&gt;</span> data/zookeeper/myid
+</code></pre></div></div>
 
 <p>On <code class="highlighter-rouge">zk2.us-west.example.com</code> the command would be <code class="highlighter-rouge">echo 2 &gt; data/zookeeper/myid</code> and so on.</p>
 
 <p>Once each server has been added to the <code class="highlighter-rouge">zookeeper.conf</code> configuration and has the appropriate <code class="highlighter-rouge">myid</code> entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the <a href="../../reference/CliTools#pulsar-daemon"><code class="highlighter-rouge">pulsar-daemon</code></a> CLI tool:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-daemon start zookeeper
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-daemon start zookeeper
+</code></pre></div></div>
 
 <h3 id="deploying-global-zookeeper">Deploying global ZooKeeper</h3>
 
@@ -932,12 +929,11 @@
 
 <p>To deploy global ZooKeeper in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="../../reference/Configuration#global-zookeeper"><code class="highlighter-rouge">conf/global_zookeeper.conf</code></a> using the same method for <a href="#local-zookeeper">local ZooKeeper</a>, but make sure to use a different port (2181 is the default for ZooKeeper). Here’s an example that uses port 2184 for a three-node ZooKeeper cluster:</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="py">clientPort</span><span class="p">=</span><span class="s">2184</span>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">clientPort</span><span class="p">=</span><span class="s">2184</span>
 <span class="py">server.1</span><span class="p">=</span><span class="s">zk1.us-west.example.com:2185:2186</span>
 <span class="py">server.2</span><span class="p">=</span><span class="s">zk2.us-west.example.com:2185:2186</span>
 <span class="py">server.3</span><span class="p">=</span><span class="s">zk3.us-west.example.com:2185:2186</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>As before, create the <code class="highlighter-rouge">myid</code> files for each server on <code class="highlighter-rouge">data/global-zookeeper/myid</code>.</p>
 
@@ -955,9 +951,8 @@ share the same hosts used for the local ZooKeeper quorum.</p>
 <code class="highlighter-rouge">us-east</code>, <code class="highlighter-rouge">us-central</code>, <code class="highlighter-rouge">eu-central</code>, <code class="highlighter-rouge">ap-south</code>. Also let’s assume, each cluster
 will have its own local ZK servers named such as</p>
 
-<div class="highlighter-rouge"><pre class="highlight"><code>zk[1-3].${CLUSTER}.example.com
-</code></pre>
-</div>
+<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>zk[1-3].${CLUSTER}.example.com
+</code></pre></div></div>
 
 <p>In this scenario we want to pick the quorum participants from few clusters and
 let all the others be ZK observers. For example, to form a 7 servers quorum, we
@@ -968,7 +963,7 @@ of these regions is unreachable.</p>
 
 <p>The ZK configuration in all the servers will look like:</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="py">clientPort</span><span class="p">=</span><span class="s">2184</span>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">clientPort</span><span class="p">=</span><span class="s">2184</span>
 <span class="py">server.1</span><span class="p">=</span><span class="s">zk1.us-west.example.com:2185:2186</span>
 <span class="py">server.2</span><span class="p">=</span><span class="s">zk2.us-west.example.com:2185:2186</span>
 <span class="py">server.3</span><span class="p">=</span><span class="s">zk3.us-west.example.com:2185:2186</span>
@@ -984,22 +979,19 @@ of these regions is unreachable.</p>
 <span class="py">server.13</span><span class="p">=</span><span class="s">zk1.ap-south.example.com:2185:2186:observer</span>
 <span class="py">server.14</span><span class="p">=</span><span class="s">zk2.ap-south.example.com:2185:2186:observer</span>
 <span class="py">server.15</span><span class="p">=</span><span class="s">zk3.ap-south.example.com:2185:2186:observer</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Additionally, ZK observers will need to have:</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="py">peerType</span><span class="p">=</span><span class="s">observer</span>
-</code></pre>
-</div>
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="py">peerType</span><span class="p">=</span><span class="s">observer</span>
+</code></pre></div></div>
 
 <h5 id="starting-the-service">Starting the service</h5>
 
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="../../reference/CliTools#pulsar-daemon"><code class="highlighter-rouge">pulsar-daemon</code></a></p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-daemon start global-zookeeper
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-daemon start global-zookeeper
+</code></pre></div></div>
 
 <h3 id="zookeeper-configuration">ZooKeeper configuration</h3>
 
@@ -1263,15 +1255,13 @@ of these regions is unreachable.</p>
 
 <p>To start up a bookie in the foreground, use the <a href="../../reference/CliTools#bookkeeper"><code class="highlighter-rouge">bookeeper</code></a></p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-daemon start bookie
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-daemon start bookie
+</code></pre></div></div>
 
 <p>You can verify that the bookie is working properly using the <code class="highlighter-rouge">bookiesanity</code> command for the <a href="../../reference/CliTools#bookkeeper-shell">BookKeeper shell</a>:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/bookkeeper shell bookiesanity
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/bookkeeper shell bookiesanity
+</code></pre></div></div>
 
 <p>This will create a new ledger on the local bookie, write a few entries, read them back and finally delete the ledger.</p>
 
@@ -1298,7 +1288,7 @@ designed to use multiple devices:</p>
 
 <p>Minimum configuration changes required  in <code class="highlighter-rouge">conf/bookkeeper.conf</code> are:</p>
 
-<div class="language-properties highlighter-rouge"><pre class="highlight"><code><span class="c"># Change to point to journal disk mount point
+<div class="language-properties highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c"># Change to point to journal disk mount point
 </span><span class="py">journalDirectory</span><span class="p">=</span><span class="s">data/bookkeeper/journal</span>
 
 <span class="c"># Point to ledger storage disk mount point
@@ -1309,8 +1299,7 @@ designed to use multiple devices:</p>
 
 <span class="c"># Change the ledger manager type
 </span><span class="py">ledgerManagerType</span><span class="p">=</span><span class="s">hierarchical</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <!--
 
@@ -1393,11 +1382,10 @@ designed to use multiple devices:</p>
 
 <h5 id="example">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces <span class="nb">set</span>-persistence my-prop/my-cluster/my-ns <span class="se">\</span>
-  --bookkeeper-ack-quorom 3 <span class="se">\</span>
-  --bookeeper-ensemble 2
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces set-persistence my-prop/my-cluster/my-ns <span class="se">\</span>
+  <span class="nt">--bookkeeper-ack-quorom</span> 3 <span class="se">\</span>
+  <span class="nt">--bookeeper-ensemble</span> 2
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -1407,15 +1395,14 @@ designed to use multiple devices:</p>
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kt">int</span> <span class="n">bkEnsemble</span> <span class="o">=</span> <span class="mi">2</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">int</span> <span class="n">bkEnsemble</span> <span class="o">=</span> <span class="mi">2</span><span class="o">;</span>
 <span class="kt">int</span> <span class="n">bkQuorum</span> <span class="o">=</span> <span class="mi">3</span><span class="o">;</span>
 <span class="kt">int</span> <span class="n">bkAckQuorum</span> <span class="o">=</span> <span class="mi">2</span><span class="o">;</span>
 <span class="kt">double</span> <span class="n">markDeleteRate</span> <span class="o">=</span> <span class="mf">0.7</span><span class="o">;</span>
 <span class="n">PersistencePolicies</span> <span class="n">policies</span> <span class="o">=</span>
   <span class="k">new</span> <span class="nf">PersistencePolicies</span><span class="o">(</span><span class="n">ensemble</span><span class="o">,</span> <span class="n">quorum</span><span class="o">,</span> <span class="n">ackQuorum</span><span class="o">,</span> <span class="n">markDeleteRate</span><span class="o">);</span>
 <span class="n">admin</span><span class="o">.</span><span class="na">namespaces</span><span class="o">().</span><span class="na">setPersistence</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">policies</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="list-persistence-policies">List persistence policies</h3>
 
@@ -1427,15 +1414,14 @@ designed to use multiple devices:</p>
 
 <h5 id="example-1">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces get-persistence my-prop/my-cluster/my-ns
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces get-persistence my-prop/my-cluster/my-ns
 <span class="o">{</span>
   <span class="s2">"bookkeeperEnsemble"</span>: 1,
   <span class="s2">"bookkeeperWriteQuorum"</span>: 1,
   <span class="s2">"bookkeeperAckQuorum"</span>, 1,
   <span class="s2">"managedLedgerMaxMarkDeleteRate"</span>: 0
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -1445,9 +1431,8 @@ designed to use multiple devices:</p>
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">PersistencePolicies</span> <span class="n">policies</span> <span class="o">=</span> <span class="n">admin</span><span class="o">.</span><span class="na">namespaces</span><span class="o">().</span><span class="na">getPersistence</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">PersistencePolicies</span> <span class="n">policies</span> <span class="o">=</span> <span class="n">admin</span><span class="o">.</span><span class="na">namespaces</span><span class="o">().</span><span class="na">getPersistence</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h2 id="how-pulsar-uses-zookeeper-and-bookkeeper">How Pulsar uses ZooKeeper and BookKeeper</h2>
 
diff --git a/content/docs/latest/advanced/Encryption/index.html b/content/docs/latest/advanced/Encryption/index.html
index 02a65df..910568f 100644
--- a/content/docs/latest/advanced/Encryption/index.html
+++ b/content/docs/latest/advanced/Encryption/index.html
@@ -1225,9 +1225,9 @@
           
           
           
-          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1368,17 +1368,16 @@
   <li>Create your ECDSA or RSA public/private key pair.</li>
 </ol>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code>    openssl ecparam -name secp521r1 -genkey -param_enc explicit -out test_ecdsa_privkey.pem
-    openssl ec -in test_ecdsa_privkey.pem -pubout -outform pkcs8 -out test_ecdsa_pubkey.pem
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code>    openssl ecparam <span class="nt">-name</span> secp521r1 <span class="nt">-genkey</span> <span class="nt">-param_enc</span> explicit <span class="nt">-out</span> test_ecdsa_privkey.pem
+    openssl ec <span class="nt">-in</span> test_ecdsa_privkey.pem <span class="nt">-pubout</span> <span class="nt">-outform</span> pkcs8 <span class="nt">-out</span> test_ecdsa_pubkey.pem
+</code></pre></div></div>
 <ol>
   <li>Add the public and private key to the key management and configure your producers to retrieve public keys and consumers clients to retrieve private keys.</li>
   <li>Implement CryptoKeyReader::getPublicKey() interface from producer and CryptoKeyReader::getPrivateKey() interface from consumer, which will be invoked by Pulsar client to load the key.</li>
   <li>Add encryption key to producer configuration: conf.addEncryptionKey(“myapp.key”)</li>
   <li>Add CryptoKeyReader implementation to producer/consumer config: conf.setCryptoKeyReader(keyReader)</li>
   <li>Sample producer application:
-    <div class="language-java highlighter-rouge"><pre class="highlight"><code>     <span class="kd">class</span> <span class="nc">RawFileKeyReader</span> <span class="kd">implements</span> <span class="n">CryptoKeyReader</span> <span class="o">{</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>     <span class="kd">class</span> <span class="nc">RawFileKeyReader</span> <span class="kd">implements</span> <span class="n">CryptoKeyReader</span> <span class="o">{</span>
 
          <span class="n">String</span> <span class="n">publicKeyFile</span> <span class="o">=</span> <span class="s">""</span><span class="o">;</span>
          <span class="n">String</span> <span class="n">privateKeyFile</span> <span class="o">=</span> <span class="s">""</span><span class="o">;</span>
@@ -1425,11 +1424,10 @@
      <span class="o">}</span>
 
      <span class="n">pulsarClient</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre>
-    </div>
+</code></pre></div>    </div>
   </li>
   <li>Sample Consumer Application:
-    <div class="language-java highlighter-rouge"><pre class="highlight"><code>     <span class="kd">class</span> <span class="nc">RawFileKeyReader</span> <span class="kd">implements</span> <span class="n">CryptoKeyReader</span> <span class="o">{</span>
+    <div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code>     <span class="kd">class</span> <span class="nc">RawFileKeyReader</span> <span class="kd">implements</span> <span class="n">CryptoKeyReader</span> <span class="o">{</span>
 
          <span class="n">String</span> <span class="n">publicKeyFile</span> <span class="o">=</span> <span class="s">""</span><span class="o">;</span>
          <span class="n">String</span> <span class="n">privateKeyFile</span> <span class="o">=</span> <span class="s">""</span><span class="o">;</span>
@@ -1479,8 +1477,7 @@
      <span class="c1">// Acknowledge the consumption of all messages at once</span>
      <span class="n">consumer</span><span class="o">.</span><span class="na">acknowledgeCumulative</span><span class="o">(</span><span class="n">msg</span><span class="o">);</span>
      <span class="n">pulsarClient</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre>
-    </div>
+</code></pre></div>    </div>
   </li>
 </ol>
 
@@ -1497,10 +1494,9 @@
 <p>In some cases, the producer may want to encrypt the messages with multiple keys. For this, add all such keys to the config. Consumer will be able to decrypt the message, as long as it has access to at least one of the keys.</p>
 
 <p>E.g: If messages needs to be encrypted using 2 keys myapp.messagekey1 and myapp.messagekey2,</p>
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">conf</span><span class="o">.</span><span class="na">addEncryptionKey</span><span class="o">(</span><span class="s">"myapp.messagekey1"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">conf</span><span class="o">.</span><span class="na">addEncryptionKey</span><span class="o">(</span><span class="s">"myapp.messagekey1"</span><span class="o">);</span>
 <span class="n">conf</span><span class="o">.</span><span class="na">addEncryptionKey</span><span class="o">(</span><span class="s">"myapp.messagekey2"</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 <h2 id="decrypting-encrypted-messages-at-the-consumer-application">Decrypting encrypted messages at the consumer application:</h2>
 <p>Consumers require access one of the private keys to decrypt messages produced by the producer. If you would like to receive encrypted messages, create a public/private key and give your public key to the producer application to encrypt messages using your public key.</p>
 
diff --git a/content/docs/latest/advanced/PartitionedTopics/index.html b/content/docs/latest/advanced/PartitionedTopics/index.html
index 73b706f..89107b4 100644
--- a/content/docs/latest/advanced/PartitionedTopics/index.html
+++ b/content/docs/latest/advanced/PartitionedTopics/index.html
@@ -839,9 +839,9 @@
           
           
           
-          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1031,9 +1031,9 @@
           
           
           
-          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1155,6 +1155,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -1271,8 +1273,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/deployment/aws-cluster/">Deploying a Pulsar cluster on AWS using Terraform and Ansible</a></li>
           
           
@@ -1431,9 +1431,9 @@
           
           
           
-          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
+          <li><a href="/docs/latest/advanced/PartitionedTopics/">Partitioned topics</a></li>
           
           
           
@@ -1572,7 +1572,7 @@
 
 <p>Here’s an example:</p>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">pulsarBrokerRootUrl</span> <span class="o">=</span> <span class="s">"pulsar://localhost:6650"</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">pulsarBrokerRootUrl</span> <span class="o">=</span> <span class="s">"pulsar://localhost:6650"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-my-namespace/my-topic"</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">create</span><span class="o">(</span><span class="n">pulsarBrokerRootUrl</span><span class="o">);</span>
@@ -1580,32 +1580,29 @@
 <span class="n">config</span><span class="o">.</span><span class="na">setMessageRoutingMode</span><span class="o">(</span><span class="n">ProducerConfiguration</span><span class="o">.</span><span class="na">MessageRoutingMode</span><span class="o">.</span><span class="na">SinglePartition</span><span class="o">);</span>
 <span class="n">Producer</span> <span class="n">producer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createProducer</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">config</span><span class="o">);</span>
 <span class="n">producer</span><span class="o">.</span><span class="na">send</span><span class="o">(</span><span class="s">"Partitioned topic message"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="custom-message-router">Custom message router</h4>
 
 <p>To use a custom message router, you need to provide an implementation of the <a target="_blank" href="/api/client/org/apache/pulsar/client/api/MessageRouter.html"><code class="highlighter-rouge">MessageRouter</code></a> interface, which has just one <code class="highlighter-rouge">choosePartition</code> method:</p>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">MessageRouter</span> <span class="kd">extends</span> <span class="n">Serializable</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">interface</span> <span class="nc">MessageRouter</span> <span class="kd">extends</span> <span class="n">Serializable</span> <span class="o">{</span>
     <span class="kt">int</span> <span class="nf">choosePartition</span><span class="o">(</span><span class="n">Message</span> <span class="n">msg</span><span class="o">);</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>Here’s a (not very useful!) router that routes every message to partition 10:</p>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">AlwaysTenRouter</span> <span class="kd">implements</span> <span class="n">MessageRouter</span> <span class="o">{</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kd">public</span> <span class="kd">class</span> <span class="nc">AlwaysTenRouter</span> <span class="kd">implements</span> <span class="n">MessageRouter</span> <span class="o">{</span>
     <span class="kd">public</span> <span class="kt">int</span> <span class="nf">choosePartition</span><span class="o">(</span><span class="n">Message</span> <span class="n">msg</span><span class="o">)</span> <span class="o">{</span>
         <span class="k">return</span> <span class="mi">10</span><span class="o">;</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <p>With that implementation in hand, you can send</p>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">pulsarBrokerRootUrl</span> <span class="o">=</span> <span class="s">"pulsar://localhost:6650"</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">pulsarBrokerRootUrl</span> <span class="o">=</span> <span class="s">"pulsar://localhost:6650"</span><span class="o">;</span>
 <span class="n">String</span> <span class="n">topic</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-my-namespace/my-topic"</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">create</span><span class="o">(</span><span class="n">pulsarBrokerRootUrl</span><span class="o">);</span>
@@ -1613,8 +1610,7 @@
 <span class="n">config</span><span class="o">.</span><span class="na">setMessageRouter</span><span class="o">(</span><span class="n">AlwaysTenRouter</span><span class="o">);</span>
 <span class="n">Producer</span> <span class="n">producer</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="na">createProducer</span><span class="o">(</span><span class="n">topic</span><span class="o">,</span> <span class="n">config</span><span class="o">);</span>
 <span class="n">producer</span><span class="o">.</span><span class="na">send</span><span class="o">(</span><span class="s">"Partitioned topic message"</span><span class="o">.</span><span class="na">getBytes</span><span class="o">());</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="pulsar-admin-setup">Pulsar admin setup</h2>
 
@@ -1736,7 +1732,7 @@
 
 <p>To use the Java admin API, instantiate a <a target="_blank" href="/api/admin/org/apache/pulsar/client/admin/PulsarAdmin.html"><code class="highlighter-rouge">PulsarAdmin</code></a> object, specifying a URL for 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 th [...]
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">URL</span> <span class="n">url</span> <span class="o">=</span> <span class="k">new</span> <span class="n">URL</span><span class="o">(</span><span class="s">"http://localhost:8080"</span><span class="o">);</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">URL</span> <span class="n">url</span> <span class="o">=</span> <span class="k">new</span> <span class="n">URL</span><span class="o">(</span><span class="s">"http://localhost:8080"</span><span class="o">);</span>
 <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="c1">//Pass auth-plugin class fully-qualified name if Pulsar-security enabled</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><span class="c1">//Pass auth-param if auth-plugin class requires it</span>
 <span class="kt">boolean</span> <span class="n">useTls</span> <span class="o">=</span> <span class="kc">false</span><span class="o">;</span>
@@ -1750,8 +1746,7 @@
 <span class="n">config</span><span class="o">.</span><span class="na">setTlsTrustCertsFilePath</span><span class="o">(</span><span class="n">tlsTrustCertsFilePath</span><span class="o">);</span>
 
 <span class="n">PulsarAdmin</span> <span class="n">admin</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PulsarAdmin</span><span class="o">(</span><span class="n">url</span><span class="o">,</span> <span class="n">config</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h2 id="managing-partitioned-topics">Managing partitioned topics</h2>
 
@@ -1842,11 +1837,10 @@
 
 <p>You can create partitioned topics using the <a href="../../reference/CliTools#pulsar-admin-persistent-create-partitioned-topic"><code class="highlighter-rouge">create-partitioned-topic</code></a> command and specifying the topic name as an argument and the number of partitions using the <code class="highlighter-rouge">-p</code> or <code class="highlighter-rouge">--partitions</code> flag. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin persistent create-partitioned-topic <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin persistent create-partitioned-topic <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic <span class="se">\</span>
-  --partitions 4
-</code></pre>
-</div>
+  <span class="nt">--partitions</span> 4
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -1856,11 +1850,10 @@
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-my-namespace/my-topic"</span><span class="o">;</span>
 <span class="kt">int</span> <span class="n">numPartitions</span> <span class="o">=</span> <span class="mi">4</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">createPartitionedTopic</span><span class="o">(</span><span class="n">topicName</span><span class="o">,</span> <span class="n">numPartitions</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-metadata">Get metadata</h3>
 
@@ -1885,13 +1878,12 @@
 
 <p>You can see the number of partitions in a partitioned topic using the <a href="../../reference/CliTools#pulsar-admin-persistent-get-partitioned-topic"><code class="highlighter-rouge">get-partitioned-topic-metadata</code></a> subcommand. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent get-partitioned-topic-metadata <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent get-partitioned-topic-metadata <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic
 <span class="o">{</span>
   <span class="s2">"partitions"</span>: 4
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -1901,10 +1893,9 @@
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">String</span> <span class="n">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">topicName</span> <span class="o">=</span> <span class="s">"persistent://my-property/my-cluster-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">getPartitionedTopicMetadata</span><span class="o">(</span><span class="n">topicName</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="update">Update</h3>
 
@@ -1918,11 +1909,10 @@
 
 <p>Partitioned topics can be updated using the <a href="../../reference/CliTools#pulsar-admin-persistent-update-partitioned-topic"><code class="highlighter-rouge">update-partitioned-topic</code></a> command.</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent update-partitioned-topic <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent update-partitioned-topic <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic <span class="se">\</span>
-  --partitions 8
-</code></pre>
-</div>
+  <span class="nt">--partitions</span> 8
+</code></pre></div></div>
 
 <h4 id="rest-api-3">REST API</h4>
 
@@ -1932,9 +1922,8 @@
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">updatePartitionedTopic</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">,</span> <span class="n">numPartitions</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">updatePartitionedTopic</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">,</span> <span class="n">numPartitions</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="delete">Delete</h3>
 
@@ -1942,10 +1931,9 @@
 
 <p>Partitioned topics can be deleted using the <a href="../../reference/CliTools#pulsar-admin-persistent-delete-partitioned-topic"><code class="highlighter-rouge">delete-partitioned-topic</code></a> command, specifying the topic by name:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>bin/pulsar-admin persistent delete-partitioned-topic <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>bin/pulsar-admin persistent delete-partitioned-topic <span class="se">\</span>
   persistent://my-property/my-cluster-my-namespace/my-topic
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-4">REST API</h4>
 
@@ -1955,9 +1943,8 @@
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><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">persistentTopic</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">delete</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="list">List</h3>
 
@@ -1965,11 +1952,10 @@
 
 <h4 id="pulsar-admin-5">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent list prop-1/cluster-1/namespace
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent list prop-1/cluster-1/namespace
 persistent://property/cluster/namespace/topic
 persistent://property/cluster/namespace/topic
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-5">REST API</h4>
 
@@ -1979,46 +1965,44 @@ persistent://property/cluster/namespace/topic
 
 <h4 id="java-5">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">admin</span><span class="o">.</span><span class="na">persistentTopics</span><span class="o">().</span><span class="na">getList</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">getList</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="stats">Stats</h3>
 
 <p>It shows current statistics of a given partitioned topic. Here’s an example payload:</p>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">4641.528542257553</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">44663039.74947473</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mf">1232439.816728665</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"storageSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">135532389160</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"publishers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
+      </span><span class="s2">"msgRateIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">57.855383881403576</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputIn"</span><span class="p">:</span><span class="w"> </span><span class="mf">558994.7078932219</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"averageMsgSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">613135</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"producerName"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"address"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"connectedSince"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">],</span><span class="w">
-  </span><span class="nt">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-    </span><span class="nt">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"consumers"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
+  </span><span class="s2">"subscriptions"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+    </span><span class="s2">"my-topic_subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+      </span><span class="s2">"msgRateOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgThroughputOut"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgBacklog"</span><span class="p">:</span><span class="w"> </span><span class="mi">116632</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"type"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"msgRateExpired"</span><span class="p">:</span><span class="w"> </span><span class="mf">36.98245516804671</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"consumers"</span><span class="p">:</span><span class="w"> </span><span class="p">[]</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">},</span><span class="w">
-  </span><span class="nt">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
+  </span><span class="s2">"replication"</span><span class="p">:</span><span class="w"> </span><span class="p">{}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <p>The following stats are available:</p>
 
@@ -2209,11 +2193,10 @@ persistent://property/cluster/namespace/topic
 
 <p><a href="../../reference/CliTools#pulsar-admin-persistent-partitioned-stats"><code class="highlighter-rouge">partitioned-stats</code></a></p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent partitioned-stats <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent partitioned-stats <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1 <span class="se">\</span>
-  --per-partition        
-</code></pre>
-</div>
+  <span class="nt">--per-partition</span>        
+</code></pre></div></div>
 
 <h4 id="rest-api-6">REST API</h4>
 
@@ -2223,9 +2206,8 @@ persistent://property/cluster/namespace/topic
 
 <h4 id="java-6">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><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">persistentTopic</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">getStats</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="internal-stats">Internal stats</h3>
 
@@ -2396,49 +2378,47 @@ persistent://property/cluster/namespace/topic
   </tbody>
 </table>
 
-<div class="language-json highlighter-rouge"><pre class="highlight"><code><span class="p">{</span><span class="w">
-  </span><span class="nt">"entriesAddedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449518</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"numberOfEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"totalSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"currentLedgerEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"currentLedgerSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"lastLedgerCreatedTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 03:00:23.825"</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"lastLedgerCreationFailureTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"waitingCursorsCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"pendingAddEntriesCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"lastConfirmedEntry"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3232"</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"LedgerOpened"</span><span class="p">,</span><span class="w">
-  </span><span class="nt">"ledgers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
+<div class="language-json highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="p">{</span><span class="w">
+  </span><span class="s2">"entriesAddedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449518</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"numberOfEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"totalSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"currentLedgerEntries"</span><span class="p">:</span><span class="w"> </span><span class="mi">3233</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"currentLedgerSize"</span><span class="p">:</span><span class="w"> </span><span class="mi">331482</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"lastLedgerCreatedTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 03:00:23.825"</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"lastLedgerCreationFailureTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="kc">null</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"waitingCursorsCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">1</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"pendingAddEntriesCount"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"lastConfirmedEntry"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3232"</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"LedgerOpened"</span><span class="p">,</span><span class="w">
+  </span><span class="s2">"ledgers"</span><span class="p">:</span><span class="w"> </span><span class="p">[</span><span class="w">
     </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"ledgerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">324711539</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"entries"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
+      </span><span class="s2">"ledgerId"</span><span class="p">:</span><span class="w"> </span><span class="mi">324711539</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"entries"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"size"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">],</span><span class="w">
-  </span><span class="nt">"cursors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-    </span><span class="nt">"my-subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
-      </span><span class="nt">"markDeletePosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3133"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"readPosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3233"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"waitingReadOp"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"pendingReadOps"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"messagesConsumedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449501</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"cursorLedger"</span><span class="p">:</span><span class="w"> </span><span class="mi">324702104</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"cursorLedgerLastEntry"</span><span class="p">:</span><span class="w"> </span><span class="mi">21</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"individuallyDeletedMessages"</span><span class="p">:</span><span class="w"> </span><span class="s2">"[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"lastLedgerSwitchTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 01:30:19.313"</span><span class="p">,</span><span class="w">
-      </span><span class="nt">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Open"</span><span class="w">
+  </span><span class="s2">"cursors"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+    </span><span class="s2">"my-subscription"</span><span class="p">:</span><span class="w"> </span><span class="p">{</span><span class="w">
+      </span><span class="s2">"markDeletePosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3133"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"readPosition"</span><span class="p">:</span><span class="w"> </span><span class="s2">"324711539:3233"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"waitingReadOp"</span><span class="p">:</span><span class="w"> </span><span class="kc">true</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"pendingReadOps"</span><span class="p">:</span><span class="w"> </span><span class="mi">0</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"messagesConsumedCounter"</span><span class="p">:</span><span class="w"> </span><span class="mi">20449501</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"cursorLedger"</span><span class="p">:</span><span class="w"> </span><span class="mi">324702104</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"cursorLedgerLastEntry"</span><span class="p">:</span><span class="w"> </span><span class="mi">21</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"individuallyDeletedMessages"</span><span class="p">:</span><span class="w"> </span><span class="s2">"[(324711539:3134‥324711539:3136], (324711539:3137‥324711539:3140], ]"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"lastLedgerSwitchTimestamp"</span><span class="p">:</span><span class="w"> </span><span class="s2">"2016-06-29 01:30:19.313"</span><span class="p">,</span><span class="w">
+      </span><span class="s2">"state"</span><span class="p">:</span><span class="w"> </span><span class="s2">"Open"</span><span class="w">
     </span><span class="p">}</span><span class="w">
   </span><span class="p">}</span><span class="w">
 </span><span class="p">}</span><span class="w">
-</span></code></pre>
-</div>
+</span></code></pre></div></div>
 
 <h4 id="pulsar-admin-7">pulsar-admin</h4>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin persistent stats-internal <span class="se">\</span>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin persistent stats-internal <span class="se">\</span>
   persistent://test-property/cl1/ns1/tp1
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-7">REST API</h4>
 
@@ -2448,9 +2428,8 @@ persistent://property/cluster/namespace/topic
 
 <h4 id="java-7">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><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">persistentTopic</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">persistentTopics</span><span class="o">().</span><span class="na">getInternalStats</span><span class="o">(</span><span class="n">persistentTopic</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h2 id="concepts">Concepts</h2>
 
diff --git a/content/docs/latest/advanced/RetentionExpiry/index.html b/content/docs/latest/advanced/RetentionExpiry/index.html
index c0306a1..8bd8ac2 100644
--- a/content/docs/latest/advanced/RetentionExpiry/index.html
+++ b/content/docs/latest/advanced/RetentionExpiry/index.html
@@ -771,6 +771,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
@@ -887,8 +889,6 @@
           
           
           
-          
-          
           <li><a href="/docs/latest/deployment/aws-cluster/">Deploying a Pulsar cluster on AWS using Terraform and Ansible</a></li>
           
           
@@ -1067,9 +1067,9 @@
           
           
           
-          <li><a href="/docs/latest/advanced/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/advanced/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -1259,9 +1259,9 @@
           
           
           
-          <li><a href="/docs/latest/advanced/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/advanced/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -1451,9 +1451,9 @@
           
           
           
-          <li><a href="/docs/latest/advanced/RetentionExpiry/">Message retention and expiry</a></li>
           
           
+          <li><a href="/docs/latest/advanced/RetentionExpiry/">Message retention and expiry</a></li>
           
           
           
@@ -1616,11 +1616,10 @@
 
 <p>To set a size limit of 10 gigabytes and a time limit of 3 hours for the <code class="highlighter-rouge">my-prop/my-cluster/my-ns</code> namespace:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces <span class="nb">set</span>-retention my-prop/my-cluster/my-ns <span class="se">\</span>
-  --size 10G <span class="se">\</span>
-  --time 3h
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces set-retention my-prop/my-cluster/my-ns <span class="se">\</span>
+  <span class="nt">--size</span> 10G <span class="se">\</span>
+  <span class="nt">--time</span> 3h
+</code></pre></div></div>
 
 <h4 id="rest-api">REST API</h4>
 
@@ -1630,12 +1629,11 @@
 
 <h4 id="java">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kt">int</span> <span class="n">retentionTime</span> <span class="o">=</span> <span class="mi">10</span><span class="o">;</span> <span class="c1">// 10 minutes</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">int</span> <span class="n">retentionTime</span> <span class="o">=</span> <span class="mi">10</span><span class="o">;</span> <span class="c1">// 10 minutes</span>
 <span class="kt">int</span> <span class="n">retentionSize</span> <span class="o">=</span> <span class="mi">500</span><span class="o">;</span> <span class="c1">// 500 megabytes</span>
 <span class="n">RetentionPolicies</span> <span class="n">policies</span> <span class="o">=</span> <span class="k">new</span> <span class="n">RetentionPolicies</span><span class="o">(</span><span class="n">retentionTime</span><span class="o">,</span> <span class="n">retentionSize</span><span class="o">);</span>
 <span class="n">admin</span><span class="o">.</span><span class="na">namespaces</span><span class="o">().</span><span class="na">setRetention</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">policies</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-retention-policy">Get retention policy</h3>
 
@@ -1647,13 +1645,12 @@
 
 <h5 id="example">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces get-retention my-prop/my-cluster/my-ns
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces get-retention my-prop/my-cluster/my-ns
 <span class="o">{</span>
   <span class="s2">"retentionTimeInMinutes"</span>: 10,
   <span class="s2">"retentionSizeInMB"</span>: 0
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-1">REST API</h4>
 
@@ -1663,9 +1660,8 @@
 
 <h4 id="java-1">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">getRetention</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">getRetention</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h2 id="backlog-quotas">Backlog quotas</h2>
 
@@ -1745,11 +1741,10 @@
 
 <h5 id="example-1">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces <span class="nb">set</span>-backlog-quota my-prop/my-cluster/my-ns <span class="se">\</span>
-  --limit 2G <span class="se">\</span>
-  --policy producer_request_hold
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces set-backlog-quota my-prop/my-cluster/my-ns <span class="se">\</span>
+  <span class="nt">--limit</span> 2G <span class="se">\</span>
+  <span class="nt">--policy</span> producer_request_hold
+</code></pre></div></div>
 
 <h4 id="rest-api-2">REST API</h4>
 
@@ -1759,13 +1754,12 @@
 
 <h4 id="java-2">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="kt">long</span> <span class="n">sizeLimit</span> <span class="o">=</span> <span class="mi">2147483648L</span><span class="o">;</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="kt">long</span> <span class="n">sizeLimit</span> <span class="o">=</span> <span class="mi">2147483648L</span><span class="o">;</span>
 <span class="n">BacklogQuota</span><span class="o">.</span><span class="na">RetentionPolicy</span> <span class="n">policy</span> <span class="o">=</span>
   <span class="n">BacklogQuota</span><span class="o">.</span><span class="na">RetentionPolicy</span><span class="o">.</span><span class="na">producer_request_hold</span><span class="o">;</span>
 <span class="n">BacklogQuota</span> <span class="n">quota</span> <span class="o">=</span> <span class="k">new</span> <span class="n">BacklogQuota</span><span class="o">(</span><span class="n">sizeLimit</span><span class="o">,</span> <span class="n">policy</span><span class="o">);</span>
 <span class="n">admin</span><span class="o">.</span><span class="na">namespaces</span><span class="o">().</span><span class="na">setBacklogQuota</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">quota</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="get-backlog-threshold-and-backlog-retention-policy">Get backlog threshold and backlog retention policy</h3>
 
@@ -1775,15 +1769,14 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-get-backlog-quotas"><code class="highlighter-rouge">get-backlog-quotas</code></a> subcommand and specify a namespace. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces get-backlog-quotas my-prop/my-cluster/my-ns
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces get-backlog-quotas my-prop/my-cluster/my-ns
 <span class="o">{</span>
   <span class="s2">"destination_storage"</span>: <span class="o">{</span>
     <span class="s2">"limit"</span> : 2147483648,
     <span class="s2">"policy"</span> : <span class="s2">"producer_request_hold"</span>
   <span class="o">}</span>
 <span class="o">}</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-3">REST API</h4>
 
@@ -1793,10 +1786,9 @@
 
 <h4 id="java-3">Java</h4>
 
-<div class="language-java highlighter-rouge"><pre class="highlight"><code><span class="n">Map</span><span class="o">&lt;</span><span class="n">BacklogQuota</span><span class="o">.</span><span class="na">BacklogQuotaType</span><span class="o">,</span><span class="n">BacklogQuota</span><span class="o">&gt;</span> <span class="n">quotas</span> <span class="o">=</span>
+<div class="language-java highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="n">Map</span><span class="o">&lt;</span><span class="n">BacklogQuota</span><span class="o">.</span><span class="na">BacklogQuotaType</span><span class="o">,</span><span class="n">BacklogQuota</span><span class="o">&gt;</span> <span class="n">quotas</span> <span class="o">=</span>
   <span class="n">admin</span><span class="o">.</span><span class="na">namespaces</span><span class="o">().</span><span class="na">getBacklogQuotas</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h3 id="remove-backlog-quotas">Remove backlog quotas</h3>
 
@@ -1804,9 +1796,8 @@
 
 <p>Use the <a href="../../reference/CliTools#pulsar-admin-namespaces-remove-backlog-quota"><code class="highlighter-rouge">remove-backlog-quotas</code></a> subcommand and specify a namespace. Here’s an example:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces remove-backlog-quotas my-prop/my-cluster/my-ns
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces remove-backlog-quotas my-prop/my-cluster/my-ns
+</code></pre></div></div>
 
 <h4 id="rest-api-4">REST API</h4>
 
@@ -1816,9 +1807,8 @@
 
 <h4 id="java-4">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">removeBacklogQuota</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">removeBacklogQuota</span><span class="o">(</span><span class="n">namespace</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="clear-backlog">Clear backlog</h3>
 
@@ -1828,9 +1818,8 @@
 
 <h5 id="example-2">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces clear-backlog my-prop/my-cluster/my-ns
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces clear-backlog my-prop/my-cluster/my-ns
+</code></pre></div></div>
 
 <p>By default, you will be prompted to ensure that you really want to clear the backlog for the namespace. You can override the prompt using the <code class="highlighter-rouge">-f</code>/<code class="highlighter-rouge">--force</code> flag.</p>
 
@@ -1846,10 +1835,9 @@
 
 <h5 id="example-3">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces <span class="nb">set</span>-message-ttl my-prop/my-cluster/my-ns <span class="se">\</span>
-  --messageTTL 120 <span class="c"># TTL of 2 minutes</span>
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces set-message-ttl my-prop/my-cluster/my-ns <span class="se">\</span>
+  <span class="nt">--messageTTL</span> 120 <span class="c"># TTL of 2 minutes</span>
+</code></pre></div></div>
 
 <h4 id="rest-api-5">REST API</h4>
 
@@ -1859,9 +1847,8 @@
 
 <h4 id="java-5">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">setNamespaceMessageTTL</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">ttlInSeconds</span><span class="o">);</span>
-</code></pre>
-</div>
+<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">setNamespaceMessageTTL</span><span class="o">(</span><span class="n">namespace</span><span class="o">,</span> <span class="n">ttlInSeconds</span><span class="o">);</span>
+</code></pre></div></div>
 
 <h3 id="get-the-ttl-configuration-for-a-namespace">Get the TTL configuration for a namespace</h3>
 
@@ -1871,10 +1858,9 @@
 
 <h5 id="example-4">Example</h5>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>pulsar-admin namespaces get-message-ttl my-prop/my-cluster/my-ns
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>pulsar-admin namespaces get-message-ttl my-prop/my-cluster/my-ns
 60
-</code></pre>
-</div>
+</code></pre></div></div>
 
 <h4 id="rest-api-6">REST API</h4>
 
@@ -1884,9 +1870,8 @@
 
 <h4 id="java-6">Java</h4>
 
-<div class="language-java highlighter-rouge"><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">get</span>
-</code></pre>
-</div>
+<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">get</span>
+</code></pre></div></div>
 
       </section>
     </article>
diff --git a/content/docs/latest/clients/Cpp/index.html b/content/docs/latest/clients/Cpp/index.html
index 220b1c5..e9bc29c 100644
--- a/content/docs/latest/clients/Cpp/index.html
+++ b/content/docs/latest/clients/Cpp/index.html
@@ -779,6 +779,8 @@
           
           
           
+          
+          
           <li><a href="/docs/latest/reference/CliTools/">Pulsar command-line tools</a></li>
           
           
@@ -926,8 +928,6 @@
           
           
           
-          
-          
         </ul>
       </div>
     </div>
@@ -969,9 +969,9 @@
           
           
           
-          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
+          <li><a href="/docs/latest/admin/Authz/">Authentication and authorization in Pulsar</a></li>
           
           
           
@@ -1001,9 +1001,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>
           
           
           
@@ -1209,35 +1209,31 @@
 
 <p>There are separate compilation instructions for <a href="#macos">MacOS</a> and <a href="#linux">Linux</a>. For both systems, start by cloning the Pulsar repository:</p>
 
-<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git clone https://github.com/apache/incubator-pulsar/tree/master
-</code></pre>
-</div>
+<div class="language-shell highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$ </span>git clone https://github.com/apache/incubator-pulsar/tree/master
+</code></pre></div></div>
 
 <h3 id="linux">Linux</h3>
 
 <p>First, install all of the necessary dependencies:</p>
... 11744 lines suppressed ...

-- 
To stop receiving notification emails like this one, please contact
mmerli@apache.org.