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/10/13 09:32:05 UTC

[pulsar] branch asf-site updated: Updated site at revision f2f5f83

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/pulsar.git


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

commit a50bde083aa2ae0b35463aba337419c0f3a405bd
Author: jenkins <bu...@apache.org>
AuthorDate: Sat Oct 13 09:31:55 2018 +0000

    Updated site at revision f2f5f83
---
 content/api/admin/allclasses-frame.html            |   1 +
 content/api/admin/allclasses-noframe.html          |   1 +
 content/api/admin/index-all.html                   |  25 ++++
 .../org/apache/pulsar/client/admin/Namespaces.html | 122 +++++++++++++----
 .../pulsar/common/policies/data/Policies.html      |  17 ++-
 .../common/policies/data/RetentionPolicies.html    |   4 +-
 ... => SchemaAutoUpdateCompatibilityStrategy.html} | 102 +++++++++-----
 .../common/policies/data/SubscriptionAuthMode.html |   4 +-
 .../pulsar/common/policies/data/package-frame.html |   1 +
 .../common/policies/data/package-summary.html      |   6 +
 .../pulsar/common/policies/data/package-tree.html  |   1 +
 content/api/admin/overview-tree.html               |   1 +
 content/api/python/functions/context.m.html        |   8 +-
 content/contributing.html                          |   6 +-
 content/contributing/index.html                    |   6 +-
 .../en/2.1.0-incubating/admin-api-clusters.html    |   4 +-
 .../2.1.0-incubating/admin-api-clusters/index.html |   4 +-
 .../en/2.1.0-incubating/admin-api-namespaces.html  |   6 +-
 .../admin-api-namespaces/index.html                |   6 +-
 .../en/2.1.0-incubating/admin-api-tenants.html     |   4 +-
 .../2.1.0-incubating/admin-api-tenants/index.html  |   4 +-
 .../administration-load-distribution.html          |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 .../en/2.1.0-incubating/administration-zk-bk.html  |  68 ++++-----
 .../administration-zk-bk/index.html                |  68 ++++-----
 .../client-libraries-websocket.html                |   8 +-
 .../client-libraries-websocket/index.html          |   8 +-
 .../deploy-bare-metal-multi-cluster.html           |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 .../en/2.1.0-incubating/deploy-bare-metal.html     |  18 +--
 .../2.1.0-incubating/deploy-bare-metal/index.html  |  18 +--
 content/docs/en/2.1.0-incubating/io-managing.html  |  20 +--
 .../en/2.1.0-incubating/io-managing/index.html     |  20 +--
 content/docs/en/2.1.0-incubating/pulsar-admin.html |   2 +-
 .../en/2.1.0-incubating/pulsar-admin/index.html    |   2 +-
 .../2.1.0-incubating/reference-configuration.html  |   6 +-
 .../reference-configuration/index.html             |   6 +-
 .../docs/en/2.1.0-incubating/security-athenz.html  |  38 +++---
 .../en/2.1.0-incubating/security-athenz/index.html |  38 +++---
 .../2.1.0-incubating/security-authorization.html   |  12 +-
 .../security-authorization/index.html              |  12 +-
 .../en/2.1.0-incubating/security-extending.html    |   8 +-
 .../2.1.0-incubating/security-extending/index.html |   8 +-
 .../security-tls-authentication.html               |  30 ++--
 .../security-tls-authentication/index.html         |  30 ++--
 .../2.1.0-incubating/security-tls-transport.html   |  34 ++---
 .../security-tls-transport/index.html              |  34 ++---
 .../en/2.1.0-incubating/standalone-docker.html     |   4 +-
 .../2.1.0-incubating/standalone-docker/index.html  |   4 +-
 content/docs/en/admin-api-clusters.html            |   4 +-
 content/docs/en/admin-api-clusters/index.html      |   4 +-
 content/docs/en/admin-api-namespaces.html          |   6 +-
 content/docs/en/admin-api-namespaces/index.html    |   6 +-
 content/docs/en/admin-api-tenants.html             |   4 +-
 content/docs/en/admin-api-tenants/index.html       |   4 +-
 .../docs/en/administration-load-distribution.html  |  68 ++++-----
 .../en/administration-load-distribution/index.html |  68 ++++-----
 content/docs/en/administration-zk-bk.html          |  68 ++++-----
 content/docs/en/administration-zk-bk/index.html    |  68 ++++-----
 content/docs/en/client-libraries-websocket.html    |   8 +-
 .../docs/en/client-libraries-websocket/index.html  |   8 +-
 .../docs/en/deploy-bare-metal-multi-cluster.html   |  70 +++++-----
 .../en/deploy-bare-metal-multi-cluster/index.html  |  70 +++++-----
 content/docs/en/deploy-bare-metal.html             |  18 +--
 content/docs/en/deploy-bare-metal/index.html       |  18 +--
 content/docs/en/io-managing.html                   |  20 +--
 content/docs/en/io-managing/index.html             |  20 +--
 content/docs/en/next/admin-api-clusters.html       |   4 +-
 content/docs/en/next/admin-api-clusters/index.html |   4 +-
 content/docs/en/next/admin-api-namespaces.html     |   6 +-
 .../docs/en/next/admin-api-namespaces/index.html   |   6 +-
 content/docs/en/next/admin-api-tenants.html        |   4 +-
 content/docs/en/next/admin-api-tenants/index.html  |   4 +-
 .../en/next/administration-load-distribution.html  |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 content/docs/en/next/administration-zk-bk.html     |  68 ++++-----
 .../docs/en/next/administration-zk-bk/index.html   |  68 ++++-----
 .../docs/en/next/client-libraries-websocket.html   |   8 +-
 .../en/next/client-libraries-websocket/index.html  |   8 +-
 .../en/next/deploy-bare-metal-multi-cluster.html   |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 content/docs/en/next/deploy-bare-metal.html        |  18 +--
 content/docs/en/next/deploy-bare-metal/index.html  |  18 +--
 content/docs/en/next/io-managing.html              |  20 +--
 content/docs/en/next/io-managing/index.html        |  20 +--
 content/docs/en/next/pulsar-admin.html             |   2 +-
 content/docs/en/next/pulsar-admin/index.html       |   2 +-
 content/docs/en/next/reference-configuration.html  |   6 +-
 .../en/next/reference-configuration/index.html     |   6 +-
 content/docs/en/next/security-athenz.html          |  38 +++---
 content/docs/en/next/security-athenz/index.html    |  38 +++---
 content/docs/en/next/security-authorization.html   |  12 +-
 .../docs/en/next/security-authorization/index.html |  12 +-
 content/docs/en/next/security-extending.html       |   8 +-
 content/docs/en/next/security-extending/index.html |   8 +-
 .../docs/en/next/security-tls-authentication.html  |  30 ++--
 .../en/next/security-tls-authentication/index.html |  30 ++--
 content/docs/en/next/security-tls-transport.html   |  34 ++---
 .../docs/en/next/security-tls-transport/index.html |  34 ++---
 content/docs/en/next/standalone-docker.html        |   4 +-
 content/docs/en/next/standalone-docker/index.html  |   4 +-
 content/docs/en/pulsar-admin.html                  |   2 +-
 content/docs/en/pulsar-admin/index.html            |   2 +-
 content/docs/en/reference-configuration.html       |   6 +-
 content/docs/en/reference-configuration/index.html |   6 +-
 content/docs/en/security-athenz.html               |  38 +++---
 content/docs/en/security-athenz/index.html         |  38 +++---
 content/docs/en/security-authorization.html        |  12 +-
 content/docs/en/security-authorization/index.html  |  12 +-
 content/docs/en/security-extending.html            |   8 +-
 content/docs/en/security-extending/index.html      |   8 +-
 content/docs/en/security-tls-authentication.html   |  30 ++--
 .../docs/en/security-tls-authentication/index.html |  30 ++--
 content/docs/en/security-tls-transport.html        |  34 ++---
 content/docs/en/security-tls-transport/index.html  |  34 ++---
 content/docs/en/standalone-docker.html             |   4 +-
 content/docs/en/standalone-docker/index.html       |   4 +-
 .../administration-load-distribution.html          |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 .../fr/2.1.0-incubating/administration-zk-bk.html  |  68 ++++-----
 .../administration-zk-bk/index.html                |  68 ++++-----
 .../client-libraries-websocket.html                |   8 +-
 .../client-libraries-websocket/index.html          |   8 +-
 .../deploy-bare-metal-multi-cluster.html           |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 .../fr/2.1.0-incubating/deploy-bare-metal.html     |  18 +--
 .../2.1.0-incubating/deploy-bare-metal/index.html  |  18 +--
 .../2.1.0-incubating/reference-configuration.html  |   6 +-
 .../reference-configuration/index.html             |   6 +-
 .../docs/fr/2.1.0-incubating/security-athenz.html  |  38 +++---
 .../fr/2.1.0-incubating/security-athenz/index.html |  38 +++---
 .../2.1.0-incubating/security-authorization.html   |  12 +-
 .../security-authorization/index.html              |  12 +-
 .../fr/2.1.0-incubating/security-extending.html    |   4 +-
 .../2.1.0-incubating/security-extending/index.html |   4 +-
 .../security-tls-authentication.html               |  30 ++--
 .../security-tls-authentication/index.html         |  30 ++--
 .../2.1.0-incubating/security-tls-transport.html   |  34 ++---
 .../security-tls-transport/index.html              |  34 ++---
 .../docs/fr/administration-load-distribution.html  |  68 ++++-----
 .../fr/administration-load-distribution/index.html |  68 ++++-----
 content/docs/fr/administration-zk-bk.html          |  68 ++++-----
 content/docs/fr/administration-zk-bk/index.html    |  68 ++++-----
 content/docs/fr/client-libraries-websocket.html    |   8 +-
 .../docs/fr/client-libraries-websocket/index.html  |   8 +-
 .../docs/fr/deploy-bare-metal-multi-cluster.html   |  70 +++++-----
 .../fr/deploy-bare-metal-multi-cluster/index.html  |  70 +++++-----
 content/docs/fr/deploy-bare-metal.html             |  18 +--
 content/docs/fr/deploy-bare-metal/index.html       |  18 +--
 .../fr/next/administration-load-distribution.html  |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 content/docs/fr/next/administration-zk-bk.html     |  68 ++++-----
 .../docs/fr/next/administration-zk-bk/index.html   |  68 ++++-----
 .../docs/fr/next/client-libraries-websocket.html   |   8 +-
 .../fr/next/client-libraries-websocket/index.html  |   8 +-
 .../fr/next/deploy-bare-metal-multi-cluster.html   |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 content/docs/fr/next/deploy-bare-metal.html        |  18 +--
 content/docs/fr/next/deploy-bare-metal/index.html  |  18 +--
 content/docs/fr/next/reference-configuration.html  |   6 +-
 .../fr/next/reference-configuration/index.html     |   6 +-
 content/docs/fr/next/security-athenz.html          |  38 +++---
 content/docs/fr/next/security-athenz/index.html    |  38 +++---
 content/docs/fr/next/security-authorization.html   |  12 +-
 .../docs/fr/next/security-authorization/index.html |  12 +-
 content/docs/fr/next/security-extending.html       |   4 +-
 content/docs/fr/next/security-extending/index.html |   4 +-
 .../docs/fr/next/security-tls-authentication.html  |  30 ++--
 .../fr/next/security-tls-authentication/index.html |  30 ++--
 content/docs/fr/next/security-tls-transport.html   |  34 ++---
 .../docs/fr/next/security-tls-transport/index.html |  34 ++---
 content/docs/fr/reference-configuration.html       |   6 +-
 content/docs/fr/reference-configuration/index.html |   6 +-
 content/docs/fr/security-athenz.html               |  38 +++---
 content/docs/fr/security-athenz/index.html         |  38 +++---
 content/docs/fr/security-authorization.html        |  12 +-
 content/docs/fr/security-authorization/index.html  |  12 +-
 content/docs/fr/security-extending.html            |   4 +-
 content/docs/fr/security-extending/index.html      |   4 +-
 content/docs/fr/security-tls-authentication.html   |  30 ++--
 .../docs/fr/security-tls-authentication/index.html |  30 ++--
 content/docs/fr/security-tls-transport.html        |  34 ++---
 content/docs/fr/security-tls-transport/index.html  |  34 ++---
 .../administration-load-distribution.html          |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 .../ja/2.1.0-incubating/administration-zk-bk.html  |  68 ++++-----
 .../administration-zk-bk/index.html                |  68 ++++-----
 .../client-libraries-websocket.html                |   8 +-
 .../client-libraries-websocket/index.html          |   8 +-
 .../deploy-bare-metal-multi-cluster.html           |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 .../ja/2.1.0-incubating/deploy-bare-metal.html     |  18 +--
 .../2.1.0-incubating/deploy-bare-metal/index.html  |  18 +--
 .../2.1.0-incubating/reference-configuration.html  |   6 +-
 .../reference-configuration/index.html             |   6 +-
 .../docs/ja/2.1.0-incubating/security-athenz.html  |  38 +++---
 .../ja/2.1.0-incubating/security-athenz/index.html |  38 +++---
 .../2.1.0-incubating/security-authorization.html   |  12 +-
 .../security-authorization/index.html              |  12 +-
 .../ja/2.1.0-incubating/security-extending.html    |   4 +-
 .../2.1.0-incubating/security-extending/index.html |   4 +-
 .../security-tls-authentication.html               |  30 ++--
 .../security-tls-authentication/index.html         |  30 ++--
 .../2.1.0-incubating/security-tls-transport.html   |  34 ++---
 .../security-tls-transport/index.html              |  34 ++---
 .../docs/ja/administration-load-distribution.html  |  68 ++++-----
 .../ja/administration-load-distribution/index.html |  68 ++++-----
 content/docs/ja/administration-zk-bk.html          |  68 ++++-----
 content/docs/ja/administration-zk-bk/index.html    |  68 ++++-----
 content/docs/ja/client-libraries-websocket.html    |   8 +-
 .../docs/ja/client-libraries-websocket/index.html  |   8 +-
 .../docs/ja/deploy-bare-metal-multi-cluster.html   |  70 +++++-----
 .../ja/deploy-bare-metal-multi-cluster/index.html  |  70 +++++-----
 content/docs/ja/deploy-bare-metal.html             |  18 +--
 content/docs/ja/deploy-bare-metal/index.html       |  18 +--
 .../ja/next/administration-load-distribution.html  |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 content/docs/ja/next/administration-zk-bk.html     |  68 ++++-----
 .../docs/ja/next/administration-zk-bk/index.html   |  68 ++++-----
 .../docs/ja/next/client-libraries-websocket.html   |   8 +-
 .../ja/next/client-libraries-websocket/index.html  |   8 +-
 .../ja/next/deploy-bare-metal-multi-cluster.html   |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 content/docs/ja/next/deploy-bare-metal.html        |  18 +--
 content/docs/ja/next/deploy-bare-metal/index.html  |  18 +--
 content/docs/ja/next/reference-configuration.html  |   6 +-
 .../ja/next/reference-configuration/index.html     |   6 +-
 content/docs/ja/next/security-athenz.html          |  38 +++---
 content/docs/ja/next/security-athenz/index.html    |  38 +++---
 content/docs/ja/next/security-authorization.html   |  12 +-
 .../docs/ja/next/security-authorization/index.html |  12 +-
 content/docs/ja/next/security-extending.html       |   4 +-
 content/docs/ja/next/security-extending/index.html |   4 +-
 .../docs/ja/next/security-tls-authentication.html  |  30 ++--
 .../ja/next/security-tls-authentication/index.html |  30 ++--
 content/docs/ja/next/security-tls-transport.html   |  34 ++---
 .../docs/ja/next/security-tls-transport/index.html |  34 ++---
 content/docs/ja/reference-configuration.html       |   6 +-
 content/docs/ja/reference-configuration/index.html |   6 +-
 content/docs/ja/security-athenz.html               |  38 +++---
 content/docs/ja/security-athenz/index.html         |  38 +++---
 content/docs/ja/security-authorization.html        |  12 +-
 content/docs/ja/security-authorization/index.html  |  12 +-
 content/docs/ja/security-extending.html            |   4 +-
 content/docs/ja/security-extending/index.html      |   4 +-
 content/docs/ja/security-tls-authentication.html   |  30 ++--
 .../docs/ja/security-tls-authentication/index.html |  30 ++--
 content/docs/ja/security-tls-transport.html        |  34 ++---
 content/docs/ja/security-tls-transport/index.html  |  34 ++---
 .../docs/latest/adaptors/PulsarSpark/index.html    |  10 +-
 .../docs/latest/adaptors/PulsarStorm/index.html    |   8 +-
 content/docs/latest/admin-api/overview/index.html  |  18 +--
 content/docs/latest/clients/Cpp/index.html         |   8 +-
 content/docs/latest/clients/Java/index.html        |  16 +--
 content/docs/latest/clients/Python/index.html      |  10 +-
 content/docs/latest/clients/WebSocket/index.html   |   8 +-
 content/docs/latest/clients/go/index.html          |   6 +-
 .../docs/latest/cookbooks/Encryption/index.html    |   6 +-
 .../latest/cookbooks/PartitionedTopics/index.html  |  16 +--
 .../latest/cookbooks/RetentionExpiry/index.html    |  16 +--
 .../docs/latest/cookbooks/compaction/index.html    |   8 +-
 .../cookbooks/message-deduplication/index.html     |  12 +-
 .../docs/latest/cookbooks/message-queue/index.html |  16 +--
 .../latest/cookbooks/tiered-storage/index.html     |   6 +-
 .../docs/latest/deployment/Kubernetes/index.html   |   4 +-
 .../docs/latest/deployment/aws-cluster/index.html  |   6 +-
 content/docs/latest/deployment/cluster/index.html  |   6 +-
 content/docs/latest/deployment/instance/index.html |   6 +-
 .../ConceptsAndArchitecture/index.html             |   4 +-
 .../latest/getting-started/LocalCluster/index.html |   4 +-
 .../latest/getting-started/Pulsar-2.0/index.html   |   2 +-
 .../docs/latest/getting-started/docker/index.html  |   4 +-
 .../docs/latest/project/BinaryProtocol/index.html  |   4 +-
 content/docs/latest/project/CompileCpp/index.html  |   8 +-
 .../docs/latest/project/SimulationTools/index.html |   2 +-
 .../docs/latest/project/schema-storage/index.html  |   4 +-
 content/docs/latest/reference/CliTools/index.html  |  22 +--
 content/docs/latest/reference/RestApi/index.html   | 152 +++++++++++++++++++++
 .../docs/latest/security/authorization/index.html  |  14 +-
 content/docs/latest/security/encryption/index.html |   6 +-
 .../administration-load-distribution.html          |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 .../2.1.0-incubating/administration-zk-bk.html     |  68 ++++-----
 .../administration-zk-bk/index.html                |  68 ++++-----
 .../client-libraries-websocket.html                |   8 +-
 .../client-libraries-websocket/index.html          |   8 +-
 .../deploy-bare-metal-multi-cluster.html           |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 .../zh-CN/2.1.0-incubating/deploy-bare-metal.html  |  18 +--
 .../2.1.0-incubating/deploy-bare-metal/index.html  |  18 +--
 .../2.1.0-incubating/reference-configuration.html  |   6 +-
 .../reference-configuration/index.html             |   6 +-
 .../zh-CN/2.1.0-incubating/security-athenz.html    |  38 +++---
 .../2.1.0-incubating/security-athenz/index.html    |  38 +++---
 .../2.1.0-incubating/security-authorization.html   |  12 +-
 .../security-authorization/index.html              |  12 +-
 .../zh-CN/2.1.0-incubating/security-extending.html |   4 +-
 .../2.1.0-incubating/security-extending/index.html |   4 +-
 .../security-tls-authentication.html               |  30 ++--
 .../security-tls-authentication/index.html         |  30 ++--
 .../2.1.0-incubating/security-tls-transport.html   |  34 ++---
 .../security-tls-transport/index.html              |  34 ++---
 .../zh-CN/administration-load-distribution.html    |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 content/docs/zh-CN/administration-zk-bk.html       |  68 ++++-----
 content/docs/zh-CN/administration-zk-bk/index.html |  68 ++++-----
 content/docs/zh-CN/client-libraries-websocket.html |   8 +-
 .../zh-CN/client-libraries-websocket/index.html    |   8 +-
 .../zh-CN/deploy-bare-metal-multi-cluster.html     |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 content/docs/zh-CN/deploy-bare-metal.html          |  18 +--
 content/docs/zh-CN/deploy-bare-metal/index.html    |  18 +--
 .../next/administration-load-distribution.html     |  68 ++++-----
 .../administration-load-distribution/index.html    |  68 ++++-----
 content/docs/zh-CN/next/administration-zk-bk.html  |  68 ++++-----
 .../zh-CN/next/administration-zk-bk/index.html     |  68 ++++-----
 .../zh-CN/next/client-libraries-websocket.html     |   8 +-
 .../next/client-libraries-websocket/index.html     |   8 +-
 .../next/deploy-bare-metal-multi-cluster.html      |  70 +++++-----
 .../deploy-bare-metal-multi-cluster/index.html     |  70 +++++-----
 content/docs/zh-CN/next/deploy-bare-metal.html     |  18 +--
 .../docs/zh-CN/next/deploy-bare-metal/index.html   |  18 +--
 .../docs/zh-CN/next/reference-configuration.html   |   6 +-
 .../zh-CN/next/reference-configuration/index.html  |   6 +-
 content/docs/zh-CN/next/security-athenz.html       |  38 +++---
 content/docs/zh-CN/next/security-athenz/index.html |  38 +++---
 .../docs/zh-CN/next/security-authorization.html    |  12 +-
 .../zh-CN/next/security-authorization/index.html   |  12 +-
 content/docs/zh-CN/next/security-extending.html    |   4 +-
 .../docs/zh-CN/next/security-extending/index.html  |   4 +-
 .../zh-CN/next/security-tls-authentication.html    |  30 ++--
 .../next/security-tls-authentication/index.html    |  30 ++--
 .../docs/zh-CN/next/security-tls-transport.html    |  34 ++---
 .../zh-CN/next/security-tls-transport/index.html   |  34 ++---
 content/docs/zh-CN/reference-configuration.html    |   6 +-
 .../docs/zh-CN/reference-configuration/index.html  |   6 +-
 content/docs/zh-CN/security-athenz.html            |  38 +++---
 content/docs/zh-CN/security-athenz/index.html      |  38 +++---
 content/docs/zh-CN/security-authorization.html     |  12 +-
 .../docs/zh-CN/security-authorization/index.html   |  12 +-
 content/docs/zh-CN/security-extending.html         |   4 +-
 content/docs/zh-CN/security-extending/index.html   |   4 +-
 .../docs/zh-CN/security-tls-authentication.html    |  30 ++--
 .../zh-CN/security-tls-authentication/index.html   |  30 ++--
 content/docs/zh-CN/security-tls-transport.html     |  34 ++---
 .../docs/zh-CN/security-tls-transport/index.html   |  34 ++---
 content/en/contributing.html                       |   6 +-
 content/en/contributing/index.html                 |   6 +-
 content/fr/contributing.html                       |   6 +-
 content/fr/contributing/index.html                 |   6 +-
 content/ja/adaptors/PulsarSpark/index.html         |   8 +-
 content/ja/adaptors/PulsarStorm/index.html         |   6 +-
 content/ja/admin/AdminInterface/index.html         |  12 +-
 content/ja/admin/Authz/index.html                  |  12 +-
 content/ja/admin/ClustersBrokers/index.html        |   6 +-
 content/ja/admin/PropertiesNamespaces/index.html   |   6 +-
 content/ja/advanced/PartitionedTopics/index.html   |  12 +-
 content/ja/advanced/RetentionExpiry/index.html     |  12 +-
 content/ja/clients/Cpp/index.html                  |   6 +-
 content/ja/clients/Java/index.html                 |   8 +-
 content/ja/clients/Python/index.html               |   8 +-
 content/ja/clients/WebSocket/index.html            |   8 +-
 content/ja/contributing.html                       |   6 +-
 content/ja/contributing/index.html                 |   6 +-
 content/ja/deployment/InstanceSetup/index.html     |   6 +-
 content/ja/deployment/Kubernetes/index.html        |   4 +-
 .../ConceptsAndArchitecture/index.html             |   2 +-
 content/ja/getting-started/LocalCluster/index.html |   4 +-
 content/ja/project/BinaryProtocol/index.html       |   4 +-
 content/ja/project/SimulationTools/index.html      |   2 +-
 content/ja/reference/CliTools/index.html           |  18 +--
 content/ja/reference/RestApi/index.html            | 152 +++++++++++++++++++++
 content/swagger/swagger.json                       | 127 +++++++++++++----
 content/zh-CN/contributing.html                    |   6 +-
 content/zh-CN/contributing/index.html              |   6 +-
 375 files changed, 5261 insertions(+), 4735 deletions(-)

diff --git a/content/api/admin/allclasses-frame.html b/content/api/admin/allclasses-frame.html
index 14f1a30..2c77df0 100644
--- a/content/api/admin/allclasses-frame.html
+++ b/content/api/admin/allclasses-frame.html
@@ -80,6 +80,7 @@
 <li><a href="org/apache/pulsar/common/policies/data/ResourceQuota.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">ResourceQuota</a></li>
 <li><a href="org/apache/pulsar/client/admin/ResourceQuotas.html" title="interface in org.apache.pulsar.client.admin" target="classFrame"><span class="interfaceName">ResourceQuotas</span></a></li>
 <li><a href="org/apache/pulsar/common/policies/data/RetentionPolicies.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">RetentionPolicies</a></li>
+<li><a href="org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data" target="classFrame">SchemaAutoUpdateCompatibilityStrategy</a></li>
 <li><a href="org/apache/pulsar/client/admin/Schemas.html" title="interface in org.apache.pulsar.client.admin" target="classFrame"><span class="interfaceName">Schemas</span></a></li>
 <li><a href="org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data" target="classFrame">SubscriptionAuthMode</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/SubscriptionStats.html" title="class in org.apache.pulsar.common.policies.data" target="classFrame">SubscriptionStats</a></li>
diff --git a/content/api/admin/allclasses-noframe.html b/content/api/admin/allclasses-noframe.html
index 516727f..438a78a 100644
--- a/content/api/admin/allclasses-noframe.html
+++ b/content/api/admin/allclasses-noframe.html
@@ -80,6 +80,7 @@
 <li><a href="org/apache/pulsar/common/policies/data/ResourceQuota.html" title="class in org.apache.pulsar.common.policies.data">ResourceQuota</a></li>
 <li><a href="org/apache/pulsar/client/admin/ResourceQuotas.html" title="interface in org.apache.pulsar.client.admin"><span class="interfaceName">ResourceQuotas</span></a></li>
 <li><a href="org/apache/pulsar/common/policies/data/RetentionPolicies.html" title="class in org.apache.pulsar.common.policies.data">RetentionPolicies</a></li>
+<li><a href="org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a></li>
 <li><a href="org/apache/pulsar/client/admin/Schemas.html" title="interface in org.apache.pulsar.client.admin"><span class="interfaceName">Schemas</span></a></li>
 <li><a href="org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a></li>
 <li><a href="org/apache/pulsar/common/policies/data/SubscriptionStats.html" title="class in org.apache.pulsar.common.policies.data">SubscriptionStats</a></li>
diff --git a/content/api/admin/index-all.html b/content/api/admin/index-all.html
index 349209a..cb02cc7 100644
--- a/content/api/admin/index-all.html
+++ b/content/api/admin/index-all.html
@@ -1107,6 +1107,11 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/RetentionPolicies.html#getRetentionTimeInMinutes--">getRetentionTimeInMinutes()</a></span> - Method in class org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/RetentionPolicies.html" title="class in org.apache.pulsar.common.policies.data">RetentionPolicies</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#getSchemaAutoUpdateCompatibilityStrategy-java.lang.String-">getSchemaAutoUpdateCompatibilityStrategy(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 the strategy used to check the a new schema provided by a producer is compatible with the current schema
+ before it is installed.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Schemas.html#getSchemaInfo-java.lang.String-">getSchemaInfo(String)</a></span> - Method in interface org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/Schemas.html" title="interface in org.apache.pulsar.client.admin">Schemas</a></dt>
 <dd>
 <div class="block">Retrieve the latest schema of a topic.</div>
@@ -1860,6 +1865,12 @@
 </a>
 <h2 class="title">S</h2>
 <dl>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/Policies.html#schema_auto_update_compatibility_strategy">schema_auto_update_compatibility_strategy</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><a href="org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">SchemaAutoUpdateCompatibilityStrategy</span></a> - Enum in <a href="org/apache/pulsar/common/policies/data/package-summary.html">org.apache.pulsar.common.policies.data</a></dt>
+<dd>
+<div class="block">Strategy to use when checking an auto-updated schema for compatibility to the current schema.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/PulsarAdmin.html#schemas--">schemas()</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><a href="org/apache/pulsar/client/admin/Schemas.html" title="interface in org.apache.pulsar.client.admin"><span class="typeNameLink">Schemas</span></a> - Interface in <a href="org/apache/pulsar/client/admin/package-summary.html">org.apache.pulsar.client.admin</a></dt>
@@ -2012,6 +2023,11 @@
 <dd>
 <div class="block">Set the retention configuration for all the topics on a namespace.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/pulsar/client/admin/Namespaces.html#setSchemaAutoUpdateCompatibilityStrategy-java.lang.String-org.apache.pulsar.common.policies.data.SchemaAutoUpdateCompatibilityStrategy-">setSchemaAutoUpdateCompatibilityStrategy(String, SchemaAutoUpdateCompatibilityStrategy)</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">Names [...]
+<dd>
+<div class="block">Set the strategy used to check the a new schema provided by a producer is compatible with the current schema
+ before it is installed.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/pulsar/common/policies/data/ClusterData.html#setServiceUrl-java.lang.String-">setServiceUrl(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#setServiceUrlTls-java.lang.String-">setServiceUrlTls(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>
@@ -2361,6 +2377,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/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</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/common/policies/data/SubscriptionAuthMode.html#valueOf-java.lang.String-">valueOf(String)</a></span> - Static method in enum org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
@@ -2395,6 +2415,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/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#values--">values()</a></span> - Static method in enum org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</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/common/policies/data/SubscriptionAuthMode.html#values--">values()</a></span> - Static method in enum org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
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 ffd6462..1bfc16c 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":38,"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,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":6,"i51":6,"i52":6,"i53":6,"i54":6,"i55":6,"i56":6,"i57":6,"i58":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":38,"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,"i42":6,"i43":6,"i44":6,"i45":6,"i46":6,"i47":6,"i48":6,"i49":6,"i50":6,"i51":6,"i52":6,"i53":6,"i54":6,"i55":6,"i56":6,"i57":6,"i58":6,"i59":6,"i60":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],32:["t6","Deprecated Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -324,18 +324,25 @@ var activeTableTab = "activeTableTab";
 </td>
 </tr>
 <tr id="i32" class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/pulsar/client/admin/Namespaces.html#getSchemaAutoUpdateCompatibilityStrategy-java.lang.String-">getSchemaAutoUpdateCompatibilityStrategy</a></span>(String&nbsp;namespace)</code>
+<div class="block">Get the strategy used to check the a new schema provided by a producer is compatible with the current schema
+ before it is installed.</div>
+</td>
+</tr>
+<tr id="i33" 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#getSubscriptionDispatchRate-java.lang.String-">getSubscriptionDispatchRate</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get subscription-message-dispatch-rate (subscriptions under this namespace can dispatch this many messages per second)</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i34" 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#getTopics-java.lang.String-">getTopics</a></span>(String&nbsp;namespace)</code>
 <div class="block">Get the list of topics.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<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#grantPermissionOnNamespace-java.lang.String-java.lang.String-java.util.Set-">grantPermissionOnNamespace</a></span>(String&nbsp;namespace,
                           String&nbsp;role,
@@ -343,97 +350,97 @@ var activeTableTab = "activeTableTab";
 <div class="block">Grant permission on a namespace.</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<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#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="i36" class="altColor">
+<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#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="i37" class="rowColor">
+<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#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 topics on a namespace.</div>
 </td>
 </tr>
-<tr id="i38" class="altColor">
+<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#setCompactionThreshold-java.lang.String-long-">setCompactionThreshold</a></span>(String&nbsp;namespace,
                       long&nbsp;compactionThreshold)</code>
 <div class="block">Set the compactionThreshold for a namespace.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<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#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="i40" class="altColor">
+<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#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="i41" class="rowColor">
+<tr id="i42" 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="i42" class="altColor">
+<tr id="i43" 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#setMaxConsumersPerSubscription-java.lang.String-int-">setMaxConsumersPerSubscription</a></span>(String&nbsp;namespace,
                               int&nbsp;maxConsumersPerSubscription)</code>
 <div class="block">Set maxConsumersPerSubscription for a namespace.</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i44" 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#setMaxConsumersPerTopic-java.lang.String-int-">setMaxConsumersPerTopic</a></span>(String&nbsp;namespace,
                        int&nbsp;maxConsumersPerTopic)</code>
 <div class="block">Set maxConsumersPerTopic for a namespace.</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i45" 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#setMaxProducersPerTopic-java.lang.String-int-">setMaxProducersPerTopic</a></span>(String&nbsp;namespace,
                        int&nbsp;maxProducersPerTopic)</code>
 <div class="block">Set maxProducersPerTopic for a namespace.</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i46" 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#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="i46" class="altColor">
+<tr id="i47" 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#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="i47" class="rowColor">
+<tr id="i48" 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#setNamespaceReplicationClusters-java.lang.String-java.util.Set-">setNamespaceReplicationClusters</a></span>(String&nbsp;namespace,
                                Set&lt;String&gt;&nbsp;clusterIds)</code>
 <div class="block">Set the replication clusters for a namespace.</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i49" 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#setOffloadDeleteLag-java.lang.String-long-java.util.concurrent.TimeUnit-">setOffloadDeleteLag</a></span>(String&nbsp;namespace,
                    long&nbsp;lag,
@@ -441,42 +448,50 @@ var activeTableTab = "activeTableTab";
 <div class="block">Set the offload deletion lag for a namespace.</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i50" 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#setOffloadThreshold-java.lang.String-long-">setOffloadThreshold</a></span>(String&nbsp;namespace,
                    long&nbsp;compactionThreshold)</code>
 <div class="block">Set the offloadThreshold for a namespace.</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i51" 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#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 topics on a namespace.</div>
 </td>
 </tr>
-<tr id="i51" class="rowColor">
+<tr id="i52" 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#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 topics on a namespace.</div>
 </td>
 </tr>
-<tr id="i52" class="altColor">
+<tr id="i53" 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#setSchemaAutoUpdateCompatibilityStrategy-java.lang.String-org.apache.pulsar.common.policies.data.SchemaAutoUpdateCompatibilityStrategy-">setSchemaAutoUpdateCompatibilityStrategy</a></span>(String&nbsp;namespace,
+                                        <a href="../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a>&nbsp;strategy)</code>
+<div class="block">Set the strategy used to check the a new schema provided by a producer is compatible with the current schema
+ before it is installed.</div>
+</td>
+</tr>
+<tr id="i54" 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 topics on a namespace</div>
 </td>
 </tr>
-<tr id="i53" class="rowColor">
+<tr id="i55" 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#setSubscriptionDispatchRate-java.lang.String-org.apache.pulsar.common.policies.data.DispatchRate-">setSubscriptionDispatchRate</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 subscription-message-dispatch-rate (subscriptions under this namespace can dispatch this many messages per second)</div>
 </td>
 </tr>
-<tr id="i54" class="altColor">
+<tr id="i56" 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#splitNamespaceBundle-java.lang.String-java.lang.String-boolean-">splitNamespaceBundle</a></span>(String&nbsp;namespace,
                     String&nbsp;bundle,
@@ -484,27 +499,27 @@ var activeTableTab = "activeTableTab";
 <div class="block">Split namespace bundle</div>
 </td>
 </tr>
-<tr id="i55" class="rowColor">
+<tr id="i57" 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#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="i56" class="altColor">
+<tr id="i58" 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#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="i57" class="rowColor">
+<tr id="i59" 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#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 topics on a namespace</div>
 </td>
 </tr>
-<tr id="i58" class="altColor">
+<tr id="i60" 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#unsubscribeNamespaceBundle-java.lang.String-java.lang.String-java.lang.String-">unsubscribeNamespaceBundle</a></span>(String&nbsp;namespace,
                           String&nbsp;bundle,
@@ -2032,7 +2047,7 @@ List&lt;String&gt;&nbsp;getNamespaces(String&nbsp;tenant,
 <a name="clearOffloadDeleteLag-java.lang.String-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>clearOffloadDeleteLag</h4>
 <pre>void&nbsp;clearOffloadDeleteLag(String&nbsp;namespace)
@@ -2048,6 +2063,57 @@ List&lt;String&gt;&nbsp;getNamespaces(String&nbsp;tenant,
 </dl>
 </li>
 </ul>
+<a name="getSchemaAutoUpdateCompatibilityStrategy-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSchemaAutoUpdateCompatibilityStrategy</h4>
+<pre><a href="../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a>&nbsp;getSchemaAutoUpdateCompatibilityStrategy(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 the strategy used to check the a new schema provided by a producer is compatible with the current schema
+ before it is installed.
+
+ <p>If this is
+ <a href="../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#AutoUpdateDisabled"><code>SchemaAutoUpdateCompatibilityStrategy.AutoUpdateDisabled</code></a>,
+ then all new schemas provided via the producer are rejected, and schemas must be updated through the REST api.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - The namespace in whose policy we are interested</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the strategy used to check compatibility</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="setSchemaAutoUpdateCompatibilityStrategy-java.lang.String-org.apache.pulsar.common.policies.data.SchemaAutoUpdateCompatibilityStrategy-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setSchemaAutoUpdateCompatibilityStrategy</h4>
+<pre>void&nbsp;setSchemaAutoUpdateCompatibilityStrategy(String&nbsp;namespace,
+                                              <a href="../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a>&nbsp;strategy)
+                                       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 the strategy used to check the a new schema provided by a producer is compatible with the current schema
+ before it is installed.
+
+ <p>To disable all new schema updates through the producer, set this to
+ <a href="../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#AutoUpdateDisabled"><code>SchemaAutoUpdateCompatibilityStrategy.AutoUpdateDisabled</code></a>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>namespace</code> - The namespace in whose policy should be set</dd>
+<dd><code>autoUpdate</code> - true if connecting producers can automatically update the schema, false otherwise</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>
 </li>
 </ul>
 </li>
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 f5493bf..fd05db7 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
@@ -212,10 +212,14 @@ extends Object</pre>
 <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="rowColor">
+<td class="colFirst"><code><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/Policies.html#schema_auto_update_compatibility_strategy">schema_auto_update_compatibility_strategy</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <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>
-<tr class="altColor">
+<tr class="rowColor">
 <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#subscriptionDispatchRate">subscriptionDispatchRate</a></span></code>&nbsp;</td>
 </tr>
@@ -494,12 +498,21 @@ extends Object</pre>
 <a name="offload_deletion_lag_ms">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>offload_deletion_lag_ms</h4>
 <pre>public&nbsp;Long offload_deletion_lag_ms</pre>
 </li>
 </ul>
+<a name="schema_auto_update_compatibility_strategy">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>schema_auto_update_compatibility_strategy</h4>
+<pre>public&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a> schema_auto_update_compatibility_strategy</pre>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/RetentionPolicies.html b/content/api/admin/org/apache/pulsar/common/policies/data/RetentionPolicies.html
index f24ee12..c8415e8 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/RetentionPolicies.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/RetentionPolicies.html
@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/ResourceQuota.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/SubscriptionAuthMode.html" title="enum 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/SchemaAutoUpdateCompatibilityStrategy.html" title="enum 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/RetentionPolicies.html" target="_top">Frames</a></li>
@@ -302,7 +302,7 @@ extends Object</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/ResourceQuota.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/SubscriptionAuthMode.html" title="enum 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/SchemaAutoUpdateCompatibilityStrategy.html" title="enum 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/RetentionPolicies.html" target="_top">Frames</a></li>
diff --git a/content/api/admin/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html b/content/api/admin/org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html
similarity index 64%
copy from content/api/admin/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html
copy to content/api/admin/org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html
index 9eae8fc..9a4608f 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>SubscriptionAuthMode (Pulsar Admin Java API)</title>
+<title>SchemaAutoUpdateCompatibilityStrategy (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,7 +11,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="SubscriptionAuthMode (Pulsar Admin Java API)";
+            parent.document.title="SchemaAutoUpdateCompatibilityStrategy (Pulsar Admin Java API)";
         }
     }
     catch(err) {
@@ -48,11 +48,11 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.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/SubscriptionStats.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/SubscriptionAuthMode.html" title="enum 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/SubscriptionAuthMode.html" target="_top">Frames</a></li>
-<li><a href="SubscriptionAuthMode.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" target="_top">Frames</a></li>
+<li><a href="SchemaAutoUpdateCompatibilityStrategy.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.common.policies.data</div>
-<h2 title="Enum SubscriptionAuthMode" class="title">Enum SubscriptionAuthMode</h2>
+<h2 title="Enum SchemaAutoUpdateCompatibilityStrategy" class="title">Enum SchemaAutoUpdateCompatibilityStrategy</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
 <li>Object</li>
 <li>
 <ul class="inheritance">
-<li>Enum&lt;<a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a>&gt;</li>
+<li>Enum&lt;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>org.apache.pulsar.common.policies.data.SubscriptionAuthMode</li>
+<li>org.apache.pulsar.common.policies.data.SchemaAutoUpdateCompatibilityStrategy</li>
 </ul>
 </li>
 </ul>
@@ -112,13 +112,13 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>Serializable, Comparable&lt;<a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a>&gt;</dd>
+<dd>Serializable, Comparable&lt;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a>&gt;</dd>
 </dl>
 <hr>
 <br>
-<pre>public enum <span class="typeNameLabel">SubscriptionAuthMode</span>
-extends Enum&lt;<a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a>&gt;</pre>
-<div class="block">Subscription authorization for Pulsar policies</div>
+<pre>public enum <span class="typeNameLabel">SchemaAutoUpdateCompatibilityStrategy</span>
+extends Enum&lt;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a>&gt;</pre>
+<div class="block">Strategy to use when checking an auto-updated schema for compatibility to the current schema.</div>
 </li>
 </ul>
 </div>
@@ -137,13 +137,23 @@ extends Enum&lt;<a href="../../../../../../org/apache/pulsar/common/policies/dat
 <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/common/policies/data/SubscriptionAuthMode.html#None">None</a></span></code>
-<div class="block">Every subscription name can be used by every role</div>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#AutoUpdateDisabled">AutoUpdateDisabled</a></span></code>
+<div class="block">Don't allow any auto updates.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html#Prefix">Prefix</a></span></code>
-<div class="block">Subscription name with auth role prefix can be used by the role</div>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#Backward">Backward</a></span></code>
+<div class="block">Messages written in the previous schema can be read by the new schema.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#Forward">Forward</a></span></code>
+<div class="block">Messages written in the new schema can be read by the previous schema.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html#Full">Full</a></span></code>
+<div class="block">Backward and Forward.</div>
 </td>
 </tr>
 </table>
@@ -162,14 +172,14 @@ extends Enum&lt;<a href="../../../../../../org/apache/pulsar/common/policies/dat
 <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/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/SubscriptionAuthMode.html#valueOf-java.lang.String-">valueOf</a></span>(String&nbsp;name)</code>
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.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/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/SubscriptionAuthMode.html#values--">values</a></span>()</code>
+<td class="colFirst"><code>static <a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a>[]</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.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>
@@ -203,24 +213,48 @@ the order they are declared.</div>
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
-<a name="None">
+<a name="AutoUpdateDisabled">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>AutoUpdateDisabled</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a> AutoUpdateDisabled</pre>
+<div class="block">Don't allow any auto updates.</div>
+</li>
+</ul>
+<a name="Backward">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Backward</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a> Backward</pre>
+<div class="block">Messages written in the previous schema can be read by the new schema.
+ To be backward compatible, the new schema must not add any new fields that
+ don't have default values. However, it may remove fields.</div>
+</li>
+</ul>
+<a name="Forward">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>None</h4>
-<pre>public static final&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a> None</pre>
-<div class="block">Every subscription name can be used by every role</div>
+<h4>Forward</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a> Forward</pre>
+<div class="block">Messages written in the new schema can be read by the previous schema.
+ To be forward compatible, the new schema must not remove any fields which
+ don't have default values in the previous schema. However, it may add new fields.</div>
 </li>
 </ul>
-<a name="Prefix">
+<a name="Full">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>Prefix</h4>
-<pre>public static final&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a> Prefix</pre>
-<div class="block">Subscription name with auth role prefix can be used by the role</div>
+<h4>Full</h4>
+<pre>public static final&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a> Full</pre>
+<div class="block">Backward and Forward.</div>
 </li>
 </ul>
 </li>
@@ -237,12 +271,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/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a>[]&nbsp;values()</pre>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</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 (SubscriptionAuthMode c : SubscriptionAuthMode.values())
+for (SchemaAutoUpdateCompatibilityStrategy c : SchemaAutoUpdateCompatibilityStrategy.values())
 &nbsp;   System.out.println(c);
 </pre></div>
 <dl>
@@ -257,7 +291,7 @@ for (SubscriptionAuthMode c : SubscriptionAuthMode.values())
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a>&nbsp;valueOf(String&nbsp;name)</pre>
+<pre>public static&nbsp;<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</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 
@@ -301,11 +335,11 @@ not permitted.)</div>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.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/SubscriptionStats.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/SubscriptionAuthMode.html" title="enum 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/SubscriptionAuthMode.html" target="_top">Frames</a></li>
-<li><a href="SubscriptionAuthMode.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../../index.html?org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" target="_top">Frames</a></li>
+<li><a href="SchemaAutoUpdateCompatibilityStrategy.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/SubscriptionAuthMode.html b/content/api/admin/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html
index 9eae8fc..b436c89 100644
--- a/content/api/admin/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html
+++ b/content/api/admin/org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html
@@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.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/SchemaAutoUpdateCompatibilityStrategy.html" title="enum 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/SubscriptionStats.html" title="class in org.apache.pulsar.common.policies.data"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -300,7 +300,7 @@ not permitted.)</div>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../../org/apache/pulsar/common/policies/data/RetentionPolicies.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/SchemaAutoUpdateCompatibilityStrategy.html" title="enum 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/SubscriptionStats.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/package-frame.html b/content/api/admin/org/apache/pulsar/common/policies/data/package-frame.html
index 4f1db13..cefcc76 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
@@ -55,6 +55,7 @@
 <li><a href="BacklogQuota.BacklogQuotaType.html" title="enum in org.apache.pulsar.common.policies.data" target="classFrame">BacklogQuota.BacklogQuotaType</a></li>
 <li><a href="BacklogQuota.RetentionPolicy.html" title="enum in org.apache.pulsar.common.policies.data" target="classFrame">BacklogQuota.RetentionPolicy</a></li>
 <li><a href="BrokerAssignment.html" title="enum in org.apache.pulsar.common.policies.data" target="classFrame">BrokerAssignment</a></li>
+<li><a href="SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data" target="classFrame">SchemaAutoUpdateCompatibilityStrategy</a></li>
 <li><a href="SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data" target="classFrame">SubscriptionAuthMode</a></li>
 </ul>
 </div>
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 37469d5..777e440 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
@@ -266,6 +266,12 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data">SchemaAutoUpdateCompatibilityStrategy</a></td>
+<td class="colLast">
+<div class="block">Strategy to use when checking an auto-updated schema for compatibility to the current schema.</div>
+</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data">SubscriptionAuthMode</a></td>
 <td class="colLast">
 <div class="block">Subscription authorization for Pulsar policies</div>
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 81b03c3..cb8aad5 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
@@ -150,6 +150,7 @@
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/BacklogQuota.BacklogQuotaType.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">BacklogQuota.BacklogQuotaType</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/BacklogQuota.RetentionPolicy.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">BacklogQuota.RetentionPolicy</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/BrokerAssignment.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">BrokerAssignment</span></a></li>
+<li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">SchemaAutoUpdateCompatibilityStrategy</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="../../../../../../org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">SubscriptionAuthMode</span></a></li>
 </ul>
 </li>
diff --git a/content/api/admin/overview-tree.html b/content/api/admin/overview-tree.html
index e9099ab..ea0f7df 100644
--- a/content/api/admin/overview-tree.html
+++ b/content/api/admin/overview-tree.html
@@ -212,6 +212,7 @@
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/BacklogQuota.RetentionPolicy.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">BacklogQuota.RetentionPolicy</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/BrokerAssignment.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">BrokerAssignment</span></a></li>
 <li type="circle">org.apache.pulsar.client.admin.<a href="org/apache/pulsar/client/admin/LongRunningProcessStatus.Status.html" title="enum in org.apache.pulsar.client.admin"><span class="typeNameLink">LongRunningProcessStatus.Status</span></a></li>
+<li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/SchemaAutoUpdateCompatibilityStrategy.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">SchemaAutoUpdateCompatibilityStrategy</span></a></li>
 <li type="circle">org.apache.pulsar.common.policies.data.<a href="org/apache/pulsar/common/policies/data/SubscriptionAuthMode.html" title="enum in org.apache.pulsar.common.policies.data"><span class="typeNameLink">SubscriptionAuthMode</span></a></li>
 </ul>
 </li>
diff --git a/content/api/python/functions/context.m.html b/content/api/python/functions/context.m.html
index 28bc060..51e3a69 100644
--- a/content/api/python/functions/context.m.html
+++ b/content/api/python/functions/context.m.html
@@ -1124,7 +1124,7 @@ class Context(object):
     pass
 
   @abstractmethod
-  def publish(self, topic_name, message, serde_class_name="serde.IdentitySerDe", properties=None):
+  def publish(self, topic_name, message, serde_class_name="serde.IdentitySerDe", properties=None, compression_type=None):
     """Publishes message to topic_name by first serializing the message using serde_class_name serde
     The message will have properties specified if any"""
     pass
@@ -1223,7 +1223,7 @@ class Context(object):
     pass
 
   @abstractmethod
-  def publish(self, topic_name, message, serde_class_name="serde.IdentitySerDe", properties=None):
+  def publish(self, topic_name, message, serde_class_name="serde.IdentitySerDe", properties=None, compression_type=None):
     """Publishes message to topic_name by first serializing the message using serde_class_name serde
     The message will have properties specified if any"""
     pass
@@ -1578,7 +1578,7 @@ def get_user_config_value(self, key):
             
   <div class="item">
     <div class="name def" id="pulsar.functions.context.Context.publish">
-    <p>def <span class="ident">publish</span>(</p><p>self, topic_name, message, serde_class_name=&#39;serde.IdentitySerDe&#39;, properties=None)</p>
+    <p>def <span class="ident">publish</span>(</p><p>self, topic_name, message, serde_class_name=&#39;serde.IdentitySerDe&#39;, properties=None, compression_type=None)</p>
     </div>
     
 
@@ -1590,7 +1590,7 @@ The message will have properties specified if any</p></div>
   <p class="source_link"><a href="javascript:void(0);" onclick="toggle('source-pulsar.functions.context.Context.publish', this);">Show source &equiv;</a></p>
   <div id="source-pulsar.functions.context.Context.publish" class="source">
     <pre><code>@abstractmethod
-def publish(self, topic_name, message, serde_class_name="serde.IdentitySerDe", properties=None):
+def publish(self, topic_name, message, serde_class_name="serde.IdentitySerDe", properties=None, compression_type=None):
   """Publishes message to topic_name by first serializing the message using serde_class_name serde
   The message will have properties specified if any"""
   pass
diff --git a/content/contributing.html b/content/contributing.html
index 3b6e062..6562619 100644
--- a/content/contributing.html
+++ b/content/contributing.html
@@ -159,14 +159,14 @@ license header. You can add license header to your files by running following co
 <h3><a class="anchor" aria-hidden="true" id="develop-c-python-client"></a><a href="#develop-c-python-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Currently C++ and Python client are developed under <code>pulsar-client-cpp</code> directory. You can use following commands to build and test your c++ or python code changes.</p>
 <h4><a class="anchor" aria-hidden="true" id="build-c-python-client"></a><a href="#build-c-python-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> ./pulsar-client-cpp/docker-build.sh</span>
+<pre><code class="hljs">$ ./pulsar-client-cpp/docker-build<span class="hljs-selector-class">.sh</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="run-c-python-client-tests"></a><a href="#run-c-python-client-tests" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> ./pulsar-client-cpp/docker-test.sh</span>
+<pre><code class="hljs">$ ./pulsar-client-cpp/docker-<span class="hljs-keyword">test</span>.<span class="hljs-keyword">sh</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="checkstyle"></a><a href="#checkstyle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>Before you push the C++/Python changes for review, you should format the files to apply the checkstyle rule Pulsar is using for C++/Python code.</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> ./pulsar-client-cpp/docker-format.sh</span>
+<pre><code class="hljs">$ ./pulsar-client-cpp/docker-<span class="hljs-keyword">format</span>.<span class="hljs-keyword">sh</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="review"></a><a href="#review" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <p>Once the initial code is complete and the tests pass, it’s time to start the code review process. We review and discuss all code, no matter who authors it. It’s a great way to build community, since you can learn from other developers, and they become familiar with your contribution. It also builds a strong project by encouraging a high quality bar and keeping code consistent throughout the project.</p>
diff --git a/content/contributing/index.html b/content/contributing/index.html
index 3b6e062..6562619 100644
--- a/content/contributing/index.html
+++ b/content/contributing/index.html
@@ -159,14 +159,14 @@ license header. You can add license header to your files by running following co
 <h3><a class="anchor" aria-hidden="true" id="develop-c-python-client"></a><a href="#develop-c-python-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Currently C++ and Python client are developed under <code>pulsar-client-cpp</code> directory. You can use following commands to build and test your c++ or python code changes.</p>
 <h4><a class="anchor" aria-hidden="true" id="build-c-python-client"></a><a href="#build-c-python-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> ./pulsar-client-cpp/docker-build.sh</span>
+<pre><code class="hljs">$ ./pulsar-client-cpp/docker-build<span class="hljs-selector-class">.sh</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="run-c-python-client-tests"></a><a href="#run-c-python-client-tests" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> ./pulsar-client-cpp/docker-test.sh</span>
+<pre><code class="hljs">$ ./pulsar-client-cpp/docker-<span class="hljs-keyword">test</span>.<span class="hljs-keyword">sh</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="checkstyle"></a><a href="#checkstyle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>Before you push the C++/Python changes for review, you should format the files to apply the checkstyle rule Pulsar is using for C++/Python code.</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> ./pulsar-client-cpp/docker-format.sh</span>
+<pre><code class="hljs">$ ./pulsar-client-cpp/docker-<span class="hljs-keyword">format</span>.<span class="hljs-keyword">sh</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="review"></a><a href="#review" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <p>Once the initial code is complete and the tests pass, it’s time to start the code review process. We review and discuss all code, no matter who authors it. It’s a great way to build community, since you can learn from other developers, and they become familiar with your contribution. It also builds a strong project by encouraging a high quality bar and keeping code consistent throughout the project.</p>
diff --git a/content/docs/en/2.1.0-incubating/admin-api-clusters.html b/content/docs/en/2.1.0-incubating/admin-api-clusters.html
index 740b44b..875c7f8 100644
--- a/content/docs/en/2.1.0-incubating/admin-api-clusters.html
+++ b/content/docs/en/2.1.0-incubating/admin-api-clusters.html
@@ -150,7 +150,7 @@ admin.clusters().updateCluster(clusterName, clusterData);
 <p>Clusters can be deleted from a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-3"></a><a href="#pulsar-admin-3" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/2.1.0-incubating/pulsar-admin#clusters-delete"><code>delete</code></a> subcommand and specify the name of the cluster.</p>
-<pre><code class="hljs">$ pulsar-admin clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-2"></a><a href="#rest-api-2" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/deleteCluster"><b>DELETE</b> <i>/admin/v2/clusters/:cluster</i></a>
@@ -176,7 +176,7 @@ cluster-2
 <p>Peer clusters can be configured for a given cluster in a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-5"></a><a href="#pulsar-admin-5" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/2.1.0-incubating/pulsar-admin#clusters-update-peer-clusters"><code>update-peer-clusters</code></a> subcommand and specify the list of peer-cluster names.</p>
-<pre><code class="hljs">$ pulsar-admin <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> --peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-2</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> <span class="hljs-comment">--peer-clusters cluster-2</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-4"></a><a href="#rest-api-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/setPeerClusterNames"><b>POST</b> <i>/admin/v2/clusters/:cluster/peers</i></a>
diff --git a/content/docs/en/2.1.0-incubating/admin-api-clusters/index.html b/content/docs/en/2.1.0-incubating/admin-api-clusters/index.html
index 740b44b..875c7f8 100644
--- a/content/docs/en/2.1.0-incubating/admin-api-clusters/index.html
+++ b/content/docs/en/2.1.0-incubating/admin-api-clusters/index.html
@@ -150,7 +150,7 @@ admin.clusters().updateCluster(clusterName, clusterData);
 <p>Clusters can be deleted from a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-3"></a><a href="#pulsar-admin-3" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/2.1.0-incubating/pulsar-admin#clusters-delete"><code>delete</code></a> subcommand and specify the name of the cluster.</p>
-<pre><code class="hljs">$ pulsar-admin clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-2"></a><a href="#rest-api-2" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/deleteCluster"><b>DELETE</b> <i>/admin/v2/clusters/:cluster</i></a>
@@ -176,7 +176,7 @@ cluster-2
 <p>Peer clusters can be configured for a given cluster in a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-5"></a><a href="#pulsar-admin-5" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/2.1.0-incubating/pulsar-admin#clusters-update-peer-clusters"><code>update-peer-clusters</code></a> subcommand and specify the list of peer-cluster names.</p>
-<pre><code class="hljs">$ pulsar-admin <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> --peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-2</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> <span class="hljs-comment">--peer-clusters cluster-2</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-4"></a><a href="#rest-api-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/setPeerClusterNames"><b>POST</b> <i>/admin/v2/clusters/:cluster/peers</i></a>
diff --git a/content/docs/en/2.1.0-incubating/admin-api-namespaces.html b/content/docs/en/2.1.0-incubating/admin-api-namespaces.html
index f7bb37f..a2b4699 100644
--- a/content/docs/en/2.1.0-incubating/admin-api-namespaces.html
+++ b/content/docs/en/2.1.0-incubating/admin-api-namespaces.html
@@ -194,7 +194,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="remove-backlog-quota-policies"></a><a href="#remove-backlog-quota-policies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>It removes backlog quota policies for a given namespace</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-4"></a><a href="#cli-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces remove-backlog-quota <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-keyword">remove</span>-backlog-quota <span class="hljs-keyword">test</span>-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -244,7 +244,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="unload-namespace-bundle"></a><a href="#unload-namespace-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Namespace bundle is a virtual group of topics which belong to same namespace. If broker gets overloaded with number of bundles then this command can help to unload heavy bundle from that broker, so it can be served by some other less loaded broker. Namespace bundle is defined with it’s start and end range such as 0x00000000 and 0xffffffff.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-7"></a><a href="#cli-7" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-built_in">unload</span> <span class="hljs-comment">--bundle 0x00000000_0xffffffff test-tenant/ns1</span>
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -283,7 +283,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="split-bundle"></a><a href="#split-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Each namespace bundle can contain multiple topics and each bundle can be served by only one broker. If bundle gets heavy with multiple live topics in it then it creates load on that broker and in order to resolve this issue, admin can split bundle using this command.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-10"></a><a href="#cli-10" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces split-<span class="hljs-keyword">bundle </span>--<span class="hljs-keyword">bundle </span><span class="hljs-number">0x00000000</span>_<span class="hljs-number">0xffffffff</span> test-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
diff --git a/content/docs/en/2.1.0-incubating/admin-api-namespaces/index.html b/content/docs/en/2.1.0-incubating/admin-api-namespaces/index.html
index f7bb37f..a2b4699 100644
--- a/content/docs/en/2.1.0-incubating/admin-api-namespaces/index.html
+++ b/content/docs/en/2.1.0-incubating/admin-api-namespaces/index.html
@@ -194,7 +194,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="remove-backlog-quota-policies"></a><a href="#remove-backlog-quota-policies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>It removes backlog quota policies for a given namespace</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-4"></a><a href="#cli-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces remove-backlog-quota <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-keyword">remove</span>-backlog-quota <span class="hljs-keyword">test</span>-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -244,7 +244,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="unload-namespace-bundle"></a><a href="#unload-namespace-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Namespace bundle is a virtual group of topics which belong to same namespace. If broker gets overloaded with number of bundles then this command can help to unload heavy bundle from that broker, so it can be served by some other less loaded broker. Namespace bundle is defined with it’s start and end range such as 0x00000000 and 0xffffffff.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-7"></a><a href="#cli-7" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-built_in">unload</span> <span class="hljs-comment">--bundle 0x00000000_0xffffffff test-tenant/ns1</span>
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -283,7 +283,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="split-bundle"></a><a href="#split-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Each namespace bundle can contain multiple topics and each bundle can be served by only one broker. If bundle gets heavy with multiple live topics in it then it creates load on that broker and in order to resolve this issue, admin can split bundle using this command.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-10"></a><a href="#cli-10" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces split-<span class="hljs-keyword">bundle </span>--<span class="hljs-keyword">bundle </span><span class="hljs-number">0x00000000</span>_<span class="hljs-number">0xffffffff</span> test-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
diff --git a/content/docs/en/2.1.0-incubating/admin-api-tenants.html b/content/docs/en/2.1.0-incubating/admin-api-tenants.html
index cd5c9ac..f73e1de 100644
--- a/content/docs/en/2.1.0-incubating/admin-api-tenants.html
+++ b/content/docs/en/2.1.0-incubating/admin-api-tenants.html
@@ -57,8 +57,8 @@
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin tenants list</span>
 </code></pre>
 <p>That will return a simple list, like this:</p>
-<pre><code class="hljs"><span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-1</span>
-<span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-2</span>
+<pre><code class="hljs">my-tenant<span class="hljs-number">-1</span>
+my-tenant<span class="hljs-number">-2</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="create"></a><a href="#create" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-1"></a><a href="#pulsar-admin-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
diff --git a/content/docs/en/2.1.0-incubating/admin-api-tenants/index.html b/content/docs/en/2.1.0-incubating/admin-api-tenants/index.html
index cd5c9ac..f73e1de 100644
--- a/content/docs/en/2.1.0-incubating/admin-api-tenants/index.html
+++ b/content/docs/en/2.1.0-incubating/admin-api-tenants/index.html
@@ -57,8 +57,8 @@
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin tenants list</span>
 </code></pre>
 <p>That will return a simple list, like this:</p>
-<pre><code class="hljs"><span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-1</span>
-<span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-2</span>
+<pre><code class="hljs">my-tenant<span class="hljs-number">-1</span>
+my-tenant<span class="hljs-number">-2</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="create"></a><a href="#create" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-1"></a><a href="#pulsar-admin-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
diff --git a/content/docs/en/2.1.0-incubating/administration-load-distribution.html b/content/docs/en/2.1.0-incubating/administration-load-distribution.html
index e621ee9..740174e 100644
--- a/content/docs/en/2.1.0-incubating/administration-load-distribution.html
+++ b/content/docs/en/2.1.0-incubating/administration-load-distribution.html
@@ -85,7 +85,7 @@ bundle the hash falls into.</p>
 <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -122,25 +122,25 @@ to different brokers.</p>
 of the threshold is a candidate to be split. By default the newly split bundles are also
 immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever
@@ -154,15 +154,15 @@ it will unload the percent difference plus a 5% margin: <code>(95% - 85%) + 5% =
 and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and
@@ -170,7 +170,7 @@ memory usage. Whenever either of those metrics reaches the threshold, it will tr
 (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is
@@ -180,14 +180,14 @@ NIC speed for which the OS report 10Gbps speed.</p>
 reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
 being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/2.1.0-incubating/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/2.1.0-incubating/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across [...]
diff --git a/content/docs/en/2.1.0-incubating/administration-load-distribution/index.html b/content/docs/en/2.1.0-incubating/administration-load-distribution/index.html
index e621ee9..740174e 100644
--- a/content/docs/en/2.1.0-incubating/administration-load-distribution/index.html
+++ b/content/docs/en/2.1.0-incubating/administration-load-distribution/index.html
@@ -85,7 +85,7 @@ bundle the hash falls into.</p>
 <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -122,25 +122,25 @@ to different brokers.</p>
 of the threshold is a candidate to be split. By default the newly split bundles are also
 immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever
@@ -154,15 +154,15 @@ it will unload the percent difference plus a 5% margin: <code>(95% - 85%) + 5% =
 and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and
@@ -170,7 +170,7 @@ memory usage. Whenever either of those metrics reaches the threshold, it will tr
 (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is
@@ -180,14 +180,14 @@ NIC speed for which the OS report 10Gbps speed.</p>
 reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
 being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/2.1.0-incubating/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/2.1.0-incubating/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across [...]
diff --git a/content/docs/en/2.1.0-incubating/administration-zk-bk.html b/content/docs/en/2.1.0-incubating/administration-zk-bk.html
index 9a535df..77a590d 100644
--- a/content/docs/en/2.1.0-incubating/administration-zk-bk.html
+++ b/content/docs/en/2.1.0-incubating/administration-zk-bk.html
@@ -65,9 +65,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -87,10 +87,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -110,25 +110,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -190,16 +190,16 @@ designed to use multiple devices:</p>
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required  in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/en/2.1.0-incubating/administration-zk-bk/index.html b/content/docs/en/2.1.0-incubating/administration-zk-bk/index.html
index 9a535df..77a590d 100644
--- a/content/docs/en/2.1.0-incubating/administration-zk-bk/index.html
+++ b/content/docs/en/2.1.0-incubating/administration-zk-bk/index.html
@@ -65,9 +65,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -87,10 +87,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -110,25 +110,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -190,16 +190,16 @@ designed to use multiple devices:</p>
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required  in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/en/2.1.0-incubating/client-libraries-websocket.html b/content/docs/en/2.1.0-incubating/client-libraries-websocket.html
index 4156e0a..98695bf 100644
--- a/content/docs/en/2.1.0-incubating/client-libraries-websocket.html
+++ b/content/docs/en/2.1.0-incubating/client-libraries-websocket.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/en/2.1.0-incubating/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/en/2.1.0-incubating/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/en/2.1.0-incubating/client-libraries-websocket/index.html b/content/docs/en/2.1.0-incubating/client-libraries-websocket/index.html
index 4156e0a..98695bf 100644
--- a/content/docs/en/2.1.0-incubating/client-libraries-websocket/index.html
+++ b/content/docs/en/2.1.0-incubating/client-libraries-websocket/index.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/en/2.1.0-incubating/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/en/2.1.0-incubating/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster.html b/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster.html
index 0e76af7..cf6a79f 100644
--- a/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster.html
+++ b/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster.html
@@ -122,9 +122,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -144,10 +144,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -167,25 +167,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -247,12 +247,12 @@ designed to use multiple devices:</p>
 <p>You also need to specify the name of the <a href="/docs/en/2.1.0-incubating/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -274,11 +274,11 @@ designed to use multiple devices:</p>
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/en/2.1.0-incubating/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/en/2.1.0-incubating/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/en/2.1.0-incubating/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/en/2.1.0-incubating/refere [...]
 store</a> quorum connection string.</p>
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -286,7 +286,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/en/2.1.0-incubating/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/en/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/en/2.1.0-incubating/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html b/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html
index 0e76af7..cf6a79f 100644
--- a/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html
+++ b/content/docs/en/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html
@@ -122,9 +122,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -144,10 +144,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -167,25 +167,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -247,12 +247,12 @@ designed to use multiple devices:</p>
 <p>You also need to specify the name of the <a href="/docs/en/2.1.0-incubating/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -274,11 +274,11 @@ designed to use multiple devices:</p>
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/en/2.1.0-incubating/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/en/2.1.0-incubating/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/en/2.1.0-incubating/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/en/2.1.0-incubating/refere [...]
 store</a> quorum connection string.</p>
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -286,7 +286,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/en/2.1.0-incubating/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/en/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/en/2.1.0-incubating/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/en/2.1.0-incubating/deploy-bare-metal.html b/content/docs/en/2.1.0-incubating/deploy-bare-metal.html
index ec688e3..ab9e3d3 100644
--- a/content/docs/en/2.1.0-incubating/deploy-bare-metal.html
+++ b/content/docs/en/2.1.0-incubating/deploy-bare-metal.html
@@ -168,9 +168,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -214,7 +214,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -244,11 +244,11 @@ verify all the bookies in the cluster are up running.</p>
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configura [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/en/2.1.0-incubating/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -272,8 +272,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/en/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/en/2.1.0-incubating/deploy-bare-metal/index.html b/content/docs/en/2.1.0-incubating/deploy-bare-metal/index.html
index ec688e3..ab9e3d3 100644
--- a/content/docs/en/2.1.0-incubating/deploy-bare-metal/index.html
+++ b/content/docs/en/2.1.0-incubating/deploy-bare-metal/index.html
@@ -168,9 +168,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -214,7 +214,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/en/2.1.0-incubating/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -244,11 +244,11 @@ verify all the bookies in the cluster are up running.</p>
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/en/2.1.0-incubating/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configura [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/en/2.1.0-incubating/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -272,8 +272,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/en/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/en/2.1.0-incubating/io-managing.html b/content/docs/en/2.1.0-incubating/io-managing.html
index 23dc141..b46778b 100644
--- a/content/docs/en/2.1.0-incubating/io-managing.html
+++ b/content/docs/en/2.1.0-incubating/io-managing.html
@@ -139,17 +139,17 @@ in following form:</p>
 <p>Since Pulsar IO connectors are running as <a href="functions-overiew.md">Pulsar Functions</a>, so you can use <a href="/docs/en/2.1.0-incubating/pulsar-admin#source"><code>functions</code></a> commands
 available in the <a href="/docs/en/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a> CLI tool.</p>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-metadata"></a><a href="#retrieve-connector-metadata" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions get \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">get</span> \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-running-status"></a><a href="#retrieve-connector-running-status" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions getstatus \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> getstatus \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/2.1.0-incubating/io-quickstart"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/2.1.0-incubating/io-connectors"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#using-builtin-connectors">Using Builtin Connectors</a></li><li><a href="#config [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/docs/en/2.1.0-incubating/io-managing/index.html b/content/docs/en/2.1.0-incubating/io-managing/index.html
index 23dc141..b46778b 100644
--- a/content/docs/en/2.1.0-incubating/io-managing/index.html
+++ b/content/docs/en/2.1.0-incubating/io-managing/index.html
@@ -139,17 +139,17 @@ in following form:</p>
 <p>Since Pulsar IO connectors are running as <a href="functions-overiew.md">Pulsar Functions</a>, so you can use <a href="/docs/en/2.1.0-incubating/pulsar-admin#source"><code>functions</code></a> commands
 available in the <a href="/docs/en/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a> CLI tool.</p>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-metadata"></a><a href="#retrieve-connector-metadata" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions get \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">get</span> \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-running-status"></a><a href="#retrieve-connector-running-status" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions getstatus \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> getstatus \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/2.1.0-incubating/io-quickstart"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/2.1.0-incubating/io-connectors"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#using-builtin-connectors">Using Builtin Connectors</a></li><li><a href="#config [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/docs/en/2.1.0-incubating/pulsar-admin.html b/content/docs/en/2.1.0-incubating/pulsar-admin.html
index 56aa544..70187d1 100644
--- a/content/docs/en/2.1.0-incubating/pulsar-admin.html
+++ b/content/docs/en/2.1.0-incubating/pulsar-admin.html
@@ -321,7 +321,7 @@
 <h3><a class="anchor" aria-hidden="true" id="create-1"></a><a href="#create-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>Creates a new Pulsar Function on the target infrastructure</p>
 <p>Usage</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin <span class="hljs-built_in">functions</span> create options</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">create</span> <span class="hljs-keyword">options</span>
 </code></pre>
 <p>Options</p>
 <table>
diff --git a/content/docs/en/2.1.0-incubating/pulsar-admin/index.html b/content/docs/en/2.1.0-incubating/pulsar-admin/index.html
index 56aa544..70187d1 100644
--- a/content/docs/en/2.1.0-incubating/pulsar-admin/index.html
+++ b/content/docs/en/2.1.0-incubating/pulsar-admin/index.html
@@ -321,7 +321,7 @@
 <h3><a class="anchor" aria-hidden="true" id="create-1"></a><a href="#create-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>Creates a new Pulsar Function on the target infrastructure</p>
 <p>Usage</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin <span class="hljs-built_in">functions</span> create options</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">create</span> <span class="hljs-keyword">options</span>
 </code></pre>
 <p>Options</p>
 <table>
diff --git a/content/docs/en/2.1.0-incubating/reference-configuration.html b/content/docs/en/2.1.0-incubating/reference-configuration.html
index f56ae0d..3ac6b02 100644
--- a/content/docs/en/2.1.0-incubating/reference-configuration.html
+++ b/content/docs/en/2.1.0-incubating/reference-configuration.html
@@ -498,9 +498,9 @@
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
 a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/en/2.1.0-incubating/reference-configuration/index.html b/content/docs/en/2.1.0-incubating/reference-configuration/index.html
index f56ae0d..3ac6b02 100644
--- a/content/docs/en/2.1.0-incubating/reference-configuration/index.html
+++ b/content/docs/en/2.1.0-incubating/reference-configuration/index.html
@@ -498,9 +498,9 @@
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
 a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/en/2.1.0-incubating/security-athenz.html b/content/docs/en/2.1.0-incubating/security-athenz.html
index 84d6ce9..3dd9db9 100644
--- a/content/docs/en/2.1.0-incubating/security-athenz.html
+++ b/content/docs/en/2.1.0-incubating/security-athenz.html
@@ -75,15 +75,15 @@ as it can protect role tokens from being intercepted and reused (see also <a hre
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default
@@ -98,16 +98,16 @@ values for those parameters, can be found in <a href="/docs/en/2.1.0-incubating/
 <p><a href="/docs/en/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/2.1.0-incubating/security-tls-authentication"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/2.1.0-incubating/security-authorization"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication se [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/en/2.1.0-incubating/security-athenz/index.html b/content/docs/en/2.1.0-incubating/security-athenz/index.html
index 84d6ce9..3dd9db9 100644
--- a/content/docs/en/2.1.0-incubating/security-athenz/index.html
+++ b/content/docs/en/2.1.0-incubating/security-athenz/index.html
@@ -75,15 +75,15 @@ as it can protect role tokens from being intercepted and reused (see also <a hre
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default
@@ -98,16 +98,16 @@ values for those parameters, can be found in <a href="/docs/en/2.1.0-incubating/
 <p><a href="/docs/en/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/2.1.0-incubating/security-tls-authentication"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/2.1.0-incubating/security-authorization"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication se [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/en/2.1.0-incubating/security-authorization.html b/content/docs/en/2.1.0-incubating/security-authorization.html
index 681e699..7d313dc 100644
--- a/content/docs/en/2.1.0-incubating/security-authorization.html
+++ b/content/docs/en/2.1.0-incubating/security-authorization.html
@@ -52,8 +52,8 @@ associating them with <a href="/docs/en/2.1.0-incubating/security-overview#role-
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/en/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/en/2.1.0-incubating/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -67,10 +67,10 @@ as well as the default values for those parameters, can be found in <a href="/do
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/en/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/en/2.1.0-incubating/security-authorization/index.html b/content/docs/en/2.1.0-incubating/security-authorization/index.html
index 681e699..7d313dc 100644
--- a/content/docs/en/2.1.0-incubating/security-authorization/index.html
+++ b/content/docs/en/2.1.0-incubating/security-authorization/index.html
@@ -52,8 +52,8 @@ associating them with <a href="/docs/en/2.1.0-incubating/security-overview#role-
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/en/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/en/2.1.0-incubating/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -67,10 +67,10 @@ as well as the default values for those parameters, can be found in <a href="/do
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/en/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/en/2.1.0-incubating/security-extending.html b/content/docs/en/2.1.0-incubating/security-extending.html
index 8dc9020..9d88200 100644
--- a/content/docs/en/2.1.0-incubating/security-extending.html
+++ b/content/docs/en/2.1.0-incubating/security-extending.html
@@ -78,8 +78,8 @@ type of connection or by passing a certificate chain to use for TLS.</p>
 passed by the client. Broker can support multiple authentication providers
 at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
@@ -128,8 +128,8 @@ configure a different one through a plugin.</p>
 <p>To provide a custom provider, one needs to implement the
 <code>org.apache.pulsar.broker.authorization.AuthorizationProvider</code> interface, have this class in the
 Pulsar broker classpath and configure it in <code>conf/broker.conf</code>:</p>
-<pre><code class="hljs css language-properties"># Authorization provider fully <span class="hljs-keyword">qualified</span> <span class="hljs-keyword">class</span>-name
-authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Authorization provider fully qualified class-name</span>
+<span class="hljs-attr">authorizationProvider</span>=<span class="hljs-string">org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider</span>
 </code></pre>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
  * Provider of authorization mechanism
diff --git a/content/docs/en/2.1.0-incubating/security-extending/index.html b/content/docs/en/2.1.0-incubating/security-extending/index.html
index 8dc9020..9d88200 100644
--- a/content/docs/en/2.1.0-incubating/security-extending/index.html
+++ b/content/docs/en/2.1.0-incubating/security-extending/index.html
@@ -78,8 +78,8 @@ type of connection or by passing a certificate chain to use for TLS.</p>
 passed by the client. Broker can support multiple authentication providers
 at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
@@ -128,8 +128,8 @@ configure a different one through a plugin.</p>
 <p>To provide a custom provider, one needs to implement the
 <code>org.apache.pulsar.broker.authorization.AuthorizationProvider</code> interface, have this class in the
 Pulsar broker classpath and configure it in <code>conf/broker.conf</code>:</p>
-<pre><code class="hljs css language-properties"># Authorization provider fully <span class="hljs-keyword">qualified</span> <span class="hljs-keyword">class</span>-name
-authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Authorization provider fully qualified class-name</span>
+<span class="hljs-attr">authorizationProvider</span>=<span class="hljs-string">org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider</span>
 </code></pre>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
  * Provider of authorization mechanism
diff --git a/content/docs/en/2.1.0-incubating/security-tls-authentication.html b/content/docs/en/2.1.0-incubating/security-tls-authentication.html
index 06a5f19..3a47d75 100644
--- a/content/docs/en/2.1.0-incubating/security-tls-authentication.html
+++ b/content/docs/en/2.1.0-incubating/security-tls-authentication.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/en/2.1.0-incubating/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/en/2.1.0-incubating/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/en/2.1.0-incubating/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/2.1.0-incubating/security-tls-authentication/index.html b/content/docs/en/2.1.0-incubating/security-tls-authentication/index.html
index 06a5f19..3a47d75 100644
--- a/content/docs/en/2.1.0-incubating/security-tls-authentication/index.html
+++ b/content/docs/en/2.1.0-incubating/security-tls-authentication/index.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/en/2.1.0-incubating/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/en/2.1.0-incubating/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/en/2.1.0-incubating/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/2.1.0-incubating/security-tls-transport.html b/content/docs/en/2.1.0-incubating/security-tls-transport.html
index 55f4840..ba524b0 100644
--- a/content/docs/en/2.1.0-incubating/security-tls-transport.html
+++ b/content/docs/en/2.1.0-incubating/security-tls-transport.html
@@ -117,10 +117,10 @@ should be configured to disable TLS hostname verification.</p>
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/en/2.1.0-incubating/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -129,14 +129,14 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -144,11 +144,11 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/2.1.0-incubating/security-tls-transport/index.html b/content/docs/en/2.1.0-incubating/security-tls-transport/index.html
index 55f4840..ba524b0 100644
--- a/content/docs/en/2.1.0-incubating/security-tls-transport/index.html
+++ b/content/docs/en/2.1.0-incubating/security-tls-transport/index.html
@@ -117,10 +117,10 @@ should be configured to disable TLS hostname verification.</p>
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/en/2.1.0-incubating/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/en/2.1.0-incubating/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -129,14 +129,14 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -144,11 +144,11 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/2.1.0-incubating/standalone-docker.html b/content/docs/en/2.1.0-incubating/standalone-docker.html
index 6e7c62b..80eff75 100644
--- a/content/docs/en/2.1.0-incubating/standalone-docker.html
+++ b/content/docs/en/2.1.0-incubating/standalone-docker.html
@@ -64,8 +64,8 @@ data and metadata in the filesystem outside the container, in order to not start
 time the container is restarted.</li>
 </ul>
 <p>If Pulsar has been successfully started, you should see <code>INFO</code>-level log messages like this:</p>
-<pre><code class="hljs"><span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,030</span> - INFO  - [main:WebService@<span class="hljs-number">213</span>] - Web Service started at http://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">8080</span>
-<span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,038</span> - INFO  - [main:PulsarService@<span class="hljs-number">335</span>] - messaging service is ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker url=pulsar://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">6650</span>, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@<span class="hljs-number">4d</ [...]
+<pre><code class="hljs"><span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">030</span> - INFO  - [main:<span class="hljs-symbol">WebService@</span><span class="hljs-number">213</span>] - Web Service started at http:<span class="hljs-comment">//127.0.0.1:8080</span>
+<span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">038</span> - INFO  - [main:<span class="hljs-symbol">PulsarService@</span><span class="hljs-number">335</span>] - messaging service <span class="hljs-keyword">is</span> ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker  [...]
 ...
 </code></pre>
 <blockquote>
diff --git a/content/docs/en/2.1.0-incubating/standalone-docker/index.html b/content/docs/en/2.1.0-incubating/standalone-docker/index.html
index 6e7c62b..80eff75 100644
--- a/content/docs/en/2.1.0-incubating/standalone-docker/index.html
+++ b/content/docs/en/2.1.0-incubating/standalone-docker/index.html
@@ -64,8 +64,8 @@ data and metadata in the filesystem outside the container, in order to not start
 time the container is restarted.</li>
 </ul>
 <p>If Pulsar has been successfully started, you should see <code>INFO</code>-level log messages like this:</p>
-<pre><code class="hljs"><span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,030</span> - INFO  - [main:WebService@<span class="hljs-number">213</span>] - Web Service started at http://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">8080</span>
-<span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,038</span> - INFO  - [main:PulsarService@<span class="hljs-number">335</span>] - messaging service is ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker url=pulsar://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">6650</span>, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@<span class="hljs-number">4d</ [...]
+<pre><code class="hljs"><span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">030</span> - INFO  - [main:<span class="hljs-symbol">WebService@</span><span class="hljs-number">213</span>] - Web Service started at http:<span class="hljs-comment">//127.0.0.1:8080</span>
+<span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">038</span> - INFO  - [main:<span class="hljs-symbol">PulsarService@</span><span class="hljs-number">335</span>] - messaging service <span class="hljs-keyword">is</span> ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker  [...]
 ...
 </code></pre>
 <blockquote>
diff --git a/content/docs/en/admin-api-clusters.html b/content/docs/en/admin-api-clusters.html
index a4c517d..9491f89 100644
--- a/content/docs/en/admin-api-clusters.html
+++ b/content/docs/en/admin-api-clusters.html
@@ -150,7 +150,7 @@ admin.clusters().updateCluster(clusterName, clusterData);
 <p>Clusters can be deleted from a Pulsar <a href="/docs/en/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-3"></a><a href="#pulsar-admin-3" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/pulsar-admin#clusters-delete"><code>delete</code></a> subcommand and specify the name of the cluster.</p>
-<pre><code class="hljs">$ pulsar-admin clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-2"></a><a href="#rest-api-2" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/deleteCluster"><b>DELETE</b> <i>/admin/v2/clusters/:cluster</i></a>
@@ -176,7 +176,7 @@ cluster-2
 <p>Peer clusters can be configured for a given cluster in a Pulsar <a href="/docs/en/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-5"></a><a href="#pulsar-admin-5" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/pulsar-admin#clusters-update-peer-clusters"><code>update-peer-clusters</code></a> subcommand and specify the list of peer-cluster names.</p>
-<pre><code class="hljs">$ pulsar-admin <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> --peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-2</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> <span class="hljs-comment">--peer-clusters cluster-2</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-4"></a><a href="#rest-api-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/setPeerClusterNames"><b>POST</b> <i>/admin/v2/clusters/:cluster/peers</i></a>
diff --git a/content/docs/en/admin-api-clusters/index.html b/content/docs/en/admin-api-clusters/index.html
index a4c517d..9491f89 100644
--- a/content/docs/en/admin-api-clusters/index.html
+++ b/content/docs/en/admin-api-clusters/index.html
@@ -150,7 +150,7 @@ admin.clusters().updateCluster(clusterName, clusterData);
 <p>Clusters can be deleted from a Pulsar <a href="/docs/en/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-3"></a><a href="#pulsar-admin-3" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/pulsar-admin#clusters-delete"><code>delete</code></a> subcommand and specify the name of the cluster.</p>
-<pre><code class="hljs">$ pulsar-admin clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-2"></a><a href="#rest-api-2" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/deleteCluster"><b>DELETE</b> <i>/admin/v2/clusters/:cluster</i></a>
@@ -176,7 +176,7 @@ cluster-2
 <p>Peer clusters can be configured for a given cluster in a Pulsar <a href="/docs/en/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-5"></a><a href="#pulsar-admin-5" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/pulsar-admin#clusters-update-peer-clusters"><code>update-peer-clusters</code></a> subcommand and specify the list of peer-cluster names.</p>
-<pre><code class="hljs">$ pulsar-admin <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> --peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-2</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> <span class="hljs-comment">--peer-clusters cluster-2</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-4"></a><a href="#rest-api-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/setPeerClusterNames"><b>POST</b> <i>/admin/v2/clusters/:cluster/peers</i></a>
diff --git a/content/docs/en/admin-api-namespaces.html b/content/docs/en/admin-api-namespaces.html
index 60e5fb6..ff0f839 100644
--- a/content/docs/en/admin-api-namespaces.html
+++ b/content/docs/en/admin-api-namespaces.html
@@ -194,7 +194,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="remove-backlog-quota-policies"></a><a href="#remove-backlog-quota-policies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>It removes backlog quota policies for a given namespace</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-4"></a><a href="#cli-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces remove-backlog-quota <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-keyword">remove</span>-backlog-quota <span class="hljs-keyword">test</span>-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -244,7 +244,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="unload-namespace-bundle"></a><a href="#unload-namespace-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Namespace bundle is a virtual group of topics which belong to same namespace. If broker gets overloaded with number of bundles then this command can help to unload heavy bundle from that broker, so it can be served by some other less loaded broker. Namespace bundle is defined with it’s start and end range such as 0x00000000 and 0xffffffff.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-7"></a><a href="#cli-7" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-built_in">unload</span> <span class="hljs-comment">--bundle 0x00000000_0xffffffff test-tenant/ns1</span>
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -283,7 +283,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="split-bundle"></a><a href="#split-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Each namespace bundle can contain multiple topics and each bundle can be served by only one broker. If bundle gets heavy with multiple live topics in it then it creates load on that broker and in order to resolve this issue, admin can split bundle using this command.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-10"></a><a href="#cli-10" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces split-<span class="hljs-keyword">bundle </span>--<span class="hljs-keyword">bundle </span><span class="hljs-number">0x00000000</span>_<span class="hljs-number">0xffffffff</span> test-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
diff --git a/content/docs/en/admin-api-namespaces/index.html b/content/docs/en/admin-api-namespaces/index.html
index 60e5fb6..ff0f839 100644
--- a/content/docs/en/admin-api-namespaces/index.html
+++ b/content/docs/en/admin-api-namespaces/index.html
@@ -194,7 +194,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="remove-backlog-quota-policies"></a><a href="#remove-backlog-quota-policies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>It removes backlog quota policies for a given namespace</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-4"></a><a href="#cli-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces remove-backlog-quota <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-keyword">remove</span>-backlog-quota <span class="hljs-keyword">test</span>-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -244,7 +244,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="unload-namespace-bundle"></a><a href="#unload-namespace-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Namespace bundle is a virtual group of topics which belong to same namespace. If broker gets overloaded with number of bundles then this command can help to unload heavy bundle from that broker, so it can be served by some other less loaded broker. Namespace bundle is defined with it’s start and end range such as 0x00000000 and 0xffffffff.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-7"></a><a href="#cli-7" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-built_in">unload</span> <span class="hljs-comment">--bundle 0x00000000_0xffffffff test-tenant/ns1</span>
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -283,7 +283,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="split-bundle"></a><a href="#split-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Each namespace bundle can contain multiple topics and each bundle can be served by only one broker. If bundle gets heavy with multiple live topics in it then it creates load on that broker and in order to resolve this issue, admin can split bundle using this command.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-10"></a><a href="#cli-10" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces split-<span class="hljs-keyword">bundle </span>--<span class="hljs-keyword">bundle </span><span class="hljs-number">0x00000000</span>_<span class="hljs-number">0xffffffff</span> test-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
diff --git a/content/docs/en/admin-api-tenants.html b/content/docs/en/admin-api-tenants.html
index a7c8fbc..d58cac6 100644
--- a/content/docs/en/admin-api-tenants.html
+++ b/content/docs/en/admin-api-tenants.html
@@ -57,8 +57,8 @@
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin tenants list</span>
 </code></pre>
 <p>That will return a simple list, like this:</p>
-<pre><code class="hljs"><span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-1</span>
-<span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-2</span>
+<pre><code class="hljs">my-tenant<span class="hljs-number">-1</span>
+my-tenant<span class="hljs-number">-2</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="create"></a><a href="#create" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-1"></a><a href="#pulsar-admin-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
diff --git a/content/docs/en/admin-api-tenants/index.html b/content/docs/en/admin-api-tenants/index.html
index a7c8fbc..d58cac6 100644
--- a/content/docs/en/admin-api-tenants/index.html
+++ b/content/docs/en/admin-api-tenants/index.html
@@ -57,8 +57,8 @@
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin tenants list</span>
 </code></pre>
 <p>That will return a simple list, like this:</p>
-<pre><code class="hljs"><span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-1</span>
-<span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-2</span>
+<pre><code class="hljs">my-tenant<span class="hljs-number">-1</span>
+my-tenant<span class="hljs-number">-2</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="create"></a><a href="#create" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-1"></a><a href="#pulsar-admin-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
diff --git a/content/docs/en/administration-load-distribution.html b/content/docs/en/administration-load-distribution.html
index fe2ccfe..c7c664d 100644
--- a/content/docs/en/administration-load-distribution.html
+++ b/content/docs/en/administration-load-distribution.html
@@ -85,7 +85,7 @@ bundle the hash falls into.</p>
 <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -122,25 +122,25 @@ to different brokers.</p>
 of the threshold is a candidate to be split. By default the newly split bundles are also
 immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever
@@ -154,15 +154,15 @@ it will unload the percent difference plus a 5% margin: <code>(95% - 85%) + 5% =
 and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and
@@ -170,7 +170,7 @@ memory usage. Whenever either of those metrics reaches the threshold, it will tr
 (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is
@@ -180,14 +180,14 @@ NIC speed for which the OS report 10Gbps speed.</p>
 reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
 being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a></li><li><a hre [...]
diff --git a/content/docs/en/administration-load-distribution/index.html b/content/docs/en/administration-load-distribution/index.html
index fe2ccfe..c7c664d 100644
--- a/content/docs/en/administration-load-distribution/index.html
+++ b/content/docs/en/administration-load-distribution/index.html
@@ -85,7 +85,7 @@ bundle the hash falls into.</p>
 <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -122,25 +122,25 @@ to different brokers.</p>
 of the threshold is a candidate to be split. By default the newly split bundles are also
 immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever
@@ -154,15 +154,15 @@ it will unload the percent difference plus a 5% margin: <code>(95% - 85%) + 5% =
 and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and
@@ -170,7 +170,7 @@ memory usage. Whenever either of those metrics reaches the threshold, it will tr
 (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is
@@ -180,14 +180,14 @@ NIC speed for which the OS report 10Gbps speed.</p>
 reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
 being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a></li><li><a hre [...]
diff --git a/content/docs/en/administration-zk-bk.html b/content/docs/en/administration-zk-bk.html
index 749ba2e..8802198 100644
--- a/content/docs/en/administration-zk-bk.html
+++ b/content/docs/en/administration-zk-bk.html
@@ -65,9 +65,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -87,10 +87,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -110,25 +110,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -190,16 +190,16 @@ designed to use multiple devices:</p>
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/en/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required  in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/en/administration-zk-bk/index.html b/content/docs/en/administration-zk-bk/index.html
index 749ba2e..8802198 100644
--- a/content/docs/en/administration-zk-bk/index.html
+++ b/content/docs/en/administration-zk-bk/index.html
@@ -65,9 +65,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -87,10 +87,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -110,25 +110,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -190,16 +190,16 @@ designed to use multiple devices:</p>
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/en/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required  in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/en/client-libraries-websocket.html b/content/docs/en/client-libraries-websocket.html
index 084a11e..c093596 100644
--- a/content/docs/en/client-libraries-websocket.html
+++ b/content/docs/en/client-libraries-websocket.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/en/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/en/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/en/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/en/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/en/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/en/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/en/client-libraries-websocket/index.html b/content/docs/en/client-libraries-websocket/index.html
index 084a11e..c093596 100644
--- a/content/docs/en/client-libraries-websocket/index.html
+++ b/content/docs/en/client-libraries-websocket/index.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/en/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/en/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/en/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/en/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/en/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/en/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/en/deploy-bare-metal-multi-cluster.html b/content/docs/en/deploy-bare-metal-multi-cluster.html
index 006395e..ddb5276 100644
--- a/content/docs/en/deploy-bare-metal-multi-cluster.html
+++ b/content/docs/en/deploy-bare-metal-multi-cluster.html
@@ -122,9 +122,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -144,10 +144,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -167,25 +167,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -247,12 +247,12 @@ designed to use multiple devices:</p>
 <p>You also need to specify the name of the <a href="/docs/en/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/en/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -274,11 +274,11 @@ designed to use multiple devices:</p>
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/en/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/en/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/en/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/en/reference-configuration#service-discovery-configurationSt [...]
 store</a> quorum connection string.</p>
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -286,7 +286,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/en/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/en/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/en/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/en/deploy-bare-metal-multi-cluster/index.html b/content/docs/en/deploy-bare-metal-multi-cluster/index.html
index 006395e..ddb5276 100644
--- a/content/docs/en/deploy-bare-metal-multi-cluster/index.html
+++ b/content/docs/en/deploy-bare-metal-multi-cluster/index.html
@@ -122,9 +122,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -144,10 +144,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -167,25 +167,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -247,12 +247,12 @@ designed to use multiple devices:</p>
 <p>You also need to specify the name of the <a href="/docs/en/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/en/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -274,11 +274,11 @@ designed to use multiple devices:</p>
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/en/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/en/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/en/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/en/reference-configuration#service-discovery-configurationSt [...]
 store</a> quorum connection string.</p>
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -286,7 +286,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/en/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/en/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/en/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/en/deploy-bare-metal.html b/content/docs/en/deploy-bare-metal.html
index 1fc8227..82201d1 100644
--- a/content/docs/en/deploy-bare-metal.html
+++ b/content/docs/en/deploy-bare-metal.html
@@ -168,9 +168,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/en/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -214,7 +214,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/en/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/en/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/en/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -244,11 +244,11 @@ verify all the bookies in the cluster are up running.</p>
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/en/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/en/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <code>config [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/en/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -272,8 +272,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/en/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/en/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/en/deploy-bare-metal/index.html b/content/docs/en/deploy-bare-metal/index.html
index 1fc8227..82201d1 100644
--- a/content/docs/en/deploy-bare-metal/index.html
+++ b/content/docs/en/deploy-bare-metal/index.html
@@ -168,9 +168,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/en/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -214,7 +214,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/en/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/en/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/en/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -244,11 +244,11 @@ verify all the bookies in the cluster are up running.</p>
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/en/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/en/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <code>config [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/en/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -272,8 +272,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/en/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/en/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/en/io-managing.html b/content/docs/en/io-managing.html
index 46d31a8..16be51d 100644
--- a/content/docs/en/io-managing.html
+++ b/content/docs/en/io-managing.html
@@ -139,17 +139,17 @@ in following form:</p>
 <p>Since Pulsar IO connectors are running as <a href="functions-overiew.md">Pulsar Functions</a>, so you can use <a href="/docs/en/pulsar-admin#source"><code>functions</code></a> commands
 available in the <a href="/docs/en/pulsar-admin"><code>pulsar-admin</code></a> CLI tool.</p>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-metadata"></a><a href="#retrieve-connector-metadata" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions get \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">get</span> \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-running-status"></a><a href="#retrieve-connector-running-status" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions getstatus \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> getstatus \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/io-quickstart"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/io-connectors"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#using-builtin-connectors">Using Builtin Connectors</a></li><li><a href="#configuring-connectors">Configuring Conn [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/docs/en/io-managing/index.html b/content/docs/en/io-managing/index.html
index 46d31a8..16be51d 100644
--- a/content/docs/en/io-managing/index.html
+++ b/content/docs/en/io-managing/index.html
@@ -139,17 +139,17 @@ in following form:</p>
 <p>Since Pulsar IO connectors are running as <a href="functions-overiew.md">Pulsar Functions</a>, so you can use <a href="/docs/en/pulsar-admin#source"><code>functions</code></a> commands
 available in the <a href="/docs/en/pulsar-admin"><code>pulsar-admin</code></a> CLI tool.</p>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-metadata"></a><a href="#retrieve-connector-metadata" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions get \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">get</span> \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-running-status"></a><a href="#retrieve-connector-running-status" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions getstatus \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> getstatus \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/io-quickstart"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/io-connectors"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#using-builtin-connectors">Using Builtin Connectors</a></li><li><a href="#configuring-connectors">Configuring Conn [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/docs/en/next/admin-api-clusters.html b/content/docs/en/next/admin-api-clusters.html
index c279961..38e9077 100644
--- a/content/docs/en/next/admin-api-clusters.html
+++ b/content/docs/en/next/admin-api-clusters.html
@@ -150,7 +150,7 @@ admin.clusters().updateCluster(clusterName, clusterData);
 <p>Clusters can be deleted from a Pulsar <a href="/docs/en/next/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-3"></a><a href="#pulsar-admin-3" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/next/pulsar-admin#clusters-delete"><code>delete</code></a> subcommand and specify the name of the cluster.</p>
-<pre><code class="hljs">$ pulsar-admin clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-2"></a><a href="#rest-api-2" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/deleteCluster"><b>DELETE</b> <i>/admin/v2/clusters/:cluster</i></a>
@@ -176,7 +176,7 @@ cluster-2
 <p>Peer clusters can be configured for a given cluster in a Pulsar <a href="/docs/en/next/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-5"></a><a href="#pulsar-admin-5" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/next/pulsar-admin#clusters-update-peer-clusters"><code>update-peer-clusters</code></a> subcommand and specify the list of peer-cluster names.</p>
-<pre><code class="hljs">$ pulsar-admin <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> --peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-2</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> <span class="hljs-comment">--peer-clusters cluster-2</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-4"></a><a href="#rest-api-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/setPeerClusterNames"><b>POST</b> <i>/admin/v2/clusters/:cluster/peers</i></a>
diff --git a/content/docs/en/next/admin-api-clusters/index.html b/content/docs/en/next/admin-api-clusters/index.html
index c279961..38e9077 100644
--- a/content/docs/en/next/admin-api-clusters/index.html
+++ b/content/docs/en/next/admin-api-clusters/index.html
@@ -150,7 +150,7 @@ admin.clusters().updateCluster(clusterName, clusterData);
 <p>Clusters can be deleted from a Pulsar <a href="/docs/en/next/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-3"></a><a href="#pulsar-admin-3" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/next/pulsar-admin#clusters-delete"><code>delete</code></a> subcommand and specify the name of the cluster.</p>
-<pre><code class="hljs">$ pulsar-admin clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> clusters <span class="hljs-keyword">delete</span> <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-2"></a><a href="#rest-api-2" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/deleteCluster"><b>DELETE</b> <i>/admin/v2/clusters/:cluster</i></a>
@@ -176,7 +176,7 @@ cluster-2
 <p>Peer clusters can be configured for a given cluster in a Pulsar <a href="/docs/en/next/reference-terminology#instance">instance</a>.</p>
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-5"></a><a href="#pulsar-admin-5" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
 <p>Use the <a href="/docs/en/next/pulsar-admin#clusters-update-peer-clusters"><code>update-peer-clusters</code></a> subcommand and specify the list of peer-cluster names.</p>
-<pre><code class="hljs">$ pulsar-admin <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> --peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-2</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">update</span>-peer-clusters <span class="hljs-keyword">cluster</span><span class="hljs-number">-1</span> <span class="hljs-comment">--peer-clusters cluster-2</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="rest-api-4"></a><a href="#rest-api-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p><a href="https://pulsar.incubator.apache.org/en/admin-rest-api#operation/setPeerClusterNames"><b>POST</b> <i>/admin/v2/clusters/:cluster/peers</i></a>
diff --git a/content/docs/en/next/admin-api-namespaces.html b/content/docs/en/next/admin-api-namespaces.html
index 2d39ae5..519d225 100644
--- a/content/docs/en/next/admin-api-namespaces.html
+++ b/content/docs/en/next/admin-api-namespaces.html
@@ -194,7 +194,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="remove-backlog-quota-policies"></a><a href="#remove-backlog-quota-policies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>It removes backlog quota policies for a given namespace</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-4"></a><a href="#cli-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces remove-backlog-quota <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-keyword">remove</span>-backlog-quota <span class="hljs-keyword">test</span>-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -244,7 +244,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="unload-namespace-bundle"></a><a href="#unload-namespace-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Namespace bundle is a virtual group of topics which belong to same namespace. If broker gets overloaded with number of bundles then this command can help to unload heavy bundle from that broker, so it can be served by some other less loaded broker. Namespace bundle is defined with it’s start and end range such as 0x00000000 and 0xffffffff.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-7"></a><a href="#cli-7" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-built_in">unload</span> <span class="hljs-comment">--bundle 0x00000000_0xffffffff test-tenant/ns1</span>
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -283,7 +283,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="split-bundle"></a><a href="#split-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Each namespace bundle can contain multiple topics and each bundle can be served by only one broker. If bundle gets heavy with multiple live topics in it then it creates load on that broker and in order to resolve this issue, admin can split bundle using this command.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-10"></a><a href="#cli-10" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces split-<span class="hljs-keyword">bundle </span>--<span class="hljs-keyword">bundle </span><span class="hljs-number">0x00000000</span>_<span class="hljs-number">0xffffffff</span> test-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
diff --git a/content/docs/en/next/admin-api-namespaces/index.html b/content/docs/en/next/admin-api-namespaces/index.html
index 2d39ae5..519d225 100644
--- a/content/docs/en/next/admin-api-namespaces/index.html
+++ b/content/docs/en/next/admin-api-namespaces/index.html
@@ -194,7 +194,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="remove-backlog-quota-policies"></a><a href="#remove-backlog-quota-policies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>It removes backlog quota policies for a given namespace</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-4"></a><a href="#cli-4" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces remove-backlog-quota <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-keyword">remove</span>-backlog-quota <span class="hljs-keyword">test</span>-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -244,7 +244,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="unload-namespace-bundle"></a><a href="#unload-namespace-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>Namespace bundle is a virtual group of topics which belong to same namespace. If broker gets overloaded with number of bundles then this command can help to unload heavy bundle from that broker, so it can be served by some other less loaded broker. Namespace bundle is defined with it’s start and end range such as 0x00000000 and 0xffffffff.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-7"></a><a href="#cli-7" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09 [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces <span class="hljs-built_in">unload</span> <span class="hljs-comment">--bundle 0x00000000_0xffffffff test-tenant/ns1</span>
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
@@ -283,7 +283,7 @@ test-tenant/ns2
 <h4><a class="anchor" aria-hidden="true" id="split-bundle"></a><a href="#split-bundle" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83. [...]
 <p>Each namespace bundle can contain multiple topics and each bundle can be served by only one broker. If bundle gets heavy with multiple live topics in it then it creates load on that broker and in order to resolve this issue, admin can split bundle using this command.</p>
 <h6><a class="anchor" aria-hidden="true" id="cli-10"></a><a href="#cli-10" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff <span class="hljs-built_in">test</span>-tenant/ns1</span>
+<pre><code class="hljs">$ pulsar-admin namespaces split-<span class="hljs-keyword">bundle </span>--<span class="hljs-keyword">bundle </span><span class="hljs-number">0x00000000</span>_<span class="hljs-number">0xffffffff</span> test-tenant/ns1
 </code></pre>
 <pre><code class="hljs">N/<span class="hljs-keyword">A</span>
 </code></pre>
diff --git a/content/docs/en/next/admin-api-tenants.html b/content/docs/en/next/admin-api-tenants.html
index e8f0686..3d5a2b0 100644
--- a/content/docs/en/next/admin-api-tenants.html
+++ b/content/docs/en/next/admin-api-tenants.html
@@ -57,8 +57,8 @@
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin tenants list</span>
 </code></pre>
 <p>That will return a simple list, like this:</p>
-<pre><code class="hljs"><span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-1</span>
-<span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-2</span>
+<pre><code class="hljs">my-tenant<span class="hljs-number">-1</span>
+my-tenant<span class="hljs-number">-2</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="create"></a><a href="#create" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-1"></a><a href="#pulsar-admin-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
diff --git a/content/docs/en/next/admin-api-tenants/index.html b/content/docs/en/next/admin-api-tenants/index.html
index e8f0686..3d5a2b0 100644
--- a/content/docs/en/next/admin-api-tenants/index.html
+++ b/content/docs/en/next/admin-api-tenants/index.html
@@ -57,8 +57,8 @@
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin tenants list</span>
 </code></pre>
 <p>That will return a simple list, like this:</p>
-<pre><code class="hljs"><span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-1</span>
-<span class="hljs-keyword">my</span>-tenant<span class="hljs-number">-2</span>
+<pre><code class="hljs">my-tenant<span class="hljs-number">-1</span>
+my-tenant<span class="hljs-number">-2</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="create"></a><a href="#create" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2. [...]
 <h4><a class="anchor" aria-hidden="true" id="pulsar-admin-1"></a><a href="#pulsar-admin-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0- [...]
diff --git a/content/docs/en/next/administration-load-distribution.html b/content/docs/en/next/administration-load-distribution.html
index 0f333f8..43bb242 100644
--- a/content/docs/en/next/administration-load-distribution.html
+++ b/content/docs/en/next/administration-load-distribution.html
@@ -85,7 +85,7 @@ bundle the hash falls into.</p>
 <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -122,25 +122,25 @@ to different brokers.</p>
 of the threshold is a candidate to be split. By default the newly split bundles are also
 immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever
@@ -154,15 +154,15 @@ it will unload the percent difference plus a 5% margin: <code>(95% - 85%) + 5% =
 and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and
@@ -170,7 +170,7 @@ memory usage. Whenever either of those metrics reaches the threshold, it will tr
 (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is
@@ -180,14 +180,14 @@ NIC speed for which the OS report 10Gbps speed.</p>
 reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
 being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/next/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/next/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a></li> [...]
diff --git a/content/docs/en/next/administration-load-distribution/index.html b/content/docs/en/next/administration-load-distribution/index.html
index 0f333f8..43bb242 100644
--- a/content/docs/en/next/administration-load-distribution/index.html
+++ b/content/docs/en/next/administration-load-distribution/index.html
@@ -85,7 +85,7 @@ bundle the hash falls into.</p>
 <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -122,25 +122,25 @@ to different brokers.</p>
 of the threshold is a candidate to be split. By default the newly split bundles are also
 immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever
@@ -154,15 +154,15 @@ it will unload the percent difference plus a 5% margin: <code>(95% - 85%) + 5% =
 and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and
@@ -170,7 +170,7 @@ memory usage. Whenever either of those metrics reaches the threshold, it will tr
 (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is
@@ -180,14 +180,14 @@ NIC speed for which the OS report 10Gbps speed.</p>
 reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is
 being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/next/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/next/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a></li> [...]
diff --git a/content/docs/en/next/administration-zk-bk.html b/content/docs/en/next/administration-zk-bk.html
index e93cd95..14a1cc3 100644
--- a/content/docs/en/next/administration-zk-bk.html
+++ b/content/docs/en/next/administration-zk-bk.html
@@ -65,9 +65,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -87,10 +87,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -110,25 +110,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -190,16 +190,16 @@ designed to use multiple devices:</p>
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/en/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required  in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/en/next/administration-zk-bk/index.html b/content/docs/en/next/administration-zk-bk/index.html
index e93cd95..14a1cc3 100644
--- a/content/docs/en/next/administration-zk-bk/index.html
+++ b/content/docs/en/next/administration-zk-bk/index.html
@@ -65,9 +65,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -87,10 +87,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -110,25 +110,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -190,16 +190,16 @@ designed to use multiple devices:</p>
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/en/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required  in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/en/next/client-libraries-websocket.html b/content/docs/en/next/client-libraries-websocket.html
index c0b062b..79f73da 100644
--- a/content/docs/en/next/client-libraries-websocket.html
+++ b/content/docs/en/next/client-libraries-websocket.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/en/next/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/en/next/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/en/next/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/en/next/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/en/next/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/en/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/en/next/client-libraries-websocket/index.html b/content/docs/en/next/client-libraries-websocket/index.html
index c0b062b..79f73da 100644
--- a/content/docs/en/next/client-libraries-websocket/index.html
+++ b/content/docs/en/next/client-libraries-websocket/index.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/en/next/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/en/next/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/en/next/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/en/next/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/en/next/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/en/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/en/next/deploy-bare-metal-multi-cluster.html b/content/docs/en/next/deploy-bare-metal-multi-cluster.html
index 3343599..fff07ca 100644
--- a/content/docs/en/next/deploy-bare-metal-multi-cluster.html
+++ b/content/docs/en/next/deploy-bare-metal-multi-cluster.html
@@ -122,9 +122,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -144,10 +144,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -167,25 +167,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -247,12 +247,12 @@ designed to use multiple devices:</p>
 <p>You also need to specify the name of the <a href="/docs/en/next/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/en/next/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -274,11 +274,11 @@ designed to use multiple devices:</p>
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/en/next/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/en/next/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/en/next/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/en/next/reference-configuration#service-discovery- [...]
 store</a> quorum connection string.</p>
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -286,7 +286,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/en/next/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/en/next/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/en/next/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/en/next/deploy-bare-metal-multi-cluster/index.html b/content/docs/en/next/deploy-bare-metal-multi-cluster/index.html
index 3343599..fff07ca 100644
--- a/content/docs/en/next/deploy-bare-metal-multi-cluster/index.html
+++ b/content/docs/en/next/deploy-bare-metal-multi-cluster/index.html
@@ -122,9 +122,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/en/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -144,10 +144,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/en/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -167,25 +167,25 @@ can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one
 of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/en/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -247,12 +247,12 @@ designed to use multiple devices:</p>
 <p>You also need to specify the name of the <a href="/docs/en/next/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/en/next/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -274,11 +274,11 @@ designed to use multiple devices:</p>
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/en/next/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/en/next/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/en/next/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/en/next/reference-configuration#service-discovery- [...]
 store</a> quorum connection string.</p>
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -286,7 +286,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/en/next/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/en/next/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/en/next/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/en/next/deploy-bare-metal.html b/content/docs/en/next/deploy-bare-metal.html
index 1adc6b2..c3e2098 100644
--- a/content/docs/en/next/deploy-bare-metal.html
+++ b/content/docs/en/next/deploy-bare-metal.html
@@ -168,9 +168,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/en/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -214,7 +214,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/en/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/en/next/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/en/next/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -244,11 +244,11 @@ verify all the bookies in the cluster are up running.</p>
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/en/next/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/en/next/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <c [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/en/next/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -272,8 +272,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/en/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/en/next/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/en/next/deploy-bare-metal/index.html b/content/docs/en/next/deploy-bare-metal/index.html
index 1adc6b2..c3e2098 100644
--- a/content/docs/en/next/deploy-bare-metal/index.html
+++ b/content/docs/en/next/deploy-bare-metal/index.html
@@ -168,9 +168,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/en/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/en/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -214,7 +214,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/en/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/en/next/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/en/next/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -244,11 +244,11 @@ verify all the bookies in the cluster are up running.</p>
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/en/next/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/en/next/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <c [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/en/next/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -272,8 +272,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/en/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/en/next/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/en/next/io-managing.html b/content/docs/en/next/io-managing.html
index 5b292b0..2ebaa4b 100644
--- a/content/docs/en/next/io-managing.html
+++ b/content/docs/en/next/io-managing.html
@@ -139,17 +139,17 @@ in following form:</p>
 <p>Since Pulsar IO connectors are running as <a href="functions-overiew.md">Pulsar Functions</a>, so you can use <a href="/docs/en/next/pulsar-admin#source"><code>functions</code></a> commands
 available in the <a href="/docs/en/next/pulsar-admin"><code>pulsar-admin</code></a> CLI tool.</p>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-metadata"></a><a href="#retrieve-connector-metadata" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions get \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">get</span> \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-running-status"></a><a href="#retrieve-connector-running-status" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions getstatus \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> getstatus \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/next/io-quickstart"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/next/io-connectors"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#using-builtin-connectors">Using Builtin Connectors</a></li><li><a href="#configuring-connectors">Config [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/docs/en/next/io-managing/index.html b/content/docs/en/next/io-managing/index.html
index 5b292b0..2ebaa4b 100644
--- a/content/docs/en/next/io-managing/index.html
+++ b/content/docs/en/next/io-managing/index.html
@@ -139,17 +139,17 @@ in following form:</p>
 <p>Since Pulsar IO connectors are running as <a href="functions-overiew.md">Pulsar Functions</a>, so you can use <a href="/docs/en/next/pulsar-admin#source"><code>functions</code></a> commands
 available in the <a href="/docs/en/next/pulsar-admin"><code>pulsar-admin</code></a> CLI tool.</p>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-metadata"></a><a href="#retrieve-connector-metadata" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions get \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">get</span> \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 <h3><a class="anchor" aria-hidden="true" id="retrieve-connector-running-status"></a><a href="#retrieve-connector-running-status" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
-<pre><code class="hljs">bin/pulsar-admin functions getstatus \
-    -<span class="ruby">-tenant &lt;tenant&gt; \
-</span>    -<span class="ruby">-namespace &lt;namespace&gt; \
-</span>    -<span class="ruby">-name &lt;connector-name&gt;
-</span></code></pre>
+<pre><code class="hljs">bin/pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> getstatus \
+    <span class="hljs-comment">--tenant &lt;tenant&gt; \</span>
+    <span class="hljs-comment">--namespace &lt;namespace&gt; \</span>
+    <span class="hljs-comment">--name &lt;connector-name&gt;</span>
+</code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/next/io-quickstart"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/next/io-connectors"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#using-builtin-connectors">Using Builtin Connectors</a></li><li><a href="#configuring-connectors">Config [...]
       const community = document.querySelector("a[href='#community']").parentNode;
       const communityMenu =
diff --git a/content/docs/en/next/pulsar-admin.html b/content/docs/en/next/pulsar-admin.html
index 5b860ae..d5a320ab9 100644
--- a/content/docs/en/next/pulsar-admin.html
+++ b/content/docs/en/next/pulsar-admin.html
@@ -333,7 +333,7 @@
 <h3><a class="anchor" aria-hidden="true" id="create-1"></a><a href="#create-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>Creates a new Pulsar Function on the target infrastructure</p>
 <p>Usage</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin <span class="hljs-built_in">functions</span> create options</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">create</span> <span class="hljs-keyword">options</span>
 </code></pre>
 <p>Options</p>
 <table>
diff --git a/content/docs/en/next/pulsar-admin/index.html b/content/docs/en/next/pulsar-admin/index.html
index 5b860ae..d5a320ab9 100644
--- a/content/docs/en/next/pulsar-admin/index.html
+++ b/content/docs/en/next/pulsar-admin/index.html
@@ -333,7 +333,7 @@
 <h3><a class="anchor" aria-hidden="true" id="create-1"></a><a href="#create-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>Creates a new Pulsar Function on the target infrastructure</p>
 <p>Usage</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin <span class="hljs-built_in">functions</span> create options</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">create</span> <span class="hljs-keyword">options</span>
 </code></pre>
 <p>Options</p>
 <table>
diff --git a/content/docs/en/next/reference-configuration.html b/content/docs/en/next/reference-configuration.html
index 0cad130..36f7ada 100644
--- a/content/docs/en/next/reference-configuration.html
+++ b/content/docs/en/next/reference-configuration.html
@@ -498,9 +498,9 @@
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
 a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/en/next/reference-configuration/index.html b/content/docs/en/next/reference-configuration/index.html
index 0cad130..36f7ada 100644
--- a/content/docs/en/next/reference-configuration/index.html
+++ b/content/docs/en/next/reference-configuration/index.html
@@ -498,9 +498,9 @@
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
 a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/en/next/security-athenz.html b/content/docs/en/next/security-athenz.html
index 0cb0198..f3aa40d 100644
--- a/content/docs/en/next/security-athenz.html
+++ b/content/docs/en/next/security-athenz.html
@@ -75,15 +75,15 @@ as it can protect role tokens from being intercepted and reused (see also <a hre
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default
@@ -98,16 +98,16 @@ values for those parameters, can be found in <a href="/docs/en/next/reference-co
 <p><a href="/docs/en/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/next/security-tls-authentication"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/next/security-authorization"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class="toc [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/en/next/security-athenz/index.html b/content/docs/en/next/security-athenz/index.html
index 0cb0198..f3aa40d 100644
--- a/content/docs/en/next/security-athenz/index.html
+++ b/content/docs/en/next/security-athenz/index.html
@@ -75,15 +75,15 @@ as it can protect role tokens from being intercepted and reused (see also <a hre
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default
@@ -98,16 +98,16 @@ values for those parameters, can be found in <a href="/docs/en/next/reference-co
 <p><a href="/docs/en/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/next/security-tls-authentication"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/next/security-authorization"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class="toc [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/en/next/security-authorization.html b/content/docs/en/next/security-authorization.html
index c105801..7e057af 100644
--- a/content/docs/en/next/security-authorization.html
+++ b/content/docs/en/next/security-authorization.html
@@ -52,8 +52,8 @@ associating them with <a href="/docs/en/next/security-overview#role-tokens">role
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/en/next/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/en/next/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -67,10 +67,10 @@ as well as the default values for those parameters, can be found in <a href="/do
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/en/next/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/en/next/security-authorization/index.html b/content/docs/en/next/security-authorization/index.html
index c105801..7e057af 100644
--- a/content/docs/en/next/security-authorization/index.html
+++ b/content/docs/en/next/security-authorization/index.html
@@ -52,8 +52,8 @@ associating them with <a href="/docs/en/next/security-overview#role-tokens">role
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/en/next/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/en/next/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -67,10 +67,10 @@ as well as the default values for those parameters, can be found in <a href="/do
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/en/next/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/en/next/security-extending.html b/content/docs/en/next/security-extending.html
index bdcca09..38a95ef 100644
--- a/content/docs/en/next/security-extending.html
+++ b/content/docs/en/next/security-extending.html
@@ -78,8 +78,8 @@ type of connection or by passing a certificate chain to use for TLS.</p>
 passed by the client. Broker can support multiple authentication providers
 at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
@@ -128,8 +128,8 @@ configure a different one through a plugin.</p>
 <p>To provide a custom provider, one needs to implement the
 <code>org.apache.pulsar.broker.authorization.AuthorizationProvider</code> interface, have this class in the
 Pulsar broker classpath and configure it in <code>conf/broker.conf</code>:</p>
-<pre><code class="hljs css language-properties"># Authorization provider fully <span class="hljs-keyword">qualified</span> <span class="hljs-keyword">class</span>-name
-authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Authorization provider fully qualified class-name</span>
+<span class="hljs-attr">authorizationProvider</span>=<span class="hljs-string">org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider</span>
 </code></pre>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
  * Provider of authorization mechanism
diff --git a/content/docs/en/next/security-extending/index.html b/content/docs/en/next/security-extending/index.html
index bdcca09..38a95ef 100644
--- a/content/docs/en/next/security-extending/index.html
+++ b/content/docs/en/next/security-extending/index.html
@@ -78,8 +78,8 @@ type of connection or by passing a certificate chain to use for TLS.</p>
 passed by the client. Broker can support multiple authentication providers
 at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
@@ -128,8 +128,8 @@ configure a different one through a plugin.</p>
 <p>To provide a custom provider, one needs to implement the
 <code>org.apache.pulsar.broker.authorization.AuthorizationProvider</code> interface, have this class in the
 Pulsar broker classpath and configure it in <code>conf/broker.conf</code>:</p>
-<pre><code class="hljs css language-properties"># Authorization provider fully <span class="hljs-keyword">qualified</span> <span class="hljs-keyword">class</span>-name
-authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Authorization provider fully qualified class-name</span>
+<span class="hljs-attr">authorizationProvider</span>=<span class="hljs-string">org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider</span>
 </code></pre>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
  * Provider of authorization mechanism
diff --git a/content/docs/en/next/security-tls-authentication.html b/content/docs/en/next/security-tls-authentication.html
index 10b7895..41bae24 100644
--- a/content/docs/en/next/security-tls-authentication.html
+++ b/content/docs/en/next/security-tls-authentication.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/en/next/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/en/next/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/en/next/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/next/security-tls-authentication/index.html b/content/docs/en/next/security-tls-authentication/index.html
index 10b7895..41bae24 100644
--- a/content/docs/en/next/security-tls-authentication/index.html
+++ b/content/docs/en/next/security-tls-authentication/index.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/en/next/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/en/next/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/en/next/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/next/security-tls-transport.html b/content/docs/en/next/security-tls-transport.html
index 8ff1ec8..ac65b10 100644
--- a/content/docs/en/next/security-tls-transport.html
+++ b/content/docs/en/next/security-tls-transport.html
@@ -117,10 +117,10 @@ should be configured to disable TLS hostname verification.</p>
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/en/next/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/en/next/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -129,14 +129,14 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -144,11 +144,11 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/next/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/next/security-tls-transport/index.html b/content/docs/en/next/security-tls-transport/index.html
index 8ff1ec8..ac65b10 100644
--- a/content/docs/en/next/security-tls-transport/index.html
+++ b/content/docs/en/next/security-tls-transport/index.html
@@ -117,10 +117,10 @@ should be configured to disable TLS hostname verification.</p>
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/en/next/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/en/next/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -129,14 +129,14 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -144,11 +144,11 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/next/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/next/standalone-docker.html b/content/docs/en/next/standalone-docker.html
index a27a7b4..0a811ba 100644
--- a/content/docs/en/next/standalone-docker.html
+++ b/content/docs/en/next/standalone-docker.html
@@ -64,8 +64,8 @@ data and metadata in the filesystem outside the container, in order to not start
 time the container is restarted.</li>
 </ul>
 <p>If Pulsar has been successfully started, you should see <code>INFO</code>-level log messages like this:</p>
-<pre><code class="hljs"><span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,030</span> - INFO  - [main:WebService@<span class="hljs-number">213</span>] - Web Service started at http://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">8080</span>
-<span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,038</span> - INFO  - [main:PulsarService@<span class="hljs-number">335</span>] - messaging service is ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker url=pulsar://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">6650</span>, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@<span class="hljs-number">4d</ [...]
+<pre><code class="hljs"><span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">030</span> - INFO  - [main:<span class="hljs-symbol">WebService@</span><span class="hljs-number">213</span>] - Web Service started at http:<span class="hljs-comment">//127.0.0.1:8080</span>
+<span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">038</span> - INFO  - [main:<span class="hljs-symbol">PulsarService@</span><span class="hljs-number">335</span>] - messaging service <span class="hljs-keyword">is</span> ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker  [...]
 ...
 </code></pre>
 <blockquote>
diff --git a/content/docs/en/next/standalone-docker/index.html b/content/docs/en/next/standalone-docker/index.html
index a27a7b4..0a811ba 100644
--- a/content/docs/en/next/standalone-docker/index.html
+++ b/content/docs/en/next/standalone-docker/index.html
@@ -64,8 +64,8 @@ data and metadata in the filesystem outside the container, in order to not start
 time the container is restarted.</li>
 </ul>
 <p>If Pulsar has been successfully started, you should see <code>INFO</code>-level log messages like this:</p>
-<pre><code class="hljs"><span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,030</span> - INFO  - [main:WebService@<span class="hljs-number">213</span>] - Web Service started at http://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">8080</span>
-<span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,038</span> - INFO  - [main:PulsarService@<span class="hljs-number">335</span>] - messaging service is ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker url=pulsar://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">6650</span>, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@<span class="hljs-number">4d</ [...]
+<pre><code class="hljs"><span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">030</span> - INFO  - [main:<span class="hljs-symbol">WebService@</span><span class="hljs-number">213</span>] - Web Service started at http:<span class="hljs-comment">//127.0.0.1:8080</span>
+<span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">038</span> - INFO  - [main:<span class="hljs-symbol">PulsarService@</span><span class="hljs-number">335</span>] - messaging service <span class="hljs-keyword">is</span> ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker  [...]
 ...
 </code></pre>
 <blockquote>
diff --git a/content/docs/en/pulsar-admin.html b/content/docs/en/pulsar-admin.html
index 12db512..ddddd85 100644
--- a/content/docs/en/pulsar-admin.html
+++ b/content/docs/en/pulsar-admin.html
@@ -321,7 +321,7 @@
 <h3><a class="anchor" aria-hidden="true" id="create-1"></a><a href="#create-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>Creates a new Pulsar Function on the target infrastructure</p>
 <p>Usage</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin <span class="hljs-built_in">functions</span> create options</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">create</span> <span class="hljs-keyword">options</span>
 </code></pre>
 <p>Options</p>
 <table>
diff --git a/content/docs/en/pulsar-admin/index.html b/content/docs/en/pulsar-admin/index.html
index 12db512..ddddd85 100644
--- a/content/docs/en/pulsar-admin/index.html
+++ b/content/docs/en/pulsar-admin/index.html
@@ -321,7 +321,7 @@
 <h3><a class="anchor" aria-hidden="true" id="create-1"></a><a href="#create-1" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64  [...]
 <p>Creates a new Pulsar Function on the target infrastructure</p>
 <p>Usage</p>
-<pre><code class="hljs"><span class="hljs-meta">$</span><span class="bash"> pulsar-admin <span class="hljs-built_in">functions</span> create options</span>
+<pre><code class="hljs">$ pulsar-<span class="hljs-keyword">admin</span> <span class="hljs-keyword">functions</span> <span class="hljs-keyword">create</span> <span class="hljs-keyword">options</span>
 </code></pre>
 <p>Options</p>
 <table>
diff --git a/content/docs/en/reference-configuration.html b/content/docs/en/reference-configuration.html
index bdb7999..ca1ddf6 100644
--- a/content/docs/en/reference-configuration.html
+++ b/content/docs/en/reference-configuration.html
@@ -498,9 +498,9 @@
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
 a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/en/reference-configuration/index.html b/content/docs/en/reference-configuration/index.html
index bdb7999..ca1ddf6 100644
--- a/content/docs/en/reference-configuration/index.html
+++ b/content/docs/en/reference-configuration/index.html
@@ -498,9 +498,9 @@
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding
 a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/en/security-athenz.html b/content/docs/en/security-athenz.html
index f7da025..0000259 100644
--- a/content/docs/en/security-athenz.html
+++ b/content/docs/en/security-athenz.html
@@ -75,15 +75,15 @@ as it can protect role tokens from being intercepted and reused (see also <a hre
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default
@@ -98,16 +98,16 @@ values for those parameters, can be found in <a href="/docs/en/reference-configu
 <p><a href="/docs/en/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/security-tls-authentication"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/security-authorization"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class="toc-headings" [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/en/security-athenz/index.html b/content/docs/en/security-athenz/index.html
index f7da025..0000259 100644
--- a/content/docs/en/security-athenz/index.html
+++ b/content/docs/en/security-athenz/index.html
@@ -75,15 +75,15 @@ as it can protect role tokens from being intercepted and reused (see also <a hre
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default
@@ -98,16 +98,16 @@ values for those parameters, can be found in <a href="/docs/en/reference-configu
 <p><a href="/docs/en/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/en/security-tls-authentication"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/en/security-authorization"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class="toc-headings" [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/en/security-authorization.html b/content/docs/en/security-authorization.html
index 0f7a799..1bec8aa 100644
--- a/content/docs/en/security-authorization.html
+++ b/content/docs/en/security-authorization.html
@@ -52,8 +52,8 @@ associating them with <a href="/docs/en/security-overview#role-tokens">role toke
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/en/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/en/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -67,10 +67,10 @@ as well as the default values for those parameters, can be found in <a href="/do
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/en/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/en/security-authorization/index.html b/content/docs/en/security-authorization/index.html
index 0f7a799..1bec8aa 100644
--- a/content/docs/en/security-authorization/index.html
+++ b/content/docs/en/security-authorization/index.html
@@ -52,8 +52,8 @@ associating them with <a href="/docs/en/security-overview#role-tokens">role toke
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/en/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/en/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -67,10 +67,10 @@ as well as the default values for those parameters, can be found in <a href="/do
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/en/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/en/security-extending.html b/content/docs/en/security-extending.html
index 3aac43e..ef4f7ee 100644
--- a/content/docs/en/security-extending.html
+++ b/content/docs/en/security-extending.html
@@ -78,8 +78,8 @@ type of connection or by passing a certificate chain to use for TLS.</p>
 passed by the client. Broker can support multiple authentication providers
 at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
@@ -128,8 +128,8 @@ configure a different one through a plugin.</p>
 <p>To provide a custom provider, one needs to implement the
 <code>org.apache.pulsar.broker.authorization.AuthorizationProvider</code> interface, have this class in the
 Pulsar broker classpath and configure it in <code>conf/broker.conf</code>:</p>
-<pre><code class="hljs css language-properties"># Authorization provider fully <span class="hljs-keyword">qualified</span> <span class="hljs-keyword">class</span>-name
-authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Authorization provider fully qualified class-name</span>
+<span class="hljs-attr">authorizationProvider</span>=<span class="hljs-string">org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider</span>
 </code></pre>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
  * Provider of authorization mechanism
diff --git a/content/docs/en/security-extending/index.html b/content/docs/en/security-extending/index.html
index 3aac43e..ef4f7ee 100644
--- a/content/docs/en/security-extending/index.html
+++ b/content/docs/en/security-extending/index.html
@@ -78,8 +78,8 @@ type of connection or by passing a certificate chain to use for TLS.</p>
 passed by the client. Broker can support multiple authentication providers
 at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
@@ -128,8 +128,8 @@ configure a different one through a plugin.</p>
 <p>To provide a custom provider, one needs to implement the
 <code>org.apache.pulsar.broker.authorization.AuthorizationProvider</code> interface, have this class in the
 Pulsar broker classpath and configure it in <code>conf/broker.conf</code>:</p>
-<pre><code class="hljs css language-properties"># Authorization provider fully <span class="hljs-keyword">qualified</span> <span class="hljs-keyword">class</span>-name
-authorizationProvider=org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Authorization provider fully qualified class-name</span>
+<span class="hljs-attr">authorizationProvider</span>=<span class="hljs-string">org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider</span>
 </code></pre>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
  * Provider of authorization mechanism
diff --git a/content/docs/en/security-tls-authentication.html b/content/docs/en/security-tls-authentication.html
index 512cf77..8b814e5 100644
--- a/content/docs/en/security-tls-authentication.html
+++ b/content/docs/en/security-tls-authentication.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/en/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/en/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/en/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/security-tls-authentication/index.html b/content/docs/en/security-tls-authentication/index.html
index 512cf77..8b814e5 100644
--- a/content/docs/en/security-tls-authentication/index.html
+++ b/content/docs/en/security-tls-authentication/index.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/en/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/en/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/en/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/reference-cli-tools">Command-line tools</a> like <a href="/docs/en/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/en/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/en/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/security-tls-transport.html b/content/docs/en/security-tls-transport.html
index b4fea4b..9b65a17 100644
--- a/content/docs/en/security-tls-transport.html
+++ b/content/docs/en/security-tls-transport.html
@@ -117,10 +117,10 @@ should be configured to disable TLS hostname verification.</p>
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/en/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/en/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -129,14 +129,14 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -144,11 +144,11 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/security-tls-transport/index.html b/content/docs/en/security-tls-transport/index.html
index b4fea4b..9b65a17 100644
--- a/content/docs/en/security-tls-transport/index.html
+++ b/content/docs/en/security-tls-transport/index.html
@@ -117,10 +117,10 @@ should be configured to disable TLS hostname verification.</p>
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/en/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/en/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file,
@@ -129,14 +129,14 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -144,11 +144,11 @@ as well as the default values for those parameters, can be found in <a href="/do
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/en/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/en/standalone-docker.html b/content/docs/en/standalone-docker.html
index 25b3665..3d9dadd 100644
--- a/content/docs/en/standalone-docker.html
+++ b/content/docs/en/standalone-docker.html
@@ -64,8 +64,8 @@ data and metadata in the filesystem outside the container, in order to not start
 time the container is restarted.</li>
 </ul>
 <p>If Pulsar has been successfully started, you should see <code>INFO</code>-level log messages like this:</p>
-<pre><code class="hljs"><span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,030</span> - INFO  - [main:WebService@<span class="hljs-number">213</span>] - Web Service started at http://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">8080</span>
-<span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,038</span> - INFO  - [main:PulsarService@<span class="hljs-number">335</span>] - messaging service is ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker url=pulsar://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">6650</span>, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@<span class="hljs-number">4d</ [...]
+<pre><code class="hljs"><span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">030</span> - INFO  - [main:<span class="hljs-symbol">WebService@</span><span class="hljs-number">213</span>] - Web Service started at http:<span class="hljs-comment">//127.0.0.1:8080</span>
+<span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">038</span> - INFO  - [main:<span class="hljs-symbol">PulsarService@</span><span class="hljs-number">335</span>] - messaging service <span class="hljs-keyword">is</span> ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker  [...]
 ...
 </code></pre>
 <blockquote>
diff --git a/content/docs/en/standalone-docker/index.html b/content/docs/en/standalone-docker/index.html
index 25b3665..3d9dadd 100644
--- a/content/docs/en/standalone-docker/index.html
+++ b/content/docs/en/standalone-docker/index.html
@@ -64,8 +64,8 @@ data and metadata in the filesystem outside the container, in order to not start
 time the container is restarted.</li>
 </ul>
 <p>If Pulsar has been successfully started, you should see <code>INFO</code>-level log messages like this:</p>
-<pre><code class="hljs"><span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,030</span> - INFO  - [main:WebService@<span class="hljs-number">213</span>] - Web Service started at http://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">8080</span>
-<span class="hljs-number">2017-08-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34:04,038</span> - INFO  - [main:PulsarService@<span class="hljs-number">335</span>] - messaging service is ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker url=pulsar://<span class="hljs-number">127.0.0.1</span>:<span class="hljs-number">6650</span>, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@<span class="hljs-number">4d</ [...]
+<pre><code class="hljs"><span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">030</span> - INFO  - [main:<span class="hljs-symbol">WebService@</span><span class="hljs-number">213</span>] - Web Service started at http:<span class="hljs-comment">//127.0.0.1:8080</span>
+<span class="hljs-number">2017</span><span class="hljs-number">-08</span><span class="hljs-number">-09</span> <span class="hljs-number">22</span>:<span class="hljs-number">34</span>:<span class="hljs-number">04</span>,<span class="hljs-number">038</span> - INFO  - [main:<span class="hljs-symbol">PulsarService@</span><span class="hljs-number">335</span>] - messaging service <span class="hljs-keyword">is</span> ready, bootstrap service on port=<span class="hljs-number">8080</span>, broker  [...]
 ...
 </code></pre>
 <blockquote>
diff --git a/content/docs/fr/2.1.0-incubating/administration-load-distribution.html b/content/docs/fr/2.1.0-incubating/administration-load-distribution.html
index a0d28d4..66f3b21 100644
--- a/content/docs/fr/2.1.0-incubating/administration-load-distribution.html
+++ b/content/docs/fr/2.1.0-incubating/administration-load-distribution.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/2.1.0-incubating/administration-stats"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/2.1.0-incubating/administration-proxy"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution ac [...]
diff --git a/content/docs/fr/2.1.0-incubating/administration-load-distribution/index.html b/content/docs/fr/2.1.0-incubating/administration-load-distribution/index.html
index a0d28d4..66f3b21 100644
--- a/content/docs/fr/2.1.0-incubating/administration-load-distribution/index.html
+++ b/content/docs/fr/2.1.0-incubating/administration-load-distribution/index.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/2.1.0-incubating/administration-stats"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/2.1.0-incubating/administration-proxy"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution ac [...]
diff --git a/content/docs/fr/2.1.0-incubating/administration-zk-bk.html b/content/docs/fr/2.1.0-incubating/administration-zk-bk.html
index 1d9b6c0..eb72fee 100644
--- a/content/docs/fr/2.1.0-incubating/administration-zk-bk.html
+++ b/content/docs/fr/2.1.0-incubating/administration-zk-bk.html
@@ -64,9 +64,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -86,10 +86,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -102,25 +102,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -181,16 +181,16 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/fr/2.1.0-incubating/administration-zk-bk/index.html b/content/docs/fr/2.1.0-incubating/administration-zk-bk/index.html
index 1d9b6c0..eb72fee 100644
--- a/content/docs/fr/2.1.0-incubating/administration-zk-bk/index.html
+++ b/content/docs/fr/2.1.0-incubating/administration-zk-bk/index.html
@@ -64,9 +64,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -86,10 +86,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -102,25 +102,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -181,16 +181,16 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/fr/2.1.0-incubating/client-libraries-websocket.html b/content/docs/fr/2.1.0-incubating/client-libraries-websocket.html
index 176630a..0fd24ca 100644
--- a/content/docs/fr/2.1.0-incubating/client-libraries-websocket.html
+++ b/content/docs/fr/2.1.0-incubating/client-libraries-websocket.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/fr/2.1.0-incubating/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/fr/2.1.0-incubating/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/fr/2.1.0-incubating/client-libraries-websocket/index.html b/content/docs/fr/2.1.0-incubating/client-libraries-websocket/index.html
index 176630a..0fd24ca 100644
--- a/content/docs/fr/2.1.0-incubating/client-libraries-websocket/index.html
+++ b/content/docs/fr/2.1.0-incubating/client-libraries-websocket/index.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/fr/2.1.0-incubating/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/fr/2.1.0-incubating/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster.html b/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster.html
index b9e97fb..eff1765 100644
--- a/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster.html
+++ b/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster.html
@@ -118,9 +118,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -140,10 +140,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -156,25 +156,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -235,12 +235,12 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>You also need to specify the name of the <a href="/docs/fr/2.1.0-incubating/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -261,11 +261,11 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <h3><a class="anchor" aria-hidden="true" id="service-discovery-setup"></a><a href="#service-discovery-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/fr/2.1.0-incubating/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/fr/2.1.0-incubating/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/fr/2.1.0-incubating/refere [...]
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -273,7 +273,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/fr/2.1.0-incubating/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/fr/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/fr/2.1.0-incubating/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html b/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html
index b9e97fb..eff1765 100644
--- a/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html
+++ b/content/docs/fr/2.1.0-incubating/deploy-bare-metal-multi-cluster/index.html
@@ -118,9 +118,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -140,10 +140,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -156,25 +156,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -235,12 +235,12 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>You also need to specify the name of the <a href="/docs/fr/2.1.0-incubating/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -261,11 +261,11 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <h3><a class="anchor" aria-hidden="true" id="service-discovery-setup"></a><a href="#service-discovery-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/fr/2.1.0-incubating/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/fr/2.1.0-incubating/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/fr/2.1.0-incubating/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/fr/2.1.0-incubating/refere [...]
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -273,7 +273,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/fr/2.1.0-incubating/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/fr/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/fr/2.1.0-incubating/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/fr/2.1.0-incubating/deploy-bare-metal.html b/content/docs/fr/2.1.0-incubating/deploy-bare-metal.html
index 9f3217a..70a87e5 100644
--- a/content/docs/fr/2.1.0-incubating/deploy-bare-metal.html
+++ b/content/docs/fr/2.1.0-incubating/deploy-bare-metal.html
@@ -159,9 +159,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -205,7 +205,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -237,11 +237,11 @@ $ bin/pulsar-daemon start bookie
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configura [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/fr/2.1.0-incubating/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -267,8 +267,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/fr/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/fr/2.1.0-incubating/deploy-bare-metal/index.html b/content/docs/fr/2.1.0-incubating/deploy-bare-metal/index.html
index 9f3217a..70a87e5 100644
--- a/content/docs/fr/2.1.0-incubating/deploy-bare-metal/index.html
+++ b/content/docs/fr/2.1.0-incubating/deploy-bare-metal/index.html
@@ -159,9 +159,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -205,7 +205,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/fr/2.1.0-incubating/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -237,11 +237,11 @@ $ bin/pulsar-daemon start bookie
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configura [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/fr/2.1.0-incubating/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -267,8 +267,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/fr/2.1.0-incubating/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/fr/2.1.0-incubating/reference-configuration.html b/content/docs/fr/2.1.0-incubating/reference-configuration.html
index feb211d..c3900eb 100644
--- a/content/docs/fr/2.1.0-incubating/reference-configuration.html
+++ b/content/docs/fr/2.1.0-incubating/reference-configuration.html
@@ -461,9 +461,9 @@
 </tbody>
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/fr/2.1.0-incubating/reference-configuration/index.html b/content/docs/fr/2.1.0-incubating/reference-configuration/index.html
index feb211d..c3900eb 100644
--- a/content/docs/fr/2.1.0-incubating/reference-configuration/index.html
+++ b/content/docs/fr/2.1.0-incubating/reference-configuration/index.html
@@ -461,9 +461,9 @@
 </tbody>
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/fr/2.1.0-incubating/security-athenz.html b/content/docs/fr/2.1.0-incubating/security-athenz.html
index 1ef6745..f9a632b 100644
--- a/content/docs/fr/2.1.0-incubating/security-athenz.html
+++ b/content/docs/fr/2.1.0-incubating/security-athenz.html
@@ -74,15 +74,15 @@
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker">Broker Configuration</a>.</p>
@@ -96,16 +96,16 @@
 <p><a href="/docs/fr/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/2.1.0-incubating/security-tls-authentication"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/2.1.0-incubating/security-authorization"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authenticatio [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/fr/2.1.0-incubating/security-athenz/index.html b/content/docs/fr/2.1.0-incubating/security-athenz/index.html
index 1ef6745..f9a632b 100644
--- a/content/docs/fr/2.1.0-incubating/security-athenz/index.html
+++ b/content/docs/fr/2.1.0-incubating/security-athenz/index.html
@@ -74,15 +74,15 @@
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker">Broker Configuration</a>.</p>
@@ -96,16 +96,16 @@
 <p><a href="/docs/fr/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/2.1.0-incubating/security-tls-authentication"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/2.1.0-incubating/security-authorization"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authenticatio [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/fr/2.1.0-incubating/security-authorization.html b/content/docs/fr/2.1.0-incubating/security-authorization.html
index f54fe22..b40a86c 100644
--- a/content/docs/fr/2.1.0-incubating/security-authorization.html
+++ b/content/docs/fr/2.1.0-incubating/security-authorization.html
@@ -51,8 +51,8 @@
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/fr/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/fr/2.1.0-incubating/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker">Broker Configuration</a></p>
@@ -65,10 +65,10 @@
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/fr/2.1.0-incubating/security-authorization/index.html b/content/docs/fr/2.1.0-incubating/security-authorization/index.html
index f54fe22..b40a86c 100644
--- a/content/docs/fr/2.1.0-incubating/security-authorization/index.html
+++ b/content/docs/fr/2.1.0-incubating/security-authorization/index.html
@@ -51,8 +51,8 @@
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/fr/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/fr/2.1.0-incubating/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker">Broker Configuration</a></p>
@@ -65,10 +65,10 @@
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/fr/2.1.0-incubating/security-extending.html b/content/docs/fr/2.1.0-incubating/security-extending.html
index 2e09a80..c2fd85e 100644
--- a/content/docs/fr/2.1.0-incubating/security-extending.html
+++ b/content/docs/fr/2.1.0-incubating/security-extending.html
@@ -66,8 +66,8 @@
 <h3><a class="anchor" aria-hidden="true" id="broker-authentication-plugin"></a><a href="#broker-authentication-plugin" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 [...]
 <p>On broker side, we need the corresponding plugin to validate the credentials passed by the client. Broker can support multiple authentication providers at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
diff --git a/content/docs/fr/2.1.0-incubating/security-extending/index.html b/content/docs/fr/2.1.0-incubating/security-extending/index.html
index 2e09a80..c2fd85e 100644
--- a/content/docs/fr/2.1.0-incubating/security-extending/index.html
+++ b/content/docs/fr/2.1.0-incubating/security-extending/index.html
@@ -66,8 +66,8 @@
 <h3><a class="anchor" aria-hidden="true" id="broker-authentication-plugin"></a><a href="#broker-authentication-plugin" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 [...]
 <p>On broker side, we need the corresponding plugin to validate the credentials passed by the client. Broker can support multiple authentication providers at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
diff --git a/content/docs/fr/2.1.0-incubating/security-tls-authentication.html b/content/docs/fr/2.1.0-incubating/security-tls-authentication.html
index ccffbd0..0802e36 100644
--- a/content/docs/fr/2.1.0-incubating/security-tls-authentication.html
+++ b/content/docs/fr/2.1.0-incubating/security-tls-authentication.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/fr/2.1.0-incubating/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/fr/2.1.0-incubating/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/fr/2.1.0-incubating/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/2.1.0-incubating/security-tls-authentication/index.html b/content/docs/fr/2.1.0-incubating/security-tls-authentication/index.html
index ccffbd0..0802e36 100644
--- a/content/docs/fr/2.1.0-incubating/security-tls-authentication/index.html
+++ b/content/docs/fr/2.1.0-incubating/security-tls-authentication/index.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/fr/2.1.0-incubating/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/fr/2.1.0-incubating/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/fr/2.1.0-incubating/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/2.1.0-incubating/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/2.1.0-incubating/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/2.1.0-incubating/security-tls-transport.html b/content/docs/fr/2.1.0-incubating/security-tls-transport.html
index d005c14..981986a 100644
--- a/content/docs/fr/2.1.0-incubating/security-tls-transport.html
+++ b/content/docs/fr/2.1.0-incubating/security-tls-transport.html
@@ -114,10 +114,10 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/fr/2.1.0-incubating/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/fr/2.1.0-incubating/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker">Broker Configuration</a></p>
@@ -125,14 +125,14 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -140,11 +140,11 @@ $ chmod 444 certs/ca.cert.pem
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/2.1.0-incubating/security-tls-transport/index.html b/content/docs/fr/2.1.0-incubating/security-tls-transport/index.html
index d005c14..981986a 100644
--- a/content/docs/fr/2.1.0-incubating/security-tls-transport/index.html
+++ b/content/docs/fr/2.1.0-incubating/security-tls-transport/index.html
@@ -114,10 +114,10 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/fr/2.1.0-incubating/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/fr/2.1.0-incubating/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/2.1.0-incubating/reference-configuration#broker">Broker Configuration</a></p>
@@ -125,14 +125,14 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -140,11 +140,11 @@ $ chmod 444 certs/ca.cert.pem
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/2.1.0-incubating/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/administration-load-distribution.html b/content/docs/fr/administration-load-distribution.html
index 60e3d60..524e6ba 100644
--- a/content/docs/fr/administration-load-distribution.html
+++ b/content/docs/fr/administration-load-distribution.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/administration-stats"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/administration-proxy"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a></li><li><a [...]
diff --git a/content/docs/fr/administration-load-distribution/index.html b/content/docs/fr/administration-load-distribution/index.html
index 60e3d60..524e6ba 100644
--- a/content/docs/fr/administration-load-distribution/index.html
+++ b/content/docs/fr/administration-load-distribution/index.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/administration-stats"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/administration-proxy"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a></li><li><a [...]
diff --git a/content/docs/fr/administration-zk-bk.html b/content/docs/fr/administration-zk-bk.html
index 24aa095..435bd1c 100644
--- a/content/docs/fr/administration-zk-bk.html
+++ b/content/docs/fr/administration-zk-bk.html
@@ -64,9 +64,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -86,10 +86,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -102,25 +102,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -181,16 +181,16 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/fr/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/fr/administration-zk-bk/index.html b/content/docs/fr/administration-zk-bk/index.html
index 24aa095..435bd1c 100644
--- a/content/docs/fr/administration-zk-bk/index.html
+++ b/content/docs/fr/administration-zk-bk/index.html
@@ -64,9 +64,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -86,10 +86,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -102,25 +102,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -181,16 +181,16 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/fr/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/fr/client-libraries-websocket.html b/content/docs/fr/client-libraries-websocket.html
index ca5ae74..a823eed 100644
--- a/content/docs/fr/client-libraries-websocket.html
+++ b/content/docs/fr/client-libraries-websocket.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/fr/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/fr/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/fr/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/fr/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/fr/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/fr/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/fr/client-libraries-websocket/index.html b/content/docs/fr/client-libraries-websocket/index.html
index ca5ae74..a823eed 100644
--- a/content/docs/fr/client-libraries-websocket/index.html
+++ b/content/docs/fr/client-libraries-websocket/index.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/fr/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/fr/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/fr/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/fr/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/fr/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/fr/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/fr/deploy-bare-metal-multi-cluster.html b/content/docs/fr/deploy-bare-metal-multi-cluster.html
index fc3e9ee..c564a0c 100644
--- a/content/docs/fr/deploy-bare-metal-multi-cluster.html
+++ b/content/docs/fr/deploy-bare-metal-multi-cluster.html
@@ -118,9 +118,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -140,10 +140,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -156,25 +156,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -235,12 +235,12 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>You also need to specify the name of the <a href="/docs/fr/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/fr/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -261,11 +261,11 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <h3><a class="anchor" aria-hidden="true" id="service-discovery-setup"></a><a href="#service-discovery-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/fr/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/fr/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/fr/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/fr/reference-configuration#service-discovery-configurationSt [...]
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -273,7 +273,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/fr/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/fr/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/fr/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/fr/deploy-bare-metal-multi-cluster/index.html b/content/docs/fr/deploy-bare-metal-multi-cluster/index.html
index fc3e9ee..c564a0c 100644
--- a/content/docs/fr/deploy-bare-metal-multi-cluster/index.html
+++ b/content/docs/fr/deploy-bare-metal-multi-cluster/index.html
@@ -118,9 +118,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -140,10 +140,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -156,25 +156,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -235,12 +235,12 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>You also need to specify the name of the <a href="/docs/fr/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/fr/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -261,11 +261,11 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <h3><a class="anchor" aria-hidden="true" id="service-discovery-setup"></a><a href="#service-discovery-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/fr/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/fr/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/fr/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/fr/reference-configuration#service-discovery-configurationSt [...]
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -273,7 +273,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/fr/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/fr/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/fr/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/fr/deploy-bare-metal.html b/content/docs/fr/deploy-bare-metal.html
index 63bee22..b0d3dea 100644
--- a/content/docs/fr/deploy-bare-metal.html
+++ b/content/docs/fr/deploy-bare-metal.html
@@ -159,9 +159,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/fr/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -205,7 +205,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/fr/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/fr/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/fr/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -237,11 +237,11 @@ $ bin/pulsar-daemon start bookie
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/fr/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/fr/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <code>config [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/fr/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -267,8 +267,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/fr/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/fr/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/fr/deploy-bare-metal/index.html b/content/docs/fr/deploy-bare-metal/index.html
index 63bee22..b0d3dea 100644
--- a/content/docs/fr/deploy-bare-metal/index.html
+++ b/content/docs/fr/deploy-bare-metal/index.html
@@ -159,9 +159,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/fr/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -205,7 +205,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/fr/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/fr/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/fr/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -237,11 +237,11 @@ $ bin/pulsar-daemon start bookie
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/fr/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/fr/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <code>config [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/fr/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -267,8 +267,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/fr/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/fr/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/fr/next/administration-load-distribution.html b/content/docs/fr/next/administration-load-distribution.html
index 13b784d..a647b6f 100644
--- a/content/docs/fr/next/administration-load-distribution.html
+++ b/content/docs/fr/next/administration-load-distribution.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/next/administration-stats"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/next/administration-proxy"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a>< [...]
diff --git a/content/docs/fr/next/administration-load-distribution/index.html b/content/docs/fr/next/administration-load-distribution/index.html
index 13b784d..a647b6f 100644
--- a/content/docs/fr/next/administration-load-distribution/index.html
+++ b/content/docs/fr/next/administration-load-distribution/index.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/next/administration-stats"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/next/administration-proxy"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across Pulsar brokers</a>< [...]
diff --git a/content/docs/fr/next/administration-zk-bk.html b/content/docs/fr/next/administration-zk-bk.html
index b3c1285..1df5518 100644
--- a/content/docs/fr/next/administration-zk-bk.html
+++ b/content/docs/fr/next/administration-zk-bk.html
@@ -64,9 +64,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -86,10 +86,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -102,25 +102,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -181,16 +181,16 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/fr/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/fr/next/administration-zk-bk/index.html b/content/docs/fr/next/administration-zk-bk/index.html
index b3c1285..1df5518 100644
--- a/content/docs/fr/next/administration-zk-bk/index.html
+++ b/content/docs/fr/next/administration-zk-bk/index.html
@@ -64,9 +64,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -86,10 +86,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -102,25 +102,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -181,16 +181,16 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/fr/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required in <code>conf/bookkeeper.conf</code> are:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Change to point to journal disk mount point</span>
-<span class="hljs-attr">journalDirectory</span>=data/bookkeeper/journal
-
-<span class="hljs-comment"># Point to ledger storage disk mount point</span>
-<span class="hljs-attr">ledgerDirectories</span>=data/bookkeeper/ledgers
-
-<span class="hljs-comment"># Point to local ZK quorum</span>
-<span class="hljs-attr">zkServers</span>=zk1.example.com:<span class="hljs-number">2181</span>,zk2.example.com:<span class="hljs-number">2181</span>,zk3.example.com:<span class="hljs-number">2181</span>
-
-<span class="hljs-comment"># Change the ledger manager type</span>
-<span class="hljs-attr">ledgerManagerType</span>=hierarchical
+<span class="hljs-attr">journalDirectory</span>=<span class="hljs-string">data/bookkeeper/journal</span>
+<span class="hljs-comment">
+# Point to ledger storage disk mount point</span>
+<span class="hljs-attr">ledgerDirectories</span>=<span class="hljs-string">data/bookkeeper/ledgers</span>
+<span class="hljs-comment">
+# Point to local ZK quorum</span>
+<span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181</span>
+<span class="hljs-comment">
+# Change the ledger manager type</span>
+<span class="hljs-attr">ledgerManagerType</span>=<span class="hljs-string">hierarchical</span>
 </code></pre>
 <blockquote>
 <p>Consult the official <a href="http://bookkeeper.apache.org">BookKeeper docs</a> for more information about BookKeeper.</p>
diff --git a/content/docs/fr/next/client-libraries-websocket.html b/content/docs/fr/next/client-libraries-websocket.html
index 0a68637..d1a0e04 100644
--- a/content/docs/fr/next/client-libraries-websocket.html
+++ b/content/docs/fr/next/client-libraries-websocket.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/fr/next/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/fr/next/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/fr/next/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/fr/next/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/fr/next/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/fr/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/fr/next/client-libraries-websocket/index.html b/content/docs/fr/next/client-libraries-websocket/index.html
index 0a68637..d1a0e04 100644
--- a/content/docs/fr/next/client-libraries-websocket/index.html
+++ b/content/docs/fr/next/client-libraries-websocket/index.html
@@ -58,7 +58,7 @@
 </ul>
 <h3><a class="anchor" aria-hidden="true" id="embedded-with-a-pulsar-broker"></a><a href="#embedded-with-a-pulsar-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>In this mode, the WebSocket service will run within the same HTTP service that's already running in the broker. To enable this mode, set the <a href="/docs/fr/next/reference-configuration#broker-webSocketServiceEnabled"><code>webSocketServiceEnabled</code></a> parameter in the <a href="/docs/fr/next/reference-configuration#broker"><code>conf/broker.conf</code></a> configuration file in your installation.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-literal">true</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webSocketServiceEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="as-a-separate-component"></a><a href="#as-a-separate-component" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In this mode, the WebSocket service will be run from a Pulsar <a href="/docs/fr/next/reference-terminology#broker">broker</a> as a separate service. Configuration for this mode is handled in the <a href="/docs/fr/next/reference-configuration#websocket"><code>conf/websocket.conf</code></a> configuration file. You'll need to set <em>at least</em> the following parameters:</p>
@@ -68,9 +68,9 @@
 <li><a href="/docs/fr/next/reference-configuration#websocket-clusterName"><code>clusterName</code></a></li>
 </ul>
 <p>Here's an example:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=zk1:<span class="hljs-number">2181</span>,zk2:<span class="hljs-number">2181</span>,zk3:<span class="hljs-number">2181</span>
-<span class="hljs-attr">webServicePort</span>=<span class="hljs-number">8080</span>
-<span class="hljs-attr">clusterName</span>=my-cluster
+<pre><code class="hljs css language-properties"><span class="hljs-attr">globalZookeeperServers</span>=<span class="hljs-string">zk1:2181,zk2:2181,zk3:2181</span>
+<span class="hljs-attr">webServicePort</span>=<span class="hljs-string">8080</span>
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">my-cluster</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="starting-the-broker"></a><a href="#starting-the-broker" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>When the configuration is set, you can start the service using the <a href="/docs/fr/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a> tool:</p>
diff --git a/content/docs/fr/next/deploy-bare-metal-multi-cluster.html b/content/docs/fr/next/deploy-bare-metal-multi-cluster.html
index 2d390ad..b4e51da 100644
--- a/content/docs/fr/next/deploy-bare-metal-multi-cluster.html
+++ b/content/docs/fr/next/deploy-bare-metal-multi-cluster.html
@@ -118,9 +118,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -140,10 +140,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -156,25 +156,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -235,12 +235,12 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>You also need to specify the name of the <a href="/docs/fr/next/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/fr/next/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -261,11 +261,11 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <h3><a class="anchor" aria-hidden="true" id="service-discovery-setup"></a><a href="#service-discovery-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/fr/next/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/fr/next/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/fr/next/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/fr/next/reference-configuration#service-discovery- [...]
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -273,7 +273,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/fr/next/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/fr/next/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/fr/next/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/fr/next/deploy-bare-metal-multi-cluster/index.html b/content/docs/fr/next/deploy-bare-metal-multi-cluster/index.html
index 2d390ad..b4e51da 100644
--- a/content/docs/fr/next/deploy-bare-metal-multi-cluster/index.html
+++ b/content/docs/fr/next/deploy-bare-metal-multi-cluster/index.html
@@ -118,9 +118,9 @@ $ <span class="hljs-built_in">cd</span> apache-pulsar-2.1.1-incubating
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/fr/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -140,10 +140,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/fr/next/reference-configuration#configuration-store"><code>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>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -156,25 +156,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/fr/next/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -235,12 +235,12 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>You also need to specify the name of the <a href="/docs/fr/next/reference-terminology#cluster">cluster</a> to which the broker belongs using the <a href="/docs/fr/next/reference-configuration#broker-clusterName"><code>clusterName</code></a> parameter.</p>
 <p>Here's an example configuration:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Local ZooKeeper servers</span>
-<span class="hljs-attr">zookeeperServers</span>=zk1.us-west.example.com:<span class="hljs-number">2181</span>,zk2.us-west.example.com:<span class="hljs-number">2181</span>,zk3.us-west.example.com:<span class="hljs-number">2181</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Configuration store quorum connection string.</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 
-<span class="hljs-comment"># Configuration store quorum connection string.</span>
-<span class="hljs-attr">configurationStoreServers</span>=zk1.us-west.example.com:<span class="hljs-number">2184</span>,zk2.us-west.example.com:<span class="hljs-number">2184</span>,zk3.us-west.example.com:<span class="hljs-number">2184</span>
-
-<span class="hljs-attr">clusterName</span>=us-west
+<span class="hljs-attr">clusterName</span>=<span class="hljs-string">us-west</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="broker-hardware"></a><a href="#broker-hardware" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5  [...]
 <p>Pulsar brokers do not require any special hardware since they don't use the local disk. Fast CPUs and 10Gbps <a href="https://en.wikipedia.org/wiki/Network_interface_controller">NIC</a> are recommended since the software can take full advantage of that.</p>
@@ -261,11 +261,11 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <h3><a class="anchor" aria-hidden="true" id="service-discovery-setup"></a><a href="#service-discovery-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>The service discovery mechanism included with Pulsar maintains a list of active brokers, stored in ZooKeeper, and supports lookup using HTTP and also Pulsar's <a href="/docs/fr/next/develop-binary-protocol">binary protocol</a>.</p>
 <p>To get started setting up Pulsar's built-in service discovery, you need to change a few parameters in the <a href="/docs/fr/next/reference-configuration#service-discovery"><code>conf/discovery.conf</code></a> configuration file. Set the <a href="/docs/fr/next/reference-configuration#service-discovery-zookeeperServers"><code>zookeeperServers</code></a> parameter to the cluster's ZooKeeper quorum connection string and the <a href="/docs/fr/next/reference-configuration#service-discovery- [...]
-<pre><code class="hljs css language-properties"># Zookeeper quorum connection <span class="hljs-built_in">string</span>
-zookeeperServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2181,zk2.<span class="hljs-keyword">us</span>-west.example.com:2181,zk3.<span class="hljs-keyword">us</span>-west.example.com:2181
-
-# <span class="hljs-keyword">Global</span> configuration store connection <span class="hljs-built_in">string</span>
-configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.com:2184,zk2.<span class="hljs-keyword">us</span>-west.example.com:2184,zk3.<span class="hljs-keyword">us</span>-west.example.com:2184
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Zookeeper quorum connection string</span>
+<span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-comment">
+# Global configuration store connection string</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184</span>
 </code></pre>
 <p>To start the discovery service:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-daemon start discovery</span>
@@ -273,7 +273,7 @@ configurationStoreServers=zk1.<span class="hljs-keyword">us</span>-west.example.
 <h2><a class="anchor" aria-hidden="true" id="admin-client-and-verification"></a><a href="#admin-client-and-verification" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
 <p>At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as <a href="/docs/fr/next/admin-api-overview">administrative clients</a> for each cluster. You can use the <a href="/docs/fr/next/reference-configuration#client"><code>conf/client.conf</code></a> configuration file to configure admin clients.</p>
 <p>The most important thing is that you point the <a href="/docs/fr/next/reference-configuration#client-serviceUrl"><code>serviceUrl</code></a> parameter to the correct service URL for the cluster:</p>
-<pre><code class="hljs css language-properties">serviceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//pulsar.us-west.example.com:8080/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">http://pulsar.us-west.example.com:8080/</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="provisioning-new-tenants"></a><a href="#provisioning-new-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-. [...]
 <p>Pulsar was built as a fundamentally multi-tenant system.</p>
diff --git a/content/docs/fr/next/deploy-bare-metal.html b/content/docs/fr/next/deploy-bare-metal.html
index 32c8844..eaaf158 100644
--- a/content/docs/fr/next/deploy-bare-metal.html
+++ b/content/docs/fr/next/deploy-bare-metal.html
@@ -159,9 +159,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/fr/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -205,7 +205,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/fr/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/fr/next/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/fr/next/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -237,11 +237,11 @@ $ bin/pulsar-daemon start bookie
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/fr/next/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/fr/next/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <c [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/fr/next/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -267,8 +267,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/fr/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/fr/next/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/fr/next/deploy-bare-metal/index.html b/content/docs/fr/next/deploy-bare-metal/index.html
index 32c8844..eaaf158 100644
--- a/content/docs/fr/next/deploy-bare-metal/index.html
+++ b/content/docs/fr/next/deploy-bare-metal/index.html
@@ -159,9 +159,9 @@ pulsar-io-twitter-2.1.1-incubating.nar
 </blockquote>
 <p><a href="https://zookeeper.apache.org">ZooKeeper</a> manages a variety of essential coordination- and configuration-related tasks for Pulsar. To deploy a Pulsar cluster you'll need to deploy ZooKeeper first (before all other components). We recommend deploying a 3-node ZooKeeper cluster. Pulsar does not make heavy use of ZooKeeper, so more lightweight machines or VMs should suffice for running ZooKeeper.</p>
 <p>To begin, add all ZooKeeper servers to the configuration specified in <a href="/docs/fr/next/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> (in the Pulsar directory you created <a href="#installing-the-pulsar-binary-package">above</a>). Here's an example:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/fr/next/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -205,7 +205,7 @@ $ <span class="hljs-built_in">echo</span> 1 &gt; data/zookeeper/myid
 <h2><a class="anchor" aria-hidden="true" id="deploying-a-bookkeeper-cluster"></a><a href="#deploying-a-bookkeeper-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p><a href="https://bookkeeper.apache.org">BookKeeper</a> handles all persistent data storage in Pulsar. You will need to deploy a cluster of BookKeeper bookies to use Pulsar. We recommend running a <strong>3-bookie BookKeeper cluster</strong>.</p>
 <p>BookKeeper bookies can be configured using the <a href="/docs/fr/next/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> configuration file. The most important step in configuring bookies for our purposes here is ensuring that the <a href="/docs/fr/next/reference-configuration#bookkeeper-zkServers"><code>zkServers</code></a> is set to the connection string for the ZooKeeper cluster. Here's an example:</p>
-<pre><code class="hljs css language-properties">zkServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class= [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zkServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>Once you've appropriately modified the <code>zkServers</code> parameter, you can provide any other configuration modifications you need. You can find a full listing of the available BookKeeper configuration parameters <a href="/docs/fr/next/reference-configuration#bookkeeper">here</a>, although we would recommend consulting the <a href="http://bookkeeper.apache.org/docs/latest/reference/config/">BookKeeper documentation</a> for a more in-depth guide.</p>
 <blockquote>
@@ -237,11 +237,11 @@ $ bin/pulsar-daemon start bookie
 <p>Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Brokers handle Pulsar messages and provide Pulsar's administrative interface. We recommend running <strong>3 brokers</strong>, one for each machine that's already running a BookKeeper bookie.</p>
 <h3><a class="anchor" aria-hidden="true" id="configuring-brokers"></a><a href="#configuring-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>The most important element of broker configuration is ensuring that that each broker is aware of the ZooKeeper cluster that you've deployed. Make sure that the <a href="/docs/fr/next/reference-configuration#broker-zookeeperServers"><code>zookeeperServers</code></a> and <a href="/docs/fr/next/reference-configuration#broker-configurationStoreServers"><code>configurationStoreServers</code></a> parameters. In this case, since we only have 1 cluster and no configuration store setup, the <c [...]
-<pre><code class="hljs css language-properties">zookeeperServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span [...]
-configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2181</span>,zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</ [...]
+<pre><code class="hljs css language-properties"><span class="hljs-attr">zookeeperServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
+<span class="hljs-attr">configurationStoreServers</span>=<span class="hljs-string">zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181</span>
 </code></pre>
 <p>You also need to specify the cluster name (matching the name that you provided when <a href="#initializing-cluster-metadata">initializing the cluster's metadata</a>:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=pulsar-cluster-<span class="hljs-number">1</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clusterName</span>=<span class="hljs-string">pulsar-cluster-1</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="enabling-pulsar-functions-optional"></a><a href="#enabling-pulsar-functions-optional" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5 [...]
 <p>If you want to enable <a href="/docs/fr/next/functions-overview">Pulsar Functions</a>, you can follow the instructions as below:</p>
@@ -267,8 +267,8 @@ configurationStoreServers=zk1<span class="hljs-selector-class">.us-west</span><s
 <h2><a class="anchor" aria-hidden="true" id="connecting-to-the-running-cluster"></a><a href="#connecting-to-the-running-cluster" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S1 [...]
 <p>Once your Pulsar cluster is up and running, you should be able to connect with it using Pulsar clients. One such client is the <a href="/docs/fr/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> tool, which is included with the Pulsar binary package. The <code>pulsar-client</code> tool can publish messages to and consume messages from Pulsar topics and thus provides a simple way to make sure that your cluster is runnning properly.</p>
 <p>To use the <code>pulsar-client</code> tool, first modify the client configuration file in <a href="/docs/fr/next/reference-configuration#client"><code>conf/client.conf</code></a> in your binary package. You'll need to change the values for <code>webServiceUrl</code> and <code>brokerServiceUrl</code>, substituting <code>localhost</code> (which is the default), with the DNS name that you've assigned to your broker/bookie hosts. Here's an example:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=<span class="hljs-string">http:</span><span class="hljs-comment">//us-west.example.com:8080/</span>
-brokerServiceurl=<span class="hljs-string">pulsar:</span><span class="hljs-comment">//us-west.example.com:6650/</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">http://us-west.example.com:8080/</span>
+<span class="hljs-attr">brokerServiceurl</span>=<span class="hljs-string">pulsar://us-west.example.com:6650/</span>
 </code></pre>
 <p>Once you've done that, you can publish a message to Pulsar topic:</p>
 <pre><code class="hljs css language-bash">$ bin/pulsar-client produce \
diff --git a/content/docs/fr/next/reference-configuration.html b/content/docs/fr/next/reference-configuration.html
index 9886a47..95bb2ca 100644
--- a/content/docs/fr/next/reference-configuration.html
+++ b/content/docs/fr/next/reference-configuration.html
@@ -461,9 +461,9 @@
 </tbody>
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/fr/next/reference-configuration/index.html b/content/docs/fr/next/reference-configuration/index.html
index 9886a47..95bb2ca 100644
--- a/content/docs/fr/next/reference-configuration/index.html
+++ b/content/docs/fr/next/reference-configuration/index.html
@@ -461,9 +461,9 @@
 </tbody>
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/fr/next/security-athenz.html b/content/docs/fr/next/security-athenz.html
index 9a1eaa0..3046566 100644
--- a/content/docs/fr/next/security-athenz.html
+++ b/content/docs/fr/next/security-athenz.html
@@ -74,15 +74,15 @@
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/next/reference-configuration#broker">Broker Configuration</a>.</p>
@@ -96,16 +96,16 @@
 <p><a href="/docs/fr/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/next/security-tls-authentication"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/next/security-authorization"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class= [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/fr/next/security-athenz/index.html b/content/docs/fr/next/security-athenz/index.html
index 9a1eaa0..3046566 100644
--- a/content/docs/fr/next/security-athenz/index.html
+++ b/content/docs/fr/next/security-athenz/index.html
@@ -74,15 +74,15 @@
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/next/reference-configuration#broker">Broker Configuration</a>.</p>
@@ -96,16 +96,16 @@
 <p><a href="/docs/fr/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/next/security-tls-authentication"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/next/security-authorization"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class= [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/fr/next/security-authorization.html b/content/docs/fr/next/security-authorization.html
index 750f0df..c953a6e 100644
--- a/content/docs/fr/next/security-authorization.html
+++ b/content/docs/fr/next/security-authorization.html
@@ -51,8 +51,8 @@
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/fr/next/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/fr/next/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/next/reference-configuration#broker">Broker Configuration</a></p>
@@ -65,10 +65,10 @@
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/fr/next/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/fr/next/security-authorization/index.html b/content/docs/fr/next/security-authorization/index.html
index 750f0df..c953a6e 100644
--- a/content/docs/fr/next/security-authorization/index.html
+++ b/content/docs/fr/next/security-authorization/index.html
@@ -51,8 +51,8 @@
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/fr/next/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/fr/next/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/next/reference-configuration#broker">Broker Configuration</a></p>
@@ -65,10 +65,10 @@
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/fr/next/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/fr/next/security-extending.html b/content/docs/fr/next/security-extending.html
index 0a15427..92fc1ca 100644
--- a/content/docs/fr/next/security-extending.html
+++ b/content/docs/fr/next/security-extending.html
@@ -66,8 +66,8 @@
 <h3><a class="anchor" aria-hidden="true" id="broker-authentication-plugin"></a><a href="#broker-authentication-plugin" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 [...]
 <p>On broker side, we need the corresponding plugin to validate the credentials passed by the client. Broker can support multiple authentication providers at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
diff --git a/content/docs/fr/next/security-extending/index.html b/content/docs/fr/next/security-extending/index.html
index 0a15427..92fc1ca 100644
--- a/content/docs/fr/next/security-extending/index.html
+++ b/content/docs/fr/next/security-extending/index.html
@@ -66,8 +66,8 @@
 <h3><a class="anchor" aria-hidden="true" id="broker-authentication-plugin"></a><a href="#broker-authentication-plugin" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 [...]
 <p>On broker side, we need the corresponding plugin to validate the credentials passed by the client. Broker can support multiple authentication providers at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
diff --git a/content/docs/fr/next/security-tls-authentication.html b/content/docs/fr/next/security-tls-authentication.html
index 40da3f0..e49a4ee 100644
--- a/content/docs/fr/next/security-tls-authentication.html
+++ b/content/docs/fr/next/security-tls-authentication.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/fr/next/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/fr/next/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/fr/next/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/next/security-tls-authentication/index.html b/content/docs/fr/next/security-tls-authentication/index.html
index 40da3f0..e49a4ee 100644
--- a/content/docs/fr/next/security-tls-authentication/index.html
+++ b/content/docs/fr/next/security-tls-authentication/index.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/fr/next/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/fr/next/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/fr/next/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/next/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/next/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/next/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/next/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/next/security-tls-transport.html b/content/docs/fr/next/security-tls-transport.html
index 98d9687..cc36c15 100644
--- a/content/docs/fr/next/security-tls-transport.html
+++ b/content/docs/fr/next/security-tls-transport.html
@@ -114,10 +114,10 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/fr/next/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/fr/next/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/next/reference-configuration#broker">Broker Configuration</a></p>
@@ -125,14 +125,14 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -140,11 +140,11 @@ $ chmod 444 certs/ca.cert.pem
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/next/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/next/security-tls-transport/index.html b/content/docs/fr/next/security-tls-transport/index.html
index 98d9687..cc36c15 100644
--- a/content/docs/fr/next/security-tls-transport/index.html
+++ b/content/docs/fr/next/security-tls-transport/index.html
@@ -114,10 +114,10 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/fr/next/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/fr/next/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/next/reference-configuration#broker">Broker Configuration</a></p>
@@ -125,14 +125,14 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -140,11 +140,11 @@ $ chmod 444 certs/ca.cert.pem
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/next/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/reference-configuration.html b/content/docs/fr/reference-configuration.html
index 77c101c..e9fde25 100644
--- a/content/docs/fr/reference-configuration.html
+++ b/content/docs/fr/reference-configuration.html
@@ -461,9 +461,9 @@
 </tbody>
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/fr/reference-configuration/index.html b/content/docs/fr/reference-configuration/index.html
index 77c101c..e9fde25 100644
--- a/content/docs/fr/reference-configuration/index.html
+++ b/content/docs/fr/reference-configuration/index.html
@@ -461,9 +461,9 @@
 </tbody>
 </table>
 <p>In addition to the parameters in the table above, configuring ZooKeeper for Pulsar involves adding a <code>server.N</code> line to the <code>conf/zookeeper.conf</code> file for each node in the ZooKeeper cluster, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node ZooKeeper cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <blockquote>
 <p>We strongly recommend consulting the <a href="https://zookeeper.apache.org/doc/current/zookeeperAdmin.html">ZooKeeper Administrator's Guide</a> for a more thorough and comprehensive introduction to ZooKeeper configuration</p>
diff --git a/content/docs/fr/security-athenz.html b/content/docs/fr/security-athenz.html
index 0d682f4..11fff6d 100644
--- a/content/docs/fr/security-athenz.html
+++ b/content/docs/fr/security-athenz.html
@@ -74,15 +74,15 @@
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/reference-configuration#broker">Broker Configuration</a>.</p>
@@ -96,16 +96,16 @@
 <p><a href="/docs/fr/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/security-tls-authentication"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/security-authorization"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class="toc-headi [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/fr/security-athenz/index.html b/content/docs/fr/security-athenz/index.html
index 0d682f4..11fff6d 100644
--- a/content/docs/fr/security-athenz/index.html
+++ b/content/docs/fr/security-athenz/index.html
@@ -74,15 +74,15 @@
 </blockquote>
 <p>In the <code>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>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Add the Athenz auth provider</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz
-<span class="hljs-attr">athenzDomainNames</span>=pulsar
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker-cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker-key.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz</span>
+<span class="hljs-attr">athenzDomainNames</span>=<span class="hljs-string">pulsar</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker-cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker-key.pem</span>
 </code></pre>
 <blockquote>
 <p>A full listing of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/reference-configuration#broker">Broker Configuration</a>.</p>
@@ -96,16 +96,16 @@
 <p><a href="/docs/fr/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You’ll need to add the following authentication parameters to that file to use Athenz with Pulsar’s CLI tools:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># URL for the broker</span>
-<span class="hljs-attr">serviceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-
-<span class="hljs-comment"># Set Athenz auth plugin and its parameters</span>
-<span class="hljs-attr">authPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationAthenz
-<span class="hljs-attr">authParams</span>={<span class="hljs-string">"tenantDomain"</span>:<span class="hljs-string">"shopping"</span>,<span class="hljs-string">"tenantService"</span>:<span class="hljs-string">"some_app"</span>,<span class="hljs-string">"providerDomain"</span>:<span class="hljs-string">"pulsar"</span>,<span class="hljs-string">"privateKey"</span>:<span class="hljs-string">"file:///path/to/private.pem"</span>,<span class="hljs-string">"keyId"</span>:<span class="hljs-stri [...]
-
-<span class="hljs-comment"># Enable TLS</span>
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/cacert.pem
+<span class="hljs-attr">serviceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-comment">
+# Set Athenz auth plugin and its parameters</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationAthenz</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">{"tenantDomain":"shopping","tenantService":"some_app","providerDomain":"pulsar","privateKey":"file:///path/to/private.pem","keyId":"v1"}</span>
+<span class="hljs-comment">
+# Enable TLS</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/cacert.pem</span>
 </code></pre>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/fr/security-tls-authentication"><span class="arrow-prev">← </span><span>Précédent</span></a><a class="docs-next button" href="/docs/fr/security-authorization"><span>Suivant</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#athenz-authentication-settings">Athenz authentication settings</a><ul class="toc-headi [...]
       const community = document.querySelector("a[href='#community']").parentNode;
diff --git a/content/docs/fr/security-authorization.html b/content/docs/fr/security-authorization.html
index 26c48d3..741da5f 100644
--- a/content/docs/fr/security-authorization.html
+++ b/content/docs/fr/security-authorization.html
@@ -51,8 +51,8 @@
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/fr/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/fr/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/reference-configuration#broker">Broker Configuration</a></p>
@@ -65,10 +65,10 @@
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/fr/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/fr/security-authorization/index.html b/content/docs/fr/security-authorization/index.html
index 26c48d3..741da5f 100644
--- a/content/docs/fr/security-authorization/index.html
+++ b/content/docs/fr/security-authorization/index.html
@@ -51,8 +51,8 @@
 <h2><a class="anchor" aria-hidden="true" id="broker-and-proxy-setup"></a><a href="#broker-and-proxy-setup" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0 [...]
 <h3><a class="anchor" aria-hidden="true" id="enabling-authorization-and-assigning-superusers"></a><a href="#enabling-authorization-and-assigning-superusers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9 [...]
 <p>Authorization is enabled and superusers are assigned in the broker (<a href="/docs/fr/reference-configuration#broker"><code>conf/broker.conf</code></a>) and proxy (<a href="/docs/fr/reference-configuration#proxy"><code>conf/proxy.conf</code></a>) configuration files.</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">superUserRoles</span>=my-super-user-<span class="hljs-number">1</span>,my-super-user-<span class="hljs-number">2</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">authorizationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/reference-configuration#broker">Broker Configuration</a></p>
@@ -65,10 +65,10 @@
 <p>The more secure approach is to grant access to the proxy roles each time you grant access to a resource. For example, if you have a proxy role <code>proxy1</code>, when a tenant is created by the superuser, <code>proxy1</code> should be specified as one of the admin roles. When a role is granted permissions to produce or consume from a namespace, if that client wants to produce or consume through a proxy, <code>proxy1</code> should also be granted the same permissions.</p>
 <p>Another approach is to make the proxy role a superuser. This will allow the proxy to access all resources. The client will still need to authenticate with the proxy, and all requests made through the proxy will have their role downgraded to the <em>original principal</em> of the authenticated client. However, if the proxy is compromised, a bad actor could get full access to your cluster.</p>
 <p>Roles can be specified as proxy roles in <a href="/docs/fr/reference-configuration#broker"><code>conf/broker.conf</code></a>.</p>
-<pre><code class="hljs css language-properties">proxyRoles=<span class="hljs-keyword">my</span>-proxy-role
-
-<span class="hljs-comment"># if you want to allow superusers to use the proxy (see above)</span>
-superUserRoles=<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-1</span>,<span class="hljs-keyword">my</span>-super-user<span class="hljs-number">-2</span>,<span class="hljs-keyword">my</span>-proxy-role
+<pre><code class="hljs css language-properties"><span class="hljs-attr">proxyRoles</span>=<span class="hljs-string">my-proxy-role</span>
+<span class="hljs-comment">
+# if you want to allow superusers to use the proxy (see above)</span>
+<span class="hljs-attr">superUserRoles</span>=<span class="hljs-string">my-super-user-1,my-super-user-2,my-proxy-role</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="administering-tenants"></a><a href="#administering-tenants" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
 <h3><a class="anchor" aria-hidden="true" id="creating-a-new-tenant"></a><a href="#creating-a-new-tenant" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2 [...]
diff --git a/content/docs/fr/security-extending.html b/content/docs/fr/security-extending.html
index f825074..14b1a5e 100644
--- a/content/docs/fr/security-extending.html
+++ b/content/docs/fr/security-extending.html
@@ -66,8 +66,8 @@
 <h3><a class="anchor" aria-hidden="true" id="broker-authentication-plugin"></a><a href="#broker-authentication-plugin" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 [...]
 <p>On broker side, we need the corresponding plugin to validate the credentials passed by the client. Broker can support multiple authentication providers at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
diff --git a/content/docs/fr/security-extending/index.html b/content/docs/fr/security-extending/index.html
index f825074..14b1a5e 100644
--- a/content/docs/fr/security-extending/index.html
+++ b/content/docs/fr/security-extending/index.html
@@ -66,8 +66,8 @@
 <h3><a class="anchor" aria-hidden="true" id="broker-authentication-plugin"></a><a href="#broker-authentication-plugin" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 [...]
 <p>On broker side, we need the corresponding plugin to validate the credentials passed by the client. Broker can support multiple authentication providers at the same time.</p>
 <p>In <code>conf/broker.conf</code> it's possible to specify a list of valid providers:</p>
-<pre><code class="hljs css language-properties"># Autentication provider <span class="hljs-keyword">name</span> list, which <span class="hljs-keyword">is</span> comma separated list <span class="hljs-keyword">of</span> <span class="hljs-keyword">class</span> names
-authenticationProviders=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Autentication provider name list, which is comma separated list of class names</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>There is one single interface to implement <code>org.apache.pulsar.broker.authentication.AuthenticationProvider</code>:</p>
 <pre><code class="hljs css language-java"><span class="hljs-comment">/**
diff --git a/content/docs/fr/security-tls-authentication.html b/content/docs/fr/security-tls-authentication.html
index 194959e..d18a9b6 100644
--- a/content/docs/fr/security-tls-authentication.html
+++ b/content/docs/fr/security-tls-authentication.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/fr/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/fr/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/fr/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/security-tls-authentication/index.html b/content/docs/fr/security-tls-authentication/index.html
index 194959e..d18a9b6 100644
--- a/content/docs/fr/security-tls-authentication/index.html
+++ b/content/docs/fr/security-tls-authentication/index.html
@@ -71,32 +71,32 @@
 <h3><a class="anchor" aria-hidden="true" id="on-brokers"></a><a href="#on-brokers" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure brokers to authenticate clients, put the following in <code>broker.conf</code>, alongside <a href="/docs/fr/security-tls-transport#broker-configuration">the configuration to enable tls transport</a>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Configuration to enable authentication</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="on-proxies"></a><a href="#on-proxies" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1 [...]
 <p>To configure proxies to authenticate clients, put the folling in <code>proxy.conf</code>, alongside <a href="/docs/fr/security-tls-transport#proxy-configuration">the configuration to enable tls transport</a>:</p>
 <p>The proxy should have its own client key pair for connecting to brokers. The role token for this key pair should be configured in the <code>proxyRoles</code> of the brokers. See the <a href="/docs/fr/security-authorization">authorization guide</a> for more details.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">authenticationProviders</span>=org.apache.pulsar.broker.authentication.AuthenticationProviderTls
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=org.apache.pulsar.client.impl.auth.AuthenticationTls
-<span class="hljs-attr">brokerClientAuthenticationParameters</span>=tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem
+<span class="hljs-attr">authenticationEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">authenticationProviders</span>=<span class="hljs-string">org.apache.pulsar.broker.authentication.AuthenticationProviderTls</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">brokerClientAuthenticationPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">brokerClientAuthenticationParameters</span>=<span class="hljs-string">tlsCertFile:/path/to/proxy.cert.pem,tlsKeyFile:/path/to/proxy.key-pk8.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS authentication, the client needs to connect via TLS transport, so you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/reference-cli-tools">Command-line tools</a> like <a href="/docs/fr/pulsar-admin"><code>pulsar-admin</code></a>, <a href="/docs/fr/reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="/docs/fr/reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS authentication with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties">webServiceUrl=https:<span class="hljs-comment">//broker.example.com:8443/</span>
-brokerServiceUrl=pulsar+ssl:<span class="hljs-comment">//broker.example.com:6651/</span>
-useTls=true
-tlsAllowInsecureConnection=false
-tlsTrustCertsFilePath=/path/to/ca<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>
-authPlugin=org<span class="hljs-selector-class">.apache</span><span class="hljs-selector-class">.pulsar</span><span class="hljs-selector-class">.client</span><span class="hljs-selector-class">.impl</span><span class="hljs-selector-class">.auth</span><span class="hljs-selector-class">.AuthenticationTls</span>
-authParams=tlsCertFile:/path/to/my-role<span class="hljs-selector-class">.cert</span><span class="hljs-selector-class">.pem</span>,tlsKeyFile:/path/to/my-role<span class="hljs-selector-class">.key-pk8</span><span class="hljs-selector-class">.pem</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-attr">authPlugin</span>=<span class="hljs-string">org.apache.pulsar.client.impl.auth.AuthenticationTls</span>
+<span class="hljs-attr">authParams</span>=<span class="hljs-string">tlsCertFile:/path/to/my-role.cert.pem,tlsKeyFile:/path/to/my-role.key-pk8.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/security-tls-transport.html b/content/docs/fr/security-tls-transport.html
index df14265..7238469 100644
--- a/content/docs/fr/security-tls-transport.html
+++ b/content/docs/fr/security-tls-transport.html
@@ -114,10 +114,10 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/fr/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/fr/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/reference-configuration#broker">Broker Configuration</a></p>
@@ -125,14 +125,14 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -140,11 +140,11 @@ $ chmod 444 certs/ca.cert.pem
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/fr/security-tls-transport/index.html b/content/docs/fr/security-tls-transport/index.html
index df14265..7238469 100644
--- a/content/docs/fr/security-tls-transport/index.html
+++ b/content/docs/fr/security-tls-transport/index.html
@@ -114,10 +114,10 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="broker-configuration"></a><a href="#broker-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>To configure a Pulsar <a href="/docs/fr/reference-terminology#broker">broker</a> to use TLS transport encryption, you'll need to make some changes to <code>broker.conf</code>, which is located in the <code>conf</code> directory of your <a href="/docs/fr/standalone">Pulsar installation</a>.</p>
 <p>Add these values to the configuration file (substituting the appropriate certificate paths where necessary):</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">tlsEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <blockquote>
 <p>A full list of parameters available in the <code>conf/broker.conf</code> file, as well as the default values for those parameters, can be found in <a href="/docs/fr/reference-configuration#broker">Broker Configuration</a></p>
@@ -125,14 +125,14 @@ $ chmod 444 certs/ca.cert.pem
 <h2><a class="anchor" aria-hidden="true" id="proxy-configuration"></a><a href="#proxy-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.2 [...]
 <p>Proxies need to configure TLS in two directions, for clients connecting to the proxy, and for the proxy to be able to connect to brokers.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># For clients connecting to the proxy</span>
-<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsCertificateFilePath</span>=/path/to/broker.cert.pem
-<span class="hljs-attr">tlsKeyFilePath</span>=/path/to/broker.key-pk8.pem
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
-
-<span class="hljs-comment"># For the proxy to connect to brokers</span>
-<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<span class="hljs-attr">tlsEnabledInProxy</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsCertificateFilePath</span>=<span class="hljs-string">/path/to/broker.cert.pem</span>
+<span class="hljs-attr">tlsKeyFilePath</span>=<span class="hljs-string">/path/to/broker.key-pk8.pem</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
+<span class="hljs-comment">
+# For the proxy to connect to brokers</span>
+<span class="hljs-attr">tlsEnabledWithBroker</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">brokerClientTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h2><a class="anchor" aria-hidden="true" id="client-configuration"></a><a href="#client-configuration" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>When TLS transport encryption is enabled, you need to configure the client to use <code>https://</code> and port 8443 for the web service URL, and <code>pulsar+ssl://</code> and port 6651 for the broker service URL.</p>
@@ -140,11 +140,11 @@ $ chmod 444 certs/ca.cert.pem
 <h3><a class="anchor" aria-hidden="true" id="cli-tools"></a><a href="#cli-tools" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.6 [...]
 <p><a href="/docs/fr/reference-cli-tools">Command-line tools</a> like <a href="reference-cli-tools#pulsar-admin"><code>pulsar-admin</code></a>, <a href="reference-cli-tools#pulsar-perf"><code>pulsar-perf</code></a>, and <a href="reference-cli-tools#pulsar-client"><code>pulsar-client</code></a> use the <code>conf/client.conf</code> config file in a Pulsar installation.</p>
 <p>You'll need to add the following parameters to that file to use TLS transport with Pulsar's CLI tools:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=https://broker.example.com:<span class="hljs-number">8443</span>/
-<span class="hljs-attr">brokerServiceUrl</span>=pulsar+ssl://broker.example.com:<span class="hljs-number">6651</span>/
-<span class="hljs-attr">useTls</span>=<span class="hljs-literal">true</span>
-<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-literal">false</span>
-<span class="hljs-attr">tlsTrustCertsFilePath</span>=/path/to/ca.cert.pem
+<pre><code class="hljs css language-properties"><span class="hljs-attr">webServiceUrl</span>=<span class="hljs-string">https://broker.example.com:8443/</span>
+<span class="hljs-attr">brokerServiceUrl</span>=<span class="hljs-string">pulsar+ssl://broker.example.com:6651/</span>
+<span class="hljs-attr">useTls</span>=<span class="hljs-string">true</span>
+<span class="hljs-attr">tlsAllowInsecureConnection</span>=<span class="hljs-string">false</span>
+<span class="hljs-attr">tlsTrustCertsFilePath</span>=<span class="hljs-string">/path/to/ca.cert.pem</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="java-client"></a><a href="#java-client" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42 [...]
 <pre><code class="hljs css language-java"><span class="hljs-keyword">import</span> org.apache.pulsar.client.api.PulsarClient;
diff --git a/content/docs/ja/2.1.0-incubating/administration-load-distribution.html b/content/docs/ja/2.1.0-incubating/administration-load-distribution.html
index 18933c2..8258a5e 100644
--- a/content/docs/ja/2.1.0-incubating/administration-load-distribution.html
+++ b/content/docs/ja/2.1.0-incubating/administration-load-distribution.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/ja/2.1.0-incubating/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/ja/2.1.0-incubating/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across [...]
diff --git a/content/docs/ja/2.1.0-incubating/administration-load-distribution/index.html b/content/docs/ja/2.1.0-incubating/administration-load-distribution/index.html
index 18933c2..8258a5e 100644
--- a/content/docs/ja/2.1.0-incubating/administration-load-distribution/index.html
+++ b/content/docs/ja/2.1.0-incubating/administration-load-distribution/index.html
@@ -66,7 +66,7 @@
 <p>When creating a new namespace, it will set to use the default number of bundles. This is set in <code>conf/broker.conf</code>:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># When a namespace is created without specifying the number of bundle, this</span>
 <span class="hljs-comment"># value will be used as the default</span>
-<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-number">4</span>
+<span class="hljs-attr">defaultNumberOfNamespaceBundles</span>=<span class="hljs-string">4</span>
 </code></pre>
 <p>One can either change the system default, or override it when creating a new namespace:</p>
 <pre><code class="hljs css language-shell"><span class="hljs-meta">$</span><span class="bash"> bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16</span>
@@ -88,25 +88,25 @@
 <p>Since the load for the topics in a bundle might change over time, or could just be hard to predict upfront, bundles can be split in 2 by brokers. The new smaller bundles can then be reassigned to different brokers.</p>
 <p>The splitting happens based on some tunable thresholds. Any existing bundle that exceeds any of the threshold is a candidate to be split. By default the newly split bundles are also immediately offloaded to other brokers, to facilitate the traffic distribution.</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># enable/disable namespace bundle auto split</span>
-<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># enable/disable automatic unloading of split bundles</span>
-<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-literal">true</span>
-
-<span class="hljs-comment"># maximum topics in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-number">1000</span>
-
-<span class="hljs-comment"># maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-number">30000</span>
-
-<span class="hljs-comment"># maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
-<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-number">100</span>
-
-<span class="hljs-comment"># maximum number of bundles in a namespace (for auto-split)</span>
-<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-number">128</span>
+<span class="hljs-attr">loadBalancerAutoBundleSplitEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# enable/disable automatic unloading of split bundles</span>
+<span class="hljs-attr">loadBalancerAutoUnloadSplitBundlesEnabled</span>=<span class="hljs-string">true</span>
+<span class="hljs-comment">
+# maximum topics in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxTopics</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum sessions (producers + consumers) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxSessions</span>=<span class="hljs-string">1000</span>
+<span class="hljs-comment">
+# maximum msgRate (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxMsgRate</span>=<span class="hljs-string">30000</span>
+<span class="hljs-comment">
+# maximum bandwidth (in + out) in a bundle, otherwise bundle split will be triggered</span>
+<span class="hljs-attr">loadBalancerNamespaceBundleMaxBandwidthMbytes</span>=<span class="hljs-string">100</span>
+<span class="hljs-comment">
+# maximum number of bundles in a namespace (for auto-split)</span>
+<span class="hljs-attr">loadBalancerNamespaceMaximumBundles</span>=<span class="hljs-string">128</span>
 </code></pre>
 <h3><a class="anchor" aria-hidden="true" id="automatic-load-shedding"></a><a href="#automatic-load-shedding" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 [...]
 <p>In Pulsar's load manager there is support for automatic load shedding. This means that whenever the system recognized a particular broker is overloaded, it will force some traffic to be reassigned to less loaded brokers.</p>
@@ -115,34 +115,34 @@
 <p>Given the selection of bundles to offload is based on traffic (as a proxy measure for cpu, network and memory), broker will unload bundles for at least 15% of traffic.</p>
 <p>The automatic load shedding is enabled by default and can be disabled with this setting:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Enable/disable automatic bundle unloading for load-shedding</span>
-<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-literal">true</span>
+<span class="hljs-attr">loadBalancerSheddingEnabled</span>=<span class="hljs-string">true</span>
 </code></pre>
 <p>There are additional settings that apply to shedding:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Load shedding interval. Broker periodically checks whether some traffic should be offload from</span>
 <span class="hljs-comment"># some over-loaded broker to other under-loaded brokers</span>
-<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-number">1</span>
-
-<span class="hljs-comment"># Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
-<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-number">30</span>
+<span class="hljs-attr">loadBalancerSheddingIntervalMinutes</span>=<span class="hljs-string">1</span>
+<span class="hljs-comment">
+# Prevent the same topics to be shed and moved to other brokers more that once within this timeframe</span>
+<span class="hljs-attr">loadBalancerSheddingGracePeriodMinutes</span>=<span class="hljs-string">30</span>
 </code></pre>
 <h4><a class="anchor" aria-hidden="true" id="broker-overload-thresholds"></a><a href="#broker-overload-thresholds" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H [...]
 <p>The determinations of when a broker is overloaded is based on threshold of CPU, network and memory usage. Whenever either of those metrics reaches the threshold, it will trigger the shedding (if enabled).</p>
 <p>By default, overload threshold is set at 85%:</p>
 <pre><code class="hljs css language-properties"><span class="hljs-comment"># Usage threshold to determine a broker as over-loaded</span>
-<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-number">85</span>
+<span class="hljs-attr">loadBalancerBrokerOverloadedThresholdPercentage</span>=<span class="hljs-string">85</span>
 </code></pre>
 <p>The usage stats are gathered by Pulsar from the system metrics.</p>
 <p>In case of network utilization, in some cases the network interface speed reported by Linux is not correct and needs to be manually overridden. This is the case in AWS EC2 instances with 1Gbps NIC speed for which the OS report 10Gbps speed.</p>
 <p>Because of the incorrect max speed, the Pulsar load manager might think the broker has not reached the NIC capacity, while in fact it's already using all the bandwidth and the traffic is being slowed down.</p>
 <p>There is a setting to correct the max NIC speed:</p>
-<pre><code class="hljs css language-properties"># <span class="hljs-keyword">Override</span> the auto-detection <span class="hljs-keyword">of</span> the network interfaces max speed.
-# This option <span class="hljs-keyword">is</span> useful <span class="hljs-keyword">in</span> some environments (eg: EC2 VMs) <span class="hljs-keyword">where</span> the max speed
-# reported <span class="hljs-keyword">by</span> Linux <span class="hljs-keyword">is</span> <span class="hljs-keyword">not</span> reflecting the real bandwidth available <span class="hljs-keyword">to</span> the broker.
-# Since the network usage <span class="hljs-keyword">is</span> employed <span class="hljs-keyword">by</span> the load manager <span class="hljs-keyword">to</span> decide when a broker
-# <span class="hljs-keyword">is</span> overloaded, it <span class="hljs-keyword">is</span> important <span class="hljs-keyword">to</span> make sure the info <span class="hljs-keyword">is</span> correct <span class="hljs-keyword">or</span> <span class="hljs-keyword">override</span> it
-# <span class="hljs-keyword">with</span> the right value here. The configured value can be a double (eg: <span class="hljs-number">0.8</span>) <span class="hljs-keyword">and</span> that
-# can be used <span class="hljs-keyword">to</span> trigger load-shedding even before hitting <span class="hljs-keyword">on</span> NIC limits.
-loadBalancerOverrideBrokerNicSpeedGbps=
+<pre><code class="hljs css language-properties"><span class="hljs-comment"># Override the auto-detection of the network interfaces max speed.</span>
+<span class="hljs-comment"># This option is useful in some environments (eg: EC2 VMs) where the max speed</span>
+<span class="hljs-comment"># reported by Linux is not reflecting the real bandwidth available to the broker.</span>
+<span class="hljs-comment"># Since the network usage is employed by the load manager to decide when a broker</span>
+<span class="hljs-comment"># is overloaded, it is important to make sure the info is correct or override it</span>
+<span class="hljs-comment"># with the right value here. The configured value can be a double (eg: 0.8) and that</span>
+<span class="hljs-comment"># can be used to trigger load-shedding even before hitting on NIC limits.</span>
+<span class="hljs-attr">loadBalancerOverrideBrokerNicSpeedGbps</span>=<span class="hljs-string"></span>
 </code></pre>
 <p>When the value is empty, Pulsar will use the value reported by the OS.</p>
 </span></div></article></div><div class="docs-prevnext"><a class="docs-prev button" href="/docs/ja/2.1.0-incubating/administration-stats"><span class="arrow-prev">← </span><span>Previous</span></a><a class="docs-next button" href="/docs/ja/2.1.0-incubating/administration-proxy"><span>Next</span><span class="arrow-next"> →</span></a></div></div></div><nav class="onPageNav docOnPageNav"><ul class="toc-headings"><li><a href="#load-distribution-across-pulsar-brokers">Load distribution across [...]
diff --git a/content/docs/ja/2.1.0-incubating/administration-zk-bk.html b/content/docs/ja/2.1.0-incubating/administration-zk-bk.html
index 329906d..d2678fd 100644
--- a/content/docs/ja/2.1.0-incubating/administration-zk-bk.html
+++ b/content/docs/ja/2.1.0-incubating/administration-zk-bk.html
@@ -64,9 +64,9 @@
 <p>ZooKeeper manages a variety of essential coordination- and configuration-related tasks for Pulsar.</p>
 <p>Deploying a Pulsar instance requires you to stand up one local ZooKeeper cluster <em>per Pulsar cluster</em>.</p>
 <p>To begin, add all ZooKeeper servers to the quorum configuration specified in the <a href="/docs/ja/2.1.0-incubating/reference-configuration#zookeeper"><code>conf/zookeeper.conf</code></a> file. Add a <code>server.N</code> line for each node in the cluster to the configuration, where <code>N</code> is the number of the ZooKeeper node. Here's an example for a three-node cluster:</p>
-<pre><code class="hljs css language-properties">server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2888</span>:<span class="hljs-number">3888</span>
+<pre><code class="hljs css language-properties"><span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2888:3888</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2888:3888</span>
 </code></pre>
 <p>On each host, you need to specify the ID of the node in each node's <code>myid</code> file, which is in each server's <code>data/zookeeper</code> folder by default (this can be changed via the <a href="/docs/ja/2.1.0-incubating/reference-configuration#zookeeper-dataDir"><code>dataDir</code></a> parameter).</p>
 <blockquote>
@@ -86,10 +86,10 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <h4><a class="anchor" aria-hidden="true" id="single-cluster-pulsar-instance"></a><a href="#single-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 1 [...]
 <p>If your Pulsar instance will consist of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but running on different TCP ports.</p>
 <p>To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers used by the local quorom to the configuration file in <a href="/docs/ja/2.1.0-incubating/reference-configuration#configuration-store"><code>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 ZooK [...]
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
 </code></pre>
 <p>As before, create the <code>myid</code> files for each server on <code>data/global-zookeeper/myid</code>.</p>
 <h4><a class="anchor" aria-hidden="true" id="multi-cluster-pulsar-instance"></a><a href="#multi-cluster-pulsar-instance" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12  [...]
@@ -102,25 +102,25 @@ server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.
 <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 can pick 3 servers from <code>us-west</code>, 2 from <code>us-central</code> and 2 from <code>us-east</code>.</p>
 <p>This will guarantee that writes to global ZooKeeper will be possible even if one of these regions is unreachable.</p>
 <p>The ZK configuration in all the servers will look like:</p>
-<pre><code class="hljs css language-properties">clientPort=<span class="hljs-number">2184</span>
-server.<span class="hljs-number">1</span>=zk1<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">2</span>=zk2<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">3</span>=zk3<span class="hljs-selector-class">.us-west</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">4</span>=zk1<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">5</span>=zk2<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">6</span>=zk3<span class="hljs-selector-class">.us-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">7</span>=zk1<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">8</span>=zk2<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>
-server.<span class="hljs-number">9</span>=zk3<span class="hljs-selector-class">.us-east</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">10</span>=zk1<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">11</span>=zk2<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">12</span>=zk3<span class="hljs-selector-class">.eu-central</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">13</span>=zk1<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">14</span>=zk2<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
-server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">.ap-south</span><span class="hljs-selector-class">.example</span><span class="hljs-selector-class">.com</span>:<span class="hljs-number">2185</span>:<span class="hljs-number">2186</span>:observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">clientPort</span>=<span class="hljs-string">2184</span>
+<span class="hljs-meta">server.1</span>=<span class="hljs-string">zk1.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.2</span>=<span class="hljs-string">zk2.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.3</span>=<span class="hljs-string">zk3.us-west.example.com:2185:2186</span>
+<span class="hljs-meta">server.4</span>=<span class="hljs-string">zk1.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.5</span>=<span class="hljs-string">zk2.us-central.example.com:2185:2186</span>
+<span class="hljs-meta">server.6</span>=<span class="hljs-string">zk3.us-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.7</span>=<span class="hljs-string">zk1.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.8</span>=<span class="hljs-string">zk2.us-east.example.com:2185:2186</span>
+<span class="hljs-meta">server.9</span>=<span class="hljs-string">zk3.us-east.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.10</span>=<span class="hljs-string">zk1.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.11</span>=<span class="hljs-string">zk2.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.12</span>=<span class="hljs-string">zk3.eu-central.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.13</span>=<span class="hljs-string">zk1.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.14</span>=<span class="hljs-string">zk2.ap-south.example.com:2185:2186:observer</span>
+<span class="hljs-meta">server.15</span>=<span class="hljs-string">zk3.ap-south.example.com:2185:2186:observer</span>
 </code></pre>
 <p>Additionally, ZK observers will need to have:</p>
-<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=observer
+<pre><code class="hljs css language-properties"><span class="hljs-attr">peerType</span>=<span class="hljs-string">observer</span>
 </code></pre>
 <h5><a class="anchor" aria-hidden="true" id="starting-the-service"></a><a href="#starting-the-service" aria-hidden="true" class="hash-link"><svg class="hash-link-icon" aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1 [...]
 <p>Once your global ZooKeeper configuration is in place, you can start up the service using <a href="/docs/ja/2.1.0-incubating/reference-cli-tools#pulsar-daemon"><code>pulsar-daemon</code></a></p>
@@ -181,16 +181,16 @@ server.<span class="hljs-number">15</span>=zk3<span class="hljs-selector-class">
 <p>Configurable parameters for BookKeeper bookies can be found in the <a href="/docs/ja/2.1.0-incubating/reference-configuration#bookkeeper"><code>conf/bookkeeper.conf</code></a> file.</p>
 <p>Minimum configuration changes required in <code>conf/bookkeeper.conf</code> are:</p>
... 10333 lines suppressed ...