You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by li...@apache.org on 2021/10/14 09:33:36 UTC

[pulsar] branch master updated: [website][upgrade] feat: full docs migration for version 2.8.0 (#12359)

This is an automated email from the ASF dual-hosted git repository.

liuyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 20b190d  [website][upgrade] feat: full docs migration for version 2.8.0 (#12359)
20b190d is described below

commit 20b190d9a79248e1d4eea4ac6dc49bbdf7b33f69
Author: Li Li <ur...@gmail.com>
AuthorDate: Thu Oct 14 17:32:41 2021 +0800

    [website][upgrade] feat: full docs migration for version 2.8.0 (#12359)
    
    * feat: ignore migration scripts
    
    Signed-off-by: LiLi <ur...@gmail.com>
    
    * feat: full docs migration for v2.8.0
    
    Signed-off-by: LiLi <ur...@gmail.com>
---
 site2/website-next/.gitignore                      |   3 +-
 .../versioned_docs/version-2.8.0/adaptors-spark.md |   1 +
 .../version-2.8.0/administration-dashboard.md      |  11 +-
 .../version-2.8.0/administration-geo.md            |  23 +-
 .../version-2.8.0/administration-isolation.md      |   6 +
 .../version-2.8.0/administration-load-balance.md   |  18 +
 .../version-2.8.0/administration-proxy.md          |  10 +
 .../version-2.8.0/administration-pulsar-manager.md |  16 +-
 .../version-2.8.0/administration-upgrade.md        |  12 +
 .../version-2.8.0/administration-zk-bk.md          |  41 +-
 .../version-2.8.0/client-libraries-java.md         |   4 +-
 .../version-2.8.0/client-libraries-node.md         |   2 +-
 .../concepts-architecture-overview.md              |  39 +-
 .../version-2.8.0/concepts-authentication.md       |   6 +-
 .../version-2.8.0/concepts-clients.md              |  16 +-
 .../version-2.8.0/concepts-messaging.md            |  98 +++-
 .../version-2.8.0/concepts-multi-tenancy.md        |  14 +-
 .../concepts-multiple-advertised-listeners.md      |   8 +
 .../version-2.8.0/concepts-overview.md             |  30 +-
 .../version-2.8.0/concepts-proxy-sni-routing.md    |  44 +-
 .../version-2.8.0/concepts-replication.md          |   6 +-
 .../version-2.8.0/concepts-tiered-storage.md       |   6 +-
 .../version-2.8.0/concepts-topic-compaction.md     |  10 +-
 .../version-2.8.0/concepts-transactions.md         |   4 +
 .../versioned_docs/version-2.8.0/deploy-aws.md     |  39 +-
 .../deploy-bare-metal-multi-cluster.md             |  84 ++-
 .../version-2.8.0/deploy-bare-metal.md             |  86 ++-
 .../versioned_docs/version-2.8.0/deploy-dcos.md    |  16 +-
 .../versioned_docs/version-2.8.0/deploy-docker.md  |   6 +-
 .../version-2.8.0/deploy-kubernetes.md             |   4 +-
 .../version-2.8.0/deploy-monitoring.md             |  20 +-
 .../version-2.8.0/functions-debug.md               | 136 +++--
 .../version-2.8.0/functions-deploy.md              |  50 +-
 .../version-2.8.0/functions-develop.md             | 223 ++++---
 .../version-2.8.0/functions-overview.md            |  23 +-
 .../version-2.8.0/functions-package.md             | 162 +++---
 .../version-2.8.0/functions-runtime.md             |  66 ++-
 .../version-2.8.0/functions-worker.md              |  94 +--
 .../getting-started-concepts-and-architecture.md   |   4 +
 .../version-2.8.0/getting-started-docker.md        |  36 +-
 .../version-2.8.0/getting-started-helm.md          |  88 ++-
 .../version-2.8.0/getting-started-pulsar.md        |  12 +-
 .../version-2.8.0/getting-started-standalone.md    | 173 ++++--
 .../versioned_docs/version-2.8.0/helm-deploy.md    |  47 ++
 .../versioned_docs/version-2.8.0/helm-install.md   |   6 +-
 .../versioned_docs/version-2.8.0/helm-overview.md  |  16 +-
 .../versioned_docs/version-2.8.0/helm-prepare.md   |   7 +-
 .../versioned_docs/version-2.8.0/helm-tools.md     |   2 +-
 .../versioned_docs/version-2.8.0/helm-upgrade.md   |   8 +-
 .../version-2.8.0/io-canal-source.md               |  38 +-
 .../version-2.8.0/io-cassandra-sink.md             |   5 +-
 .../version-2.8.0/io-cdc-debezium.md               |  89 ++-
 .../versioned_docs/version-2.8.0/io-cdc.md         |  11 +-
 .../versioned_docs/version-2.8.0/io-cli.md         |  52 ++
 .../version-2.8.0/io-debezium-source.md            |  89 ++-
 .../versioned_docs/version-2.8.0/io-debug.md       |  73 ++-
 .../versioned_docs/version-2.8.0/io-develop.md     |  66 ++-
 .../version-2.8.0/io-dynamodb-source.md            |  14 +-
 .../version-2.8.0/io-elasticsearch-sink.md         |  36 +-
 .../versioned_docs/version-2.8.0/io-file-source.md |  24 +
 .../versioned_docs/version-2.8.0/io-flume-sink.md  |  11 +-
 .../version-2.8.0/io-flume-source.md               |  11 +-
 .../versioned_docs/version-2.8.0/io-hbase-sink.md  |   5 +-
 .../versioned_docs/version-2.8.0/io-hdfs2-sink.md  |  20 +-
 .../versioned_docs/version-2.8.0/io-hdfs3-sink.md  |  18 +-
 .../version-2.8.0/io-influxdb-sink.md              |  10 +
 .../versioned_docs/version-2.8.0/io-jdbc-sink.md   |  23 +-
 .../versioned_docs/version-2.8.0/io-kafka-sink.md  |  10 +-
 .../version-2.8.0/io-kafka-source.md               |  46 +-
 .../version-2.8.0/io-kinesis-sink.md               |  12 +-
 .../version-2.8.0/io-kinesis-source.md             |  21 +-
 .../versioned_docs/version-2.8.0/io-mongo-sink.md  |   6 +
 .../version-2.8.0/io-netty-source.md               |  46 +-
 .../versioned_docs/version-2.8.0/io-overview.md    |  47 +-
 .../versioned_docs/version-2.8.0/io-quickstart.md  | 227 ++++++--
 .../version-2.8.0/io-rabbitmq-sink.md              |   4 +
 .../version-2.8.0/io-rabbitmq-source.md            |   4 +
 .../versioned_docs/version-2.8.0/io-redis-sink.md  |   4 +
 .../versioned_docs/version-2.8.0/io-solr-sink.md   |   4 +
 .../version-2.8.0/io-twitter-source.md             |   7 +-
 .../versioned_docs/version-2.8.0/io-use.md         | 107 +++-
 .../schema-evolution-compatibility.md              | 643 ++-------------------
 .../version-2.8.0/schema-get-started.md            |   9 +-
 .../versioned_docs/version-2.8.0/schema-manage.md  | 417 ++++---------
 .../version-2.8.0/schema-understand.md             | 235 +++-----
 .../version-2.8.0/security-athenz.md               |   6 +-
 .../version-2.8.0/security-authorization.md        |   6 +-
 .../version-2.8.0/security-bouncy-castle.md        |   2 +-
 .../version-2.8.0/security-extending.md            |  10 +-
 .../versioned_docs/version-2.8.0/security-jwt.md   |   6 +-
 .../version-2.8.0/security-kerberos.md             |   2 +-
 .../version-2.8.0/security-overview.md             |  10 +-
 .../version-2.8.0/security-tls-authentication.md   |   8 +-
 .../version-2.8.0/security-tls-keystore.md         |   8 +-
 .../version-2.8.0/security-tls-transport.md        |  12 +-
 .../version-2.8.0/security-token-admin.md          |   4 +-
 .../version-2.8.0/sql-deployment-configurations.md |  25 +-
 .../version-2.8.0/sql-getting-started.md           |  15 +
 .../versioned_docs/version-2.8.0/sql-overview.md   |   2 +-
 .../versioned_docs/version-2.8.0/sql-rest-api.md   |   6 +-
 .../version-2.8.0/tiered-storage-aliyun.md         |  38 +-
 .../version-2.8.0/tiered-storage-aws.md            |  58 +-
 .../version-2.8.0/tiered-storage-azure.md          |  40 +-
 .../version-2.8.0/tiered-storage-filesystem.md     |  53 +-
 .../version-2.8.0/tiered-storage-gcs.md            |  59 +-
 .../version-2.8.0/tiered-storage-overview.md       |  17 +-
 .../version-2.8.0/transaction-api.md               | 164 ++++++
 .../version-2.8.0/transaction-guarantee.md         |  21 +
 .../versioned_docs/version-2.8.0/txn-use.md        |   6 +
 .../version-2.8.0/window-functions-context.md      |  99 ++--
 110 files changed, 3007 insertions(+), 1950 deletions(-)

diff --git a/site2/website-next/.gitignore b/site2/website-next/.gitignore
index 50b6375..5f3710eb 100644
--- a/site2/website-next/.gitignore
+++ b/site2/website-next/.gitignore
@@ -19,4 +19,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-bak/
\ No newline at end of file
+bak/
+migration-scripts/
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/adaptors-spark.md b/site2/website-next/versioned_docs/version-2.8.0/adaptors-spark.md
index 8389aa7..0989ab0 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/adaptors-spark.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/adaptors-spark.md
@@ -8,6 +8,7 @@ original_id: adaptors-spark
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
+
 ## Spark Streaming receiver
 The Spark Streaming receiver for Pulsar is a custom receiver that enables Apache [Spark Streaming](https://spark.apache.org/streaming/) to receive raw data from Pulsar.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-dashboard.md b/site2/website-next/versioned_docs/version-2.8.0/administration-dashboard.md
index a4f332d..0e31aa6 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-dashboard.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-dashboard.md
@@ -11,7 +11,7 @@ import TabItem from '@theme/TabItem';
 
 :::note
 
-Pulsar dashboard is deprecated. If you want to manage and monitor the stats of your topics, use [Pulsar Manager](administration-pulsar-manager.md). 
+Pulsar dashboard is deprecated. If you want to manage and monitor the stats of your topics, use [Pulsar Manager](administration-pulsar-manager). 
 
 :::
 
@@ -26,27 +26,34 @@ You can use the [Django](https://www.djangoproject.com) web app to render the co
 The easiest way to use the dashboard is to run it inside a [Docker](https://www.docker.com/products/docker) container.
 
 ```shell
+
 $ SERVICE_URL=http://broker.example.com:8080/
 $ docker run -p 80:80 \
   -e SERVICE_URL=$SERVICE_URL \
   apachepulsar/pulsar-dashboard:@pulsar:version@
+
 ```
 
 You can find the {@inject: github:Dockerfile:/dashboard/Dockerfile} in the `dashboard` directory and build an image from scratch as well:
 
 ```shell
+
 $ docker build -t apachepulsar/pulsar-dashboard dashboard
+
 ```
 
 If token authentication is enabled:
 > Provided token should have super-user access. 
+
 ```shell
+
 $ SERVICE_URL=http://broker.example.com:8080/
 $ JWT_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c
 $ docker run -p 80:80 \
   -e SERVICE_URL=$SERVICE_URL \
   -e JWT_TOKEN=$JWT_TOKEN \
   apachepulsar/pulsar-dashboard
+
 ```
  
 You need to specify only one service URL for a Pulsar cluster. Internally, the collector figures out all the existing clusters and the brokers from where it needs to pull the metrics. If you connect the dashboard to Pulsar running in standalone mode, the URL is `http://<broker-ip>:8080` by default. `<broker-ip>` is the ip address or hostname of the machine running Pulsar standalone. The ip address or hostname should be accessible from the docker instance running dashboard.
@@ -62,7 +69,9 @@ Similarly, given the Pulsar standalone advertises itself with localhost by defau
 explicitly set the advertise address to the host IP. For example:
 
 ```shell
+
 $ bin/pulsar standalone --advertised-address 1.2.3.4
+
 ```
 
 ### Known issues
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-geo.md b/site2/website-next/versioned_docs/version-2.8.0/administration-geo.md
index 06078b1..84fab91 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-geo.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-geo.md
@@ -65,16 +65,19 @@ Suppose that you have 3 replication clusters: `us-west`, `us-cent`, and `us-east
    Run the following command on `us-west`.
 
 ```shell
+
 $ bin/pulsar-admin clusters create \
   --broker-url pulsar://<DNS-OF-US-EAST>:<PORT>	\
   --url http://<DNS-OF-US-EAST>:<PORT> \
   us-east
+
 ```
 
 :::tip
 
 
-If you want to use a secure connection for a cluster, you can use the flags `--broker-url-secure` and `--url-secure`. For more information, see [pulsar-admin clusters create](https://pulsar.apache.org/tools/pulsar-admin/).
+- If you want to use a secure connection for a cluster, you can use the flags `--broker-url-secure` and `--url-secure`. For more information, see [pulsar-admin clusters create](https://pulsar.apache.org/tools/pulsar-admin/).
+- Different clusters may have different authentications. You can use the authentication flag `--auth-plugin` and `--auth-parameters` together to set cluster authentication, which overrides `brokerClientAuthenticationPlugin` and `brokerClientAuthenticationParameters` if `authenticationEnabled` sets to `true` in `broker.conf` and `standalone.conf`. For more information, see [authentication and authorization](concepts-authentication).
 
 :::
 
@@ -83,10 +86,12 @@ If you want to use a secure connection for a cluster, you can use the flags `--b
    Run the following command on `us-west`.
 
 ```shell
+
 $ bin/pulsar-admin clusters create \
   --broker-url pulsar://<DNS-OF-US-CENT>:<PORT>	\
   --url http://<DNS-OF-US-CENT>:<PORT> \
   us-cent
+
 ```
 
 3. Run similar commands on `us-east` and `us-cent` to create connections among clusters.
@@ -98,9 +103,11 @@ To replicate to a cluster, the tenant needs permission to use that cluster. You
 Specify all the intended clusters when you create a tenant:
 
 ```shell
+
 $ bin/pulsar-admin tenants create my-tenant \
   --admin-roles my-admin-role \
   --allowed-clusters us-west,us-east,us-cent
+
 ```
 
 To update permissions of an existing tenant, use `update` instead of `create`.
@@ -110,14 +117,18 @@ To update permissions of an existing tenant, use `update` instead of `create`.
 You can create a namespace with the following command sample.
 
 ```shell
+
 $ bin/pulsar-admin namespaces create my-tenant/my-namespace
+
 ```
 
 Initially, the namespace is not assigned to any cluster. You can assign the namespace to clusters using the `set-clusters` subcommand:
 
 ```shell
+
 $ bin/pulsar-admin namespaces set-clusters my-tenant/my-namespace \
   --clusters us-west,us-east,us-cent
+
 ```
 
 You can change the replication clusters for a namespace at any time, without disruption to ongoing traffic. Replication channels are immediately set up or stopped in all clusters as soon as the configuration changes.
@@ -130,9 +141,10 @@ Once you create a geo-replication namespace, any topics that producers or consum
 
 By default, messages are replicated to all clusters configured for the namespace. You can restrict replication selectively by specifying a replication list for a message, and then that message is replicated only to the subset in the replication list.
 
-The following is an example for the [Java API](client-libraries-java.md). Note the use of the `setReplicationClusters` method when you construct the {@inject: javadoc:Message:/client/org/apache/pulsar/client/api/Message} object:
+The following is an example for the [Java API](client-libraries-java). Note the use of the `setReplicationClusters` method when you construct the {@inject: javadoc:Message:/client/org/apache/pulsar/client/api/Message} object:
 
 ```java
+
 List<String> restrictReplicationTo = Arrays.asList(
         "us-west",
         "us-east"
@@ -146,14 +158,17 @@ producer.newMessage()
         .value("my-payload".getBytes())
         .setReplicationClusters(restrictReplicationTo)
         .send();
+
 ```
 
 #### Topic stats
 
-Topic-specific statistics for geo-replication topics are available via the [`pulsar-admin`](reference-pulsar-admin.md) tool and {@inject: rest:REST:/} API:
+Topic-specific statistics for geo-replication topics are available via the [`pulsar-admin`](reference-pulsar-admin) tool and {@inject: rest:REST:/} API:
 
 ```shell
+
 $ bin/pulsar-admin persistent stats persistent://my-tenant/my-namespace/my-topic
+
 ```
 
 Each cluster reports its own local stats, including the incoming and outgoing replication rates and backlogs.
@@ -183,11 +198,13 @@ In case of failover, a consumer can restart consuming from the failure point in
 Replicated subscription is disabled by default. You can enable replicated subscription when creating a consumer. 
 
 ```java
+
 Consumer<String> consumer = client.newConsumer(Schema.STRING)
             .topic("my-topic")
             .subscriptionName("my-subscription")
             .replicateSubscriptionState(true)
             .subscribe();
+
 ```
 
 ### Advantages
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-isolation.md b/site2/website-next/versioned_docs/version-2.8.0/administration-isolation.md
index 125ce7a..7ebacea 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-isolation.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-isolation.md
@@ -40,6 +40,7 @@ You can set a namespace isolation policy for a cluster using one of the followin
 
 ```
 pulsar-admin ns-isolation-policy set options
+
 ```
 
 For more information about the command `pulsar-admin ns-isolation-policy set options`, see [here](https://pulsar.apache.org/tools/pulsar-admin/).
@@ -47,11 +48,13 @@ For more information about the command `pulsar-admin ns-isolation-policy set opt
 **Example**
 
 ```shell
+
 bin/pulsar-admin ns-isolation-policy set \
 --auto-failover-policy-type min_available \
 --auto-failover-policy-params min_limit=1,usage_threshold=80 \
 --namespaces my-tenant/my-namespace \
 --primary 10.193.216.*  my-cluster policy-name
+
 ```
 
 </TabItem>
@@ -95,6 +98,7 @@ You can set a bookie affinity group using one of the following methods.
 
 ```
 pulsar-admin namespaces set-bookie-affinity-group options
+
 ```
 
 For more information about the command `pulsar-admin namespaces set-bookie-affinity-group options`, see [here](https://pulsar.apache.org/tools/pulsar-admin/).
@@ -102,6 +106,7 @@ For more information about the command `pulsar-admin namespaces set-bookie-affin
 **Example**
 
 ```shell
+
 bin/pulsar-admin bookies set-bookie-rack \
 --bookie 127.0.0.1:3181 \
 --hostname 127.0.0.1:3181 \
@@ -110,6 +115,7 @@ bin/pulsar-admin bookies set-bookie-rack \
 
 bin/pulsar-admin namespaces set-bookie-affinity-group public/default \
 --primary-group group-bookie1
+
 ```
 
 </TabItem>
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-load-balance.md b/site2/website-next/versioned_docs/version-2.8.0/administration-load-balance.md
index fc5d6d1..e611d13 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-load-balance.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-load-balance.md
@@ -53,15 +53,19 @@ Each bundle is independent of the others and thus is independently assigned to d
 When you create a new namespace, the new namespace sets to use the default number of bundles. You can set this in `conf/broker.conf`:
 
 ```properties
+
 # When a namespace is created without specifying the number of bundle, this
 # value will be used as the default
 defaultNumberOfNamespaceBundles=4
+
 ```
 
 You can either change the system default, or override it when you create a new namespace:
 
 ```shell
+
 $ bin/pulsar-admin namespaces create my-tenant/my-namespace --clusters us-west --bundles 16
+
 ```
 
 With this command, you create a namespace with 16 initial bundles. Therefore the topics for this namespaces can immediately be spread across up to 16 brokers.
@@ -82,13 +86,17 @@ Unloading is the mechanism that the load-manager uses to perform the load sheddi
 Unloading a topic has no effect on the assignment, but just closes and reopens the particular topic:
 
 ```shell
+
 pulsar-admin topics unload persistent://tenant/namespace/topic
+
 ```
 
 To unload all topics for a namespace and trigger reassignments:
 
 ```shell
+
 pulsar-admin namespaces unload tenant/namespace
+
 ```
 
 ### Split namespace bundles 
@@ -98,6 +106,7 @@ Since the load for the topics in a bundle might change over time, or predicting
 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.
 
 ```properties
+
 # enable/disable namespace bundle auto split
 loadBalancerAutoBundleSplitEnabled=true
 
@@ -118,6 +127,7 @@ loadBalancerNamespaceBundleMaxBandwidthMbytes=100
 
 # maximum number of bundles in a namespace (for auto-split)
 loadBalancerNamespaceMaximumBundles=128
+
 ```
 
 ### Shed load automatically
@@ -135,19 +145,23 @@ and memory), broker unloads bundles for at least 15% of traffic.
 The automatic load shedding is enabled by default and you can disable the automatic load shedding with this setting:
 
 ```properties
+
 # Enable/disable automatic bundle unloading for load-shedding
 loadBalancerSheddingEnabled=true
+
 ```
 
 Additional settings that apply to shedding:
 
 ```properties
+
 # Load shedding interval. Broker periodically checks whether some traffic should be offload from
 # some over-loaded broker to other under-loaded brokers
 loadBalancerSheddingIntervalMinutes=1
 
 # Prevent the same topics to be shed and moved to other brokers more that once within this timeframe
 loadBalancerSheddingGracePeriodMinutes=30
+
 ```
 
 #### Broker overload thresholds
@@ -157,8 +171,10 @@ The determinations of when a broker is overloaded is based on threshold of CPU,
 By default, overload threshold is set at 85%:
 
 ```properties
+
 # Usage threshold to determine a broker as over-loaded
 loadBalancerBrokerOverloadedThresholdPercentage=85
+
 ```
 
 Pulsar gathers the usage stats from the system metrics.
@@ -172,6 +188,7 @@ Because of the incorrect max speed, the Pulsar load manager might think the brok
 You can use the following setting to correct the max NIC speed:
 
 ```properties
+
 # Override the auto-detection of the network interfaces max speed.
 # This option is useful in some environments (eg: EC2 VMs) where the max speed
 # reported by Linux is not reflecting the real bandwidth available to the broker.
@@ -180,6 +197,7 @@ You can use the following setting to correct the max NIC speed:
 # with the right value here. The configured value can be a double (eg: 0.8) and that
 # can be used to trigger load-shedding even before hitting on NIC limits.
 loadBalancerOverrideBrokerNicSpeedGbps=
+
 ```
 
 When the value is empty, Pulsar uses the value that the OS reports.
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-proxy.md b/site2/website-next/versioned_docs/version-2.8.0/administration-proxy.md
index 31cc6e2..f70cc6f 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-proxy.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-proxy.md
@@ -18,9 +18,12 @@ Before using the proxy, you need to configure it with the brokers addresses in t
 ### Use service discovery
 
 Pulsar uses [ZooKeeper](https://zookeeper.apache.org) for service discovery. To connect the proxy to ZooKeeper, specify the following in `conf/proxy.conf`.
+
 ```properties
+
 zookeeperServers=zk-0,zk-1,zk-2
 configurationStoreServers=zk-0:2184,zk-remote:2184
+
 ```
 
 > To use service discovery, you need to open the network ACLs, so the proxy can connects to the ZooKeeper nodes through the ZooKeeper client port (port `2181`) and the configuration store client port (port `2184`).
@@ -36,16 +39,21 @@ Proxy authorization requires access to ZooKeeper, so if you use these broker URL
 You can configure the broker URLs in `conf/proxy.conf` as follows.
 
 ```properties
+
 brokerServiceURL=pulsar://brokers.example.com:6650
 brokerWebServiceURL=http://brokers.example.com:8080
 functionWorkerWebServiceURL=http://function-workers.example.com:8080
+
 ```
 
 If you use TLS, configure the broker URLs in the following way:
+
 ```properties
+
 brokerServiceURLTLS=pulsar+ssl://brokers.example.com:6651
 brokerWebServiceURLTLS=https://brokers.example.com:8443
 functionWorkerWebServiceURL=https://function-workers.example.com:8443
+
 ```
 
 The hostname in the URLs provided should be a DNS entry which points to multiple brokers or a virtual IP address, which is backed by multiple broker IP addresses, so that the proxy does not lose connectivity to Pulsar cluster if a single broker becomes unavailable.
@@ -59,8 +67,10 @@ Note that if you do not use functions, you do not need to configure `functionWor
 To start the proxy:
 
 ```bash
+
 $ cd /path/to/pulsar/directory
 $ bin/pulsar proxy
+
 ```
 
 > You can run multiple instances of the Pulsar proxy in a cluster.
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-pulsar-manager.md b/site2/website-next/versioned_docs/version-2.8.0/administration-pulsar-manager.md
index facdeb8..f354c25 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-pulsar-manager.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-pulsar-manager.md
@@ -13,7 +13,7 @@ Pulsar Manager is a web-based GUI management and monitoring tool that helps admi
 
 :::note
 
-If you monitor your current stats with [Pulsar dashboard](administration-dashboard.md), you can try to use Pulsar Manager instead. Pulsar dashboard is deprecated.
+If you monitor your current stats with [Pulsar dashboard](administration-dashboard), you can try to use Pulsar Manager instead. Pulsar dashboard is deprecated.
 
 :::
 
@@ -22,11 +22,13 @@ If you monitor your current stats with [Pulsar dashboard](administration-dashboa
 The easiest way to use the Pulsar Manager is to run it inside a [Docker](https://www.docker.com/products/docker) container.
 
 ```shell
+
 docker pull apachepulsar/pulsar-manager:v0.2.0
 docker run -it \
     -p 9527:9527 -p 7750:7750 \
     -e SPRING_CONFIGURATION_FILE=/pulsar-manager/pulsar-manager/application.properties \
     apachepulsar/pulsar-manager:v0.2.0
+
 ```
 
 * `SPRING_CONFIGURATION_FILE`: Default configuration file for spring.
@@ -34,6 +36,7 @@ docker run -it \
 ### Set administrator account and password
 
  ```shell
+
 CSRF_TOKEN=$(curl http://localhost:7750/pulsar-manager/csrf-token)
 curl \
     -H 'X-XSRF-TOKEN: $CSRF_TOKEN' \
@@ -41,6 +44,7 @@ curl \
     -H "Content-Type: application/json" \
     -X PUT http://localhost:7750/pulsar-manager/users/superuser \
     -d '{"name": "admin", "password": "apachepulsar", "description": "test", "email": "username@test.org"}'
+
 ```
 
 You can find the docker image in the [Docker Hub](https://github.com/apache/pulsar-manager/tree/master/docker) directory and build an image from the source code as well:
@@ -54,6 +58,7 @@ cd ..
 ./gradlew build -x test
 cd ..
 docker build -f docker/Dockerfile --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --build-arg VCS_REF=`latest` --build-arg VERSION=`latest` -t apachepulsar/pulsar-manager .
+
 ```
 
 ### Use custom databases
@@ -69,12 +74,14 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/pulsar_manager
 spring.datasource.username=postgres
 spring.datasource.password=postgres
+
 ```
 
 3. Compile to generate a new executable jar package.
 
 ```
 ./gradlew build -x test
+
 ```
 
 ### Enable JWT authentication
@@ -103,6 +110,7 @@ tar -zxvf pulsar-manager.tar
 cd pulsar-manager
 cp -r ../dist ui
 ./bin/pulsar-manager --redirect.host=http://localhost --redirect.port=9527 insert.stats.interval=600000 --backend.jwt.token=token --jwt.broker.token.mode=PRIVATE --jwt.broker.private.key=file:///path/broker-private.key --jwt.broker.public.key=file:///path/broker-public.key 
+
 ```
 Firstly, [set the administrator account and password](#set-administrator-account-and-password)
 
@@ -120,6 +128,7 @@ jwt.broker.private.key=file:///path/broker-private.key
 or 
 jwt.broker.token.mode=SECRET
 jwt.broker.secret.key=file:///path/broker-secret.key
+
 ```
 
 * Method 3: use Docker and enable token authentication.
@@ -127,6 +136,7 @@ jwt.broker.secret.key=file:///path/broker-secret.key
 ```
 export JWT_TOKEN="your-token"
 docker run -it -p 9527:9527 -p 7750:7750 -e REDIRECT_HOST=http://localhost -e REDIRECT_PORT=9527 -e DRIVER_CLASS_NAME=org.postgresql.Driver -e URL='jdbc:postgresql://127.0.0.1:5432/pulsar_manager' -e USERNAME=pulsar -e PASSWORD=pulsar -e LOG_LEVEL=DEBUG -e JWT_TOKEN=$JWT_TOKEN -v $PWD:/data apachepulsar/pulsar-manager:v0.2.0 /bin/sh
+
 ```
 
 * `JWT_TOKEN`: the token of superuser configured for the broker. It is generated by the  `bin/pulsar tokens create --secret-key` or `bin/pulsar tokens create --private-key` command.
@@ -145,6 +155,7 @@ export JWT_TOKEN="your-token"
 export PRIVATE_KEY="file:///pulsar-manager/secret/my-private.key"
 export PUBLIC_KEY="file:///pulsar-manager/secret/my-public.key"
 docker run -it -p 9527:9527 -p 7750:7750 -e REDIRECT_HOST=http://localhost -e REDIRECT_PORT=9527 -e DRIVER_CLASS_NAME=org.postgresql.Driver -e URL='jdbc:postgresql://127.0.0.1:5432/pulsar_manager' -e USERNAME=pulsar -e PASSWORD=pulsar -e LOG_LEVEL=DEBUG -e JWT_TOKEN=$JWT_TOKEN -e PRIVATE_KEY=$PRIVATE_KEY -e PUBLIC_KEY=$PUBLIC_KEY -v $PWD:/data -v $PWD/secret:/pulsar-manager/secret apachepulsar/pulsar-manager:v0.2.0 /bin/sh
+
 ```
 
 * `JWT_TOKEN`: the token of superuser configured for the broker. It is generated by the `bin/pulsar tokens create --private-key` command.
@@ -165,6 +176,7 @@ docker run -it -p 9527:9527 -p 7750:7750 -e REDIRECT_HOST=http://localhost -e RE
 export JWT_TOKEN="your-token"
 export SECRET_KEY="file:///pulsar-manager/secret/my-secret.key"
 docker run -it -p 9527:9527 -p 7750:7750 -e REDIRECT_HOST=http://localhost -e REDIRECT_PORT=9527 -e DRIVER_CLASS_NAME=org.postgresql.Driver -e URL='jdbc:postgresql://127.0.0.1:5432/pulsar_manager' -e USERNAME=pulsar -e PASSWORD=pulsar -e LOG_LEVEL=DEBUG -e JWT_TOKEN=$JWT_TOKEN -e SECRET_KEY=$SECRET_KEY -v $PWD:/data -v $PWD/secret:/pulsar-manager/secret apachepulsar/pulsar-manager:v0.2.0 /bin/sh
+
 ```
 
 * `JWT_TOKEN`: the token of superuser configured for the broker. It is generated by the `bin/pulsar tokens create --secret-key` command.
@@ -178,7 +190,7 @@ docker run -it -p 9527:9527 -p 7750:7750 -e REDIRECT_HOST=http://localhost -e RE
 * `PASSWORD`: the password of PostgreSQL.
 * `LOG_LEVEL`: the level of log.
 
-* For more information about backend configurations, see [here](https://github.com/apache/pulsar-manager/blob/master/src/README.md).
+* For more information about backend configurations, see [here](https://github.com/apache/pulsar-manager/blob/master/src/README).
 * For more information about frontend configurations, see [here](https://github.com/apache/pulsar-manager/tree/master/front-end).
 
 ## Log in
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-upgrade.md b/site2/website-next/versioned_docs/version-2.8.0/administration-upgrade.md
index d76dafd..78b290b 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-upgrade.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-upgrade.md
@@ -36,13 +36,19 @@ To upgrade an Apache Pulsar cluster, follow the upgrade sequence.
 - Canary test: test an upgraded version in one or a small set of bookies.
 - Rolling upgrade:  
     - a. Disable `autorecovery` with the following command.
+
        ```shell
+
        bin/bookkeeper shell autorecovery -disable
+
        ```  
     - b. Rollout the upgraded version to all bookies in the cluster after you determine that a version is safe after canary.  
     - c. After you upgrade all bookies, re-enable `autorecovery` with the following command.
+
        ```shell
+
        bin/bookkeeper shell autorecovery -enable
+
        ```
 3. Upgrade brokers
 - Canary test: test an upgraded version in one or a small set of brokers.
@@ -90,12 +96,18 @@ To upgrade bookie to a new version, complete the following steps:
 1. Stop a bookie.
 2. Upgrade the binary and configuration files.
 3. Start the bookie in `ReadOnly` mode to verify if the bookie of this new version runs well for read workload.
+
    ```shell
+
    bin/pulsar bookie --readOnly
+
    ```
 4. When the bookie runs successfully in `ReadOnly` mode, stop the bookie and restart it in `Write/Read` mode.
+
    ```shell
+
    bin/pulsar bookie
+
    ```
 5. Observe and make sure the cluster serves both write and read traffic.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/administration-zk-bk.md b/site2/website-next/versioned_docs/version-2.8.0/administration-zk-bk.md
index b33e309..ced1ead 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/administration-zk-bk.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/administration-zk-bk.md
@@ -35,9 +35,11 @@ To deploy a Pulsar instance, you need to stand up one local ZooKeeper cluster *p
 To begin, add all ZooKeeper servers to the quorum configuration specified in the [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) file. Add a `server.N` line for each node in the cluster to the configuration, where `N` is the number of the ZooKeeper node. The following is an example for a three-node cluster:
 
 ```properties
+
 server.1=zk1.us-west.example.com:2888:3888
 server.2=zk2.us-west.example.com:2888:3888
 server.3=zk3.us-west.example.com:2888:3888
+
 ```
 
 On each host, you need to specify the node ID in `myid` file of each node, which is in `data/zookeeper` folder of each server by default (you can change the file location via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
@@ -48,8 +50,10 @@ On each host, you need to specify the node ID in `myid` file of each node, which
 On a ZooKeeper server at `zk1.us-west.example.com`, for example, you can set the `myid` value like this:
 
 ```shell
+
 $ mkdir -p data/zookeeper
 $ echo 1 > data/zookeeper/myid
+
 ```
 
 On `zk2.us-west.example.com` the command is `echo 2 > data/zookeeper/myid` and so on.
@@ -57,7 +61,9 @@ On `zk2.us-west.example.com` the command is `echo 2 > data/zookeeper/myid` and s
 Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```shell
+
 $ bin/pulsar-daemon start zookeeper
+
 ```
 
 ### Deploy configuration store
@@ -70,13 +76,15 @@ If you deploy a [single-cluster](#single-cluster-pulsar-instance) instance, you
 
 If your Pulsar instance consists of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but run on different TCP ports.
 
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorom uses to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
+To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorum uses to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
 
 ```properties
+
 clientPort=2184
 server.1=zk1.us-west.example.com:2185:2186
 server.2=zk2.us-west.example.com:2185:2186
 server.3=zk3.us-west.example.com:2185:2186
+
 ```
 
 As before, create the `myid` files for each server on `data/global-zookeeper/myid`.
@@ -93,6 +101,7 @@ For example, you can assume a Pulsar instance with the following clusters `us-we
 
 ```
 zk[1-3].${CLUSTER}.example.com
+
 ```
 
 In this scenario you 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, you can pick 3 servers from `us-west`, 2 from `us-central` and 2 from `us-east`.
@@ -102,6 +111,7 @@ This guarantees that writes to configuration store is possible even if one of th
 The ZK configuration in all the servers looks like:
 
 ```properties
+
 clientPort=2184
 server.1=zk1.us-west.example.com:2185:2186
 server.2=zk2.us-west.example.com:2185:2186
@@ -118,12 +128,15 @@ server.12=zk3.eu-central.example.com:2185:2186:observer
 server.13=zk1.ap-south.example.com:2185:2186:observer
 server.14=zk2.ap-south.example.com:2185:2186:observer
 server.15=zk3.ap-south.example.com:2185:2186:observer
+
 ```
 
 Additionally, ZK observers need to have:
 
 ```properties
+
 peerType=observer
+
 ```
 
 ##### Start the service
@@ -131,7 +144,9 @@ peerType=observer
 Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
 
 ```shell
+
 $ bin/pulsar-daemon start configuration-store
+
 ```
 
 ### ZooKeeper configuration
@@ -163,7 +178,7 @@ The [`conf/global-zookeeper.conf`](reference-configuration.md#configuration-stor
 
 BookKeeper stores all durable message in Pulsar. BookKeeper is a distributed [write-ahead log](https://en.wikipedia.org/wiki/Write-ahead_logging) WAL system that guarantees read consistency of independent message logs calls ledgers. Individual BookKeeper servers are also called *bookies*.
 
-> To manage message persistence, retention, and expiry in Pulsar, refer to [cookbook](cookbooks-retention-expiry.md).
+> To manage message persistence, retention, and expiry in Pulsar, refer to [cookbook](cookbooks-retention-expiry).
 
 ### Hardware requirements
 
@@ -184,6 +199,7 @@ You can configure BookKeeper bookies using the [`conf/bookkeeper.conf`](referenc
 The minimum configuration changes required in `conf/bookkeeper.conf` are as follows:
 
 ```properties
+
 # Change to point to journal disk mount point
 journalDirectory=data/bookkeeper/journal
 
@@ -192,6 +208,7 @@ ledgerDirectories=data/bookkeeper/ledgers
 
 # Point to local ZK quorum
 zkServers=zk1.example.com:2181,zk2.example.com:2181,zk3.example.com:2181
+
 ```
 
 To change the ZooKeeper root path that BookKeeper uses, use `zkLedgersRootPath=/MY-PREFIX/ledgers` instead of `zkServers=localhost:2181/MY-PREFIX`.
@@ -209,19 +226,25 @@ You can start a bookie in the foreground or as a background daemon.
 To start a bookie in the foreground, use the [`bookkeeper`](reference-cli-tools.md#bookkeeper) CLI tool:
 
 ```bash
+
 $ bin/bookkeeper bookie
+
 ```
 
 To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```bash
+
 $ bin/pulsar-daemon start bookie
+
 ```
 
 You can verify whether the bookie works properly with the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
 
 ```shell
+
 $ bin/bookkeeper shell bookiesanity
+
 ```
 
 When you use this command, you create a new ledger on the local bookie, write a few entries, read them back and finally delete the ledger.
@@ -256,8 +279,10 @@ And then you can decommission bookies safely. To decommission bookies, complete
 You can run the following command to check if the bookie you have decommissioned is listed in the bookies list:
 
 ```bash
+
 ./bookkeeper shell listbookies -rw -h
 ./bookkeeper shell listbookies -ro -h
+
 ```
 
 ## BookKeeper persistence policies
@@ -279,7 +304,7 @@ Use the [`set-persistence`](reference-pulsar-admin.md#namespaces-set-persistence
 
 Flag | Description | Default
 :----|:------------|:-------
-`-a`, `--bookkeeper-ack-quorom` | The number of acks (guaranteed copies) to wait on for each entry | 0
+`-a`, `--bookkeeper-ack-quorum` | The number of acks (guaranteed copies) to wait on for each entry | 0
 `-e`, `--bookkeeper-ensemble` | The number of [bookies](reference-terminology.md#bookie) to use for topics in the namespace | 0
 `-w`, `--bookkeeper-write-quorum` | The number of writes to make for each entry | 0
 `-r`, `--ml-mark-delete-max-rate` | Throttling rate for mark-delete operations (0 means no throttle) | 0
@@ -287,9 +312,11 @@ Flag | Description | Default
 The following is an example:
 
 ```shell
+
 $ pulsar-admin namespaces set-persistence my-tenant/my-ns \
-  --bookkeeper-ack-quorom 3 \
+  --bookkeeper-ack-quorum 3 \
   --bookeeper-ensemble 2
+
 ```
 
 #### REST API
@@ -299,6 +326,7 @@ $ pulsar-admin namespaces set-persistence my-tenant/my-ns \
 #### Java
 
 ```java
+
 int bkEnsemble = 2;
 int bkQuorum = 3;
 int bkAckQuorum = 2;
@@ -306,6 +334,7 @@ double markDeleteRate = 0.7;
 PersistencePolicies policies =
   new PersistencePolicies(ensemble, quorum, ackQuorum, markDeleteRate);
 admin.namespaces().setPersistence(namespace, policies);
+
 ```
 
 ### List persistence policies
@@ -319,6 +348,7 @@ Use the [`get-persistence`](reference-pulsar-admin.md#namespaces-get-persistence
 The following is an example:
 
 ```shell
+
 $ pulsar-admin namespaces get-persistence my-tenant/my-ns
 {
   "bookkeeperEnsemble": 1,
@@ -326,6 +356,7 @@ $ pulsar-admin namespaces get-persistence my-tenant/my-ns
   "bookkeeperAckQuorum", 1,
   "managedLedgerMaxMarkDeleteRate": 0
 }
+
 ```
 
 #### REST API
@@ -335,7 +366,9 @@ $ pulsar-admin namespaces get-persistence my-tenant/my-ns
 #### Java
 
 ```java
+
 PersistencePolicies policies = admin.namespaces().getPersistence(namespace);
+
 ```
 
 ## How Pulsar uses ZooKeeper and BookKeeper
diff --git a/site2/website-next/versioned_docs/version-2.8.0/client-libraries-java.md b/site2/website-next/versioned_docs/version-2.8.0/client-libraries-java.md
index 886115b..dfaf663 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/client-libraries-java.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/client-libraries-java.md
@@ -177,7 +177,7 @@ stringProducer.send("My message");
 
 > Make sure that you close your producers, consumers, and clients when you do not need them.
 > ```java
-
+>
 > producer.close();
 > consumer.close();
 > client.close();
@@ -185,7 +185,7 @@ stringProducer.send("My message");
 >
 > Close operations can also be asynchronous:
 > ```java
-
+>
 > producer.closeAsync()
 >    .thenRun(() -> System.out.println("Producer closed"))
 >    .exceptionally((ex) -> {
diff --git a/site2/website-next/versioned_docs/version-2.8.0/client-libraries-node.md b/site2/website-next/versioned_docs/version-2.8.0/client-libraries-node.md
index 3146d74..83fb78d 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/client-libraries-node.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/client-libraries-node.md
@@ -148,7 +148,7 @@ Pulsar Node.js producers have the following methods available:
 | Method | Description | Return type |
 | :----- | :---------- | :---------- |
 | `send(Object)` | Publishes a [message](#messages) to the producer's topic. When the message is successfully acknowledged by the Pulsar broker, or an error is thrown, the Promise object whose result is the message ID runs executor function. | `Promise<Object>` |
-| `flush()` | Sends message from send queue to Pulser broker. When the message is successfully acknowledged by the Pulsar broker, or an error is thrown, the Promise object runs executor function. | `Promise<null>` |
+| `flush()` | Sends message from send queue to Pulsar broker. When the message is successfully acknowledged by the Pulsar broker, or an error is thrown, the Promise object runs executor function. | `Promise<null>` |
 | `close()` | Closes the producer and releases all resources allocated to it. Once `close()` is called, no more messages are accepted from the publisher. This method returns a Promise object. It runs the executor function when all pending publish requests are persisted by Pulsar. If an error is thrown, no pending writes are retried. | `Promise<null>` |
 | `getProducerName()` | Getter method of the producer name. | `string` |
 | `getTopic()` | Getter method of the name of the topic. | `string` |
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-architecture-overview.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-architecture-overview.md
index 7db944e..e0741fa 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-architecture-overview.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-architecture-overview.md
@@ -5,7 +5,11 @@ sidebar_label: Architecture
 original_id: concepts-architecture-overview
 ---
 
-At the highest level, a Pulsar instance is composed of one or more Pulsar clusters. Clusters within an instance can [replicate](concepts-replication.md) data amongst themselves.
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
+At the highest level, a Pulsar instance is composed of one or more Pulsar clusters. Clusters within an instance can [replicate](concepts-replication) data amongst themselves.
 
 In a Pulsar cluster:
 
@@ -17,20 +21,20 @@ The diagram below provides an illustration of a Pulsar cluster:
 
 ![Pulsar architecture diagram](/assets/pulsar-system-architecture.png)
 
-At the broader instance level, an instance-wide ZooKeeper cluster called the configuration store handles coordination tasks involving multiple clusters, for example [geo-replication](concepts-replication.md).
+At the broader instance level, an instance-wide ZooKeeper cluster called the configuration store handles coordination tasks involving multiple clusters, for example [geo-replication](concepts-replication).
 
 ## Brokers
 
 The Pulsar message broker is a stateless component that's primarily responsible for running two other components:
 
 * An HTTP server that exposes a {@inject: rest:REST:/} API for both administrative tasks and [topic lookup](concepts-clients.md#client-setup-phase) for producers and consumers. The producers connect to the brokers to publish messages and the consumers connect to the brokers to consume the messages.
-* A dispatcher, which is an asynchronous TCP server over a custom [binary protocol](developing-binary-protocol.md) used for all data transfers
+* A dispatcher, which is an asynchronous TCP server over a custom [binary protocol](developing-binary-protocol) used for all data transfers
 
 Messages are typically dispatched out of a [managed ledger](#managed-ledgers) cache for the sake of performance, *unless* the backlog exceeds the cache size. If the backlog grows too large for the cache, the broker will start reading entries from BookKeeper.
 
-Finally, to support geo-replication on global topics, the broker manages replicators that tail the entries published in the local region and republish them to the remote region using the Pulsar [Java client library](client-libraries-java.md).
+Finally, to support geo-replication on global topics, the broker manages replicators that tail the entries published in the local region and republish them to the remote region using the Pulsar [Java client library](client-libraries-java).
 
-> For a guide to managing Pulsar brokers, see the [brokers](admin-api-brokers.md) guide.
+> For a guide to managing Pulsar brokers, see the [brokers](admin-api-brokers) guide.
 
 ## Clusters
 
@@ -40,9 +44,9 @@ A Pulsar instance consists of one or more Pulsar *clusters*. Clusters, in turn,
 * A ZooKeeper quorum used for cluster-level configuration and coordination
 * An ensemble of bookies used for [persistent storage](#persistent-storage) of messages
 
-Clusters can replicate amongst themselves using [geo-replication](concepts-replication.md).
+Clusters can replicate amongst themselves using [geo-replication](concepts-replication).
 
-> For a guide to managing Pulsar clusters, see the [clusters](admin-api-clusters.md) guide.
+> For a guide to managing Pulsar clusters, see the [clusters](admin-api-clusters) guide.
 
 ## Metadata store
 
@@ -79,7 +83,9 @@ In addition to message data, *cursors* are also persistently stored in BookKeepe
 At the moment, Pulsar supports persistent message storage. This accounts for the `persistent` in all topic names. Here's an example:
 
 ```http
+
 persistent://my-tenant/my-namespace/my-topic
+
 ```
 
 > Pulsar also supports ephemeral ([non-persistent](concepts-messaging.md#non-persistent-topics)) message storage.
@@ -126,23 +132,25 @@ The **Pulsar proxy** provides a solution to this problem by acting as a single g
 Architecturally, the Pulsar proxy gets all the information it requires from ZooKeeper. When starting the proxy on a machine, you only need to provide ZooKeeper connection strings for the cluster-specific and instance-wide configuration store clusters. Here's an example:
 
 ```bash
+
 $ bin/pulsar proxy \
   --zookeeper-servers zk-0,zk-1,zk-2 \
   --configuration-store-servers zk-0,zk-1,zk-2
+
 ```
 
 > #### Pulsar proxy docs
-> For documentation on using the Pulsar proxy, see the [Pulsar proxy admin documentation](administration-proxy.md).
+> For documentation on using the Pulsar proxy, see the [Pulsar proxy admin documentation](administration-proxy).
 
 
 Some important things to know about the Pulsar proxy:
 
 * Connecting clients don't need to provide *any* specific configuration to use the Pulsar proxy. You won't need to update the client configuration for existing applications beyond updating the IP used for the service URL (for example if you're running a load balancer over the Pulsar proxy).
-* [TLS encryption](security-tls-transport.md) and [authentication](security-tls-authentication.md) is supported by the Pulsar proxy
+* [TLS encryption](security-tls-transport.md) and [authentication](security-tls-authentication) is supported by the Pulsar proxy
 
 ## Service discovery
 
-[Clients](getting-started-clients.md) connecting to Pulsar brokers need to be able to communicate with an entire Pulsar instance using a single URL. Pulsar provides a built-in service discovery mechanism that you can set up using the instructions in the [Deploying a Pulsar instance](deploy-bare-metal.md#service-discovery-setup) guide.
+[Clients](getting-started-clients) connecting to Pulsar brokers need to be able to communicate with an entire Pulsar instance using a single URL. Pulsar provides a built-in service discovery mechanism that you can set up using the instructions in the [Deploying a Pulsar instance](deploy-bare-metal.md#service-discovery-setup) guide.
 
 You can use your own service discovery system if you'd like. If you use your own system, there is just one requirement: when a client performs an HTTP request to an endpoint, such as `http://pulsar.us-west.example.com:8080`, the client needs to be redirected to *some* active broker in the desired cluster, whether via DNS, an HTTP or IP redirect, or some other means.
 
@@ -150,13 +158,18 @@ The diagram below illustrates Pulsar service discovery:
 
 ![alt-text](/assets/pulsar-service-discovery.png)
 
-In this diagram, the Pulsar cluster is addressable via a single DNS name: `pulsar-cluster.acme.com`. A [Python client](client-libraries-python.md), for example, could access this Pulsar cluster like this:
+In this diagram, the Pulsar cluster is addressable via a single DNS name: `pulsar-cluster.acme.com`. A [Python client](client-libraries-python), for example, could access this Pulsar cluster like this:
 
 ```python
+
 from pulsar import Client
 
 client = Client('pulsar://pulsar-cluster.acme.com:6650')
+
 ```
 
-> **Note**
-> In Pulsar, each topic is handled by only one broker. Initial requests from a client to read, update or delete a topic are sent to a broker that may not be the topic owner. If the broker cannot handle the request for this topic, it redirects the request to the appropriate broker.
+:::note
+
+In Pulsar, each topic is handled by only one broker. Initial requests from a client to read, update or delete a topic are sent to a broker that may not be the topic owner. If the broker cannot handle the request for this topic, it redirects the request to the appropriate broker.
+
+:::
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-authentication.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-authentication.md
index 781d068..e2eaca5 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-authentication.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-authentication.md
@@ -5,5 +5,9 @@ sidebar_label: Authentication and Authorization
 original_id: concepts-authentication
 ---
 
-Pulsar supports a pluggable [authentication](security-overview.md) mechanism which can be configured at the proxy and/or the broker. Pulsar also supports a pluggable [authorization](security-authorization.md) mechanism. These mechanisms work together to identify the client and its access rights on topics, namespaces and tenants.
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
+Pulsar supports a pluggable [authentication](security-overview.md) mechanism which can be configured at the proxy and/or the broker. Pulsar also supports a pluggable [authorization](security-authorization) mechanism. These mechanisms work together to identify the client and its access rights on topics, namespaces and tenants.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-clients.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-clients.md
index 1ce2865..c61a821 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-clients.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-clients.md
@@ -5,12 +5,16 @@ sidebar_label: Clients
 original_id: concepts-clients
 ---
 
-Pulsar exposes a client API with language bindings for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md), [C++](client-libraries-cpp.md) and [C#](client-libraries-dotnet.md). The client API optimizes and encapsulates Pulsar's client-broker communication protocol and exposes a simple and intuitive API for use by applications.
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
+Pulsar exposes a client API with language bindings for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md), [C++](client-libraries-cpp.md) and [C#](client-libraries-dotnet). The client API optimizes and encapsulates Pulsar's client-broker communication protocol and exposes a simple and intuitive API for use by applications.
 
 Under the hood, the current official Pulsar client libraries support transparent reconnection and/or connection failover to brokers, queuing of messages until acknowledged by the broker, and heuristics such as connection retries with backoff.
 
 > **Custom client libraries**
-> If you'd like to create your own client library, we recommend consulting the documentation on Pulsar's custom [binary protocol](developing-binary-protocol.md).
+> If you'd like to create your own client library, we recommend consulting the documentation on Pulsar's custom [binary protocol](developing-binary-protocol).
 
 
 ## Client setup phase
@@ -38,7 +42,7 @@ Internally, the reader interface is implemented as a consumer using an exclusive
 
 [ **IMPORTANT** ]
 
-Unlike subscription/consumer, readers are non-durable in nature and does not prevent data in a topic from being deleted, thus it is ***strongly*** advised that [data retention](cookbooks-retention-expiry.md) be configured. If data retention for a topic is not configured for an adequate amount of time, messages that the reader has not yet read might be deleted .  This causes the readers to essentially skip messages. Configuring the data retention for a topic guarantees the reader with a c [...]
+Unlike subscription/consumer, readers are non-durable in nature and does not prevent data in a topic from being deleted, thus it is ***strongly*** advised that [data retention](cookbooks-retention-expiry) be configured. If data retention for a topic is not configured for an adequate amount of time, messages that the reader has not yet read might be deleted .  This causes the readers to essentially skip messages. Configuring the data retention for a topic guarantees the reader with a cert [...]
 
 Please also note that a reader can have a "backlog", but the metric is only used for users to know how behind the reader is. The metric is not considered for any backlog quota calculations. 
 
@@ -47,6 +51,7 @@ Please also note that a reader can have a "backlog", but the metric is only used
 Here's a Java example that begins reading from the earliest available message on a topic:
 
 ```java
+
 import org.apache.pulsar.client.api.Message;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.Reader;
@@ -62,24 +67,29 @@ while (true) {
 
     // Process the message
 }
+
 ```
 
 To create a reader that reads from the latest available message:
 
 ```java
+
 Reader<byte[]> reader = pulsarClient.newReader()
     .topic(topic)
     .startMessageId(MessageId.latest)
     .create();
+
 ```
 
 To create a reader that reads from some message between the earliest and the latest:
 
 ```java
+
 byte[] msgIdBytes = // Some byte array
 MessageId id = MessageId.fromByteArray(msgIdBytes);
 Reader<byte[]> reader = pulsarClient.newReader()
     .topic(topic)
     .startMessageId(id)
     .create();
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-messaging.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-messaging.md
index f2a394a..944232f 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-messaging.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-messaging.md
@@ -5,6 +5,10 @@ sidebar_label: Messaging
 original_id: concepts-messaging
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 Pulsar is built on the [publish-subscribe](https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern) pattern (often abbreviated to pub-sub). In this pattern, [producers](#producers) publish messages to [topics](#topics). [Consumers](#consumers) [subscribe](#subscription-modes) to those topics, process incoming messages, and send an acknowledgement when processing is complete.
 
 When a subscription is created, Pulsar [retains](concepts-architecture-overview.md#persistent-storage) all messages, even if the consumer is disconnected. Retained messages are discarded only when a consumer acknowledges that those messages are processed successfully.
@@ -15,8 +19,8 @@ Messages are the basic "unit" of Pulsar. The following table lists the component
 
 Component | Description
 :---------|:-------
-Value / data payload | The data carried by the message. All Pulsar messages contain raw bytes, although message data can also conform to data [schemas](schema-get-started.md).
-Key | Messages are optionally tagged with keys, which is useful for things like [topic compaction](concepts-topic-compaction.md).
+Value / data payload | The data carried by the message. All Pulsar messages contain raw bytes, although message data can also conform to data [schemas](schema-get-started).
+Key | Messages are optionally tagged with keys, which is useful for things like [topic compaction](concepts-topic-compaction).
 Properties | An optional key/value map of user-defined properties.
 Producer name | The name of the producer who produces the message. If you do not specify a producer name, the default name is used. 
 Sequence ID | Each Pulsar message belongs to an ordered sequence on its topic. The sequence ID of the message is its order in that sequence.
@@ -29,17 +33,21 @@ The default size of a message is 5 MB. You can configure the max size of a messa
 - In the `broker.conf` file.
 
     ```bash
+
     # The max size of a message (in bytes).
     maxMessageSize=5242880
+
     ```
 
 - In the `bookkeeper.conf` file.
 
     ```bash
+
     # The max size of the netty frame (in bytes). Any messages received larger than this value are rejected. The default value is 5 MB.
     nettyMaxFrameSizeBytes=5253120
+
     ```
-> For more information on Pulsar message contents, see Pulsar [binary protocol](developing-binary-protocol.md).
+> For more information on Pulsar message contents, see Pulsar [binary protocol](developing-binary-protocol).
 
 ## Producers
 
@@ -64,11 +72,14 @@ You can have different types of access modes on topics for producers.
 `Exclusive`|Only one producer can publish on a topic. <br /><br />If there is already a producer connected, other producers trying to publish on this topic get errors immediately.<br /><br />The “old” producer is evicted and a “new” producer is selected to be the next exclusive producer if the “old” producer experiences a network partition with the broker.
 `WaitForExclusive`|If there is already a producer connected, the producer creation is pending (rather than timing out) until the producer gets the `Exclusive` access.<br /><br />The producer that succeeds in becoming the exclusive one is treated as the leader. Consequently, if you want to implement the leader election scheme for your application, you can use this access mode.
 
-> **Note**
->
-> Once an application creates a producer with the `Exclusive` or `WaitForExclusive` access mode successfully, the instance of the application is guaranteed to be the **only one writer** on the topic. Other producers trying to produce on this topic get errors immediately or have to wait until they get the `Exclusive` access. 
-> 
-> For more information, see [PIP 68: Exclusive Producer](https://github.com/apache/pulsar/wiki/PIP-68:-Exclusive-Producer).
+:::note
+
+
+Once an application creates a producer with the `Exclusive` or `WaitForExclusive` access mode successfully, the instance of the application is guaranteed to be the **only one writer** on the topic. Other producers trying to produce on this topic get errors immediately or have to wait until they get the `Exclusive` access. 
+
+For more information, see [PIP 68: Exclusive Producer](https://github.com/apache/pulsar/wiki/PIP-68:-Exclusive-Producer).
+
+:::
 
 You can set producer access mode through Java Client API. For more information, see `ProducerAccessMode` in [ProducerBuilder.java](https://github.com/apache/pulsar/blob/fc5768ca3bbf92815d142fe30e6bfad70a1b4fc6/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/ProducerBuilder.java).
 
@@ -135,7 +146,7 @@ Messages are received from [brokers](reference-terminology.md#broker) either syn
 
 ### Listeners
 
-Client libraries provide listener implementation for consumers. For example, the [Java client](client-libraries-java.md) provides a {@inject: javadoc:MesssageListener:/client/org/apache/pulsar/client/api/MessageListener} interface. In this interface, the `received` method is called whenever a new message is received.
+Client libraries provide listener implementation for consumers. For example, the [Java client](client-libraries-java) provides a {@inject: javadoc:MesssageListener:/client/org/apache/pulsar/client/api/MessageListener} interface. In this interface, the `received` method is called whenever a new message is received.
 
 ### Acknowledgement
 
@@ -148,8 +159,11 @@ Messages can be acknowledged in the following two ways:
 - Messages are acknowledged individually. With individual acknowledgement, the consumer needs to acknowledge each message and sends an acknowledgement request to the broker.
 - Messages are acknowledged cumulatively. With cumulative acknowledgement, the consumer only needs to acknowledge the last message it received. All messages in the stream up to (and including) the provided message are not re-delivered to that consumer.
 
-> **Note**
-> Cumulative acknowledgement cannot be used in the [shared subscription mode](#subscription-modes), because the shared subscription mode involves multiple consumers who have access to the same subscription. In the shared subscription mode, messages are acknowledged individually.
+:::note
+
+Cumulative acknowledgement cannot be used in the [shared subscription mode](#subscription-modes), because the shared subscription mode involves multiple consumers who have access to the same subscription. In the shared subscription mode, messages are acknowledged individually.
+
+:::
 
 ### Negative acknowledgement
 
@@ -163,18 +177,27 @@ In the shared and Key_Shared subscription modes, you can negatively acknowledge
 
 Be aware that negative acknowledgment on ordered subscription types, such as Exclusive, Failover and Key_Shared, can cause failed messages to arrive consumers out of the original order.
 
-> **Note**
-> If batching is enabled, other messages and the negatively acknowledged messages in the same batch are redelivered to the consumer.
+:::note
+
+If batching is enabled, other messages and the negatively acknowledged messages in the same batch are redelivered to the consumer.
+
+:::
 
 ### Acknowledgement timeout
 
 If a message is not consumed successfully, and you want to trigger the broker to redeliver the message automatically, you can adopt the unacknowledged message automatic re-delivery mechanism. Client tracks the unacknowledged messages within the entire `acktimeout` time range, and sends a `redeliver unacknowledged messages` request to the broker automatically when the acknowledgement timeout is specified.
 
-> **Note**
-> If batching is enabled, other messages and the unacknowledged messages in the same batch are redelivered to the consumer.
+:::note
+
+If batching is enabled, other messages and the unacknowledged messages in the same batch are redelivered to the consumer.
+
+:::
 
-> **Note**    
-> Prefer negative acknowledgements over acknowledgement timeout. Negative acknowledgement controls the re-delivery of individual messages with more precision, and avoids invalid redeliveries when the message processing time exceeds the acknowledgement timeout.
+:::note
+
+Prefer negative acknowledgements over acknowledgement timeout. Negative acknowledgement controls the re-delivery of individual messages with more precision, and avoids invalid redeliveries when the message processing time exceeds the acknowledgement timeout.
+
+:::
 
 ### Dead letter topic
 
@@ -183,6 +206,7 @@ Dead letter topic enables you to consume new messages when some messages cannot
 The following example shows how to enable dead letter topic in a Java client using the default dead letter topic:
 
 ```java
+
 Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
               .topic(topic)
               .subscriptionName("my-subscription")
@@ -192,15 +216,19 @@ Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
                     .build())
               .subscribe();
                 
+
 ```
 The default dead letter topic uses this format: 
+
 ```
 <topicname>-<subscriptionname>-DLQ
+
 ```
   
 If you want to specify the name of the dead letter topic, use this Java client example:
 
 ```java
+
 Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
               .topic(topic)
               .subscriptionName("my-subscription")
@@ -211,12 +239,16 @@ Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
                     .build())
               .subscribe();
                 
+
 ```
   
 Dead letter topic depends on message re-delivery. Messages are redelivered either due to [acknowledgement timeout](#acknowledgement-timeout) or [negative acknowledgement](#negative-acknowledgement). If you are going to use negative acknowledgement on a message, make sure it is negatively acknowledged before the acknowledgement timeout. 
 
-> **Note**    
-> Currently, dead letter topic is enabled in the Shared and Key_Shared subscription modes.
+:::note
+
+Currently, dead letter topic is enabled in the Shared and Key_Shared subscription modes.
+
+:::
 
 ### Retry letter topic
 
@@ -227,6 +259,7 @@ By default, automatic retry is disabled. You can set `enableRetry` to `true` to
 This example shows how to consume messages from a retry letter topic.
 
 ```java
+
 Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
                 .topic(topic)
                 .subscriptionName("my-subscription")
@@ -239,6 +272,7 @@ Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
                         .build())
                 .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
                 .subscribe();
+
 ```
 
 ## Topics
@@ -246,7 +280,9 @@ Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
 As in other pub-sub systems, topics in Pulsar are named channels for transmitting messages from producers to consumers. Topic names are URLs that have a well-defined structure:
 
 ```http
+
 {persistent|non-persistent}://tenant/namespace/topic
+
 ```
 
 Topic name component | Description
@@ -345,6 +381,7 @@ When subscribing to multiple topics, the Pulsar client automatically makes a cal
 The following are multi-topic subscription examples for Java.
 
 ```java
+
 import java.util.regex.Pattern;
 
 import org.apache.pulsar.client.api.Consumer;
@@ -365,6 +402,7 @@ Consumer<byte[]> someTopicsConsumer = pulsarClient.newConsumer()
                 .topicsPattern(someTopicsInNamespace)
                 .subscriptionName("subscription-1")
                 .subscribe();
+
 ```
 
 For code examples, see [Java](client-libraries-java.md#multi-topic-subscriptions).
@@ -387,7 +425,7 @@ Decisions about routing and subscription modes can be made separately in most ca
 
 There is no difference between partitioned topics and normal topics in terms of how subscription modes work, as partitioning only determines what happens between when a message is published by a producer and processed and acknowledged by a consumer.
 
-Partitioned topics need to be explicitly created via the [admin API](admin-api-overview.md). The number of partitions can be specified when creating the topic.
+Partitioned topics need to be explicitly created via the [admin API](admin-api-overview). The number of partitions can be specified when creating the topic.
 
 ### Routing modes
 
@@ -399,7 +437,7 @@ Mode     | Description
 :--------|:------------
 `RoundRobinPartition` | If no key is provided, the producer will publish messages across all partitions in round-robin fashion to achieve maximum throughput. Please note that round-robin is not done per individual message but rather it's set to the same boundary of batching delay, to ensure batching is effective. While if a key is specified on the message, the partitioned producer will hash the key and assign message to a particular partition. This is the default mode. 
 `SinglePartition`     | If no key is provided, the producer will randomly pick one single partition and publish all the messages into that partition. While if a key is specified on the message, the partitioned producer will hash the key and assign message to a particular partition.
-`CustomPartition`     | Use custom message router implementation that will be called to determine the partition for a particular message. User can create a custom routing mode by using the [Java client](client-libraries-java.md) and implementing the {@inject: javadoc:MessageRouter:/client/org/apache/pulsar/client/api/MessageRouter} interface.
+`CustomPartition`     | Use custom message router implementation that will be called to determine the partition for a particular message. User can create a custom routing mode by using the [Java client](client-libraries-java) and implementing the {@inject: javadoc:MessageRouter:/client/org/apache/pulsar/client/api/MessageRouter} interface.
 
 ### Ordering guarantee
 
@@ -432,10 +470,12 @@ Pulsar also, however, supports **non-persistent topics**, which are topics on wh
 Non-persistent topics have names of this form (note the `non-persistent` in the name):
 
 ```http
+
 non-persistent://tenant/namespace/topic
+
 ```
 
-> For more info on using non-persistent topics, see the [Non-persistent messaging cookbook](cookbooks-non-persistent.md).
+> For more info on using non-persistent topics, see the [Non-persistent messaging cookbook](cookbooks-non-persistent).
 
 In non-persistent topics, brokers immediately deliver messages to all connected subscribers *without persisting them* in [BookKeeper](concepts-architecture-overview.md#persistent-storage). If a subscriber is disconnected, the broker will not be able to deliver those in-transit messages, and subscribers will never be able to receive those messages again. Eliminating the persistent storage step makes messaging on non-persistent topics slightly faster than on persistent topics in some cases [...]
 
@@ -454,6 +494,7 @@ Producers and consumers can connect to non-persistent topics in the same way as
 Here's an example [Java consumer](client-libraries-java.md#consumers) for a non-persistent topic:
 
 ```java
+
 PulsarClient client = PulsarClient.builder()
         .serviceUrl("pulsar://localhost:6650")
         .build();
@@ -464,14 +505,17 @@ Consumer<byte[]> consumer = client.newConsumer()
         .topic(npTopic)
         .subscriptionName(subscriptionName)
         .subscribe();
+
 ```
 
 Here's an example [Java producer](client-libraries-java.md#producer) for the same non-persistent topic:
 
 ```java
+
 Producer<byte[]> producer = client.newProducer()
                 .topic(npTopic)
                 .create();
+
 ```
 
 ## Message retention and expiry
@@ -486,7 +530,7 @@ Pulsar has two features, however, that enable you to override this default behav
 * Message **retention** enables you to store messages that have been acknowledged by a consumer
 * Message **expiry** enables you to set a time to live (TTL) for messages that have not yet been acknowledged
 
-> All message retention and expiry is managed at the [namespace](#namespaces) level. For a how-to, see the [Message retention and expiry](cookbooks-retention-expiry.md) cookbook.
+> All message retention and expiry is managed at the [namespace](#namespaces) level. For a how-to, see the [Message retention and expiry](cookbooks-retention-expiry) cookbook.
 
 The diagram below illustrates both concepts:
 
@@ -509,12 +553,12 @@ Message deduplication is disabled in the scenario shown at the top. Here, a prod
 
 In the second scenario at the bottom, the producer publishes message 1, which is received by the broker and persisted, as in the first scenario. When the producer attempts to publish the message again, however, the broker knows that it has already seen message 1 and thus does not persist the message.
 
-> Message deduplication is handled at the namespace level or the topic level. For more instructions, see the [message deduplication cookbook](cookbooks-deduplication.md).
+> Message deduplication is handled at the namespace level or the topic level. For more instructions, see the [message deduplication cookbook](cookbooks-deduplication).
 
 
 ### Producer idempotency
 
-The other available approach to message deduplication is to ensure that each message is *only produced once*. This approach is typically called **producer idempotency**. The drawback of this approach is that it defers the work of message deduplication to the application. In Pulsar, this is handled at the [broker](reference-terminology.md#broker) level, so you do not need to modify your Pulsar client code. Instead, you only need to make administrative changes. For details, see [Managing m [...]
+The other available approach to message deduplication is to ensure that each message is *only produced once*. This approach is typically called **producer idempotency**. The drawback of this approach is that it defers the work of message deduplication to the application. In Pulsar, this is handled at the [broker](reference-terminology.md#broker) level, so you do not need to modify your Pulsar client code. Instead, you only need to make administrative changes. For details, see [Managing m [...]
 
 ### Deduplication and effectively-once semantics
 
@@ -545,11 +589,15 @@ delayedDeliveryEnabled=true
 # affecting the accuracy of the delivery time compared to the scheduled time.
 # Default is 1 second.
 delayedDeliveryTickTimeMillis=1000
+
 ```
 
 ### Producer 
 The following is an example of delayed message delivery for a producer in Java:
+
 ```java
+
 // message to be delivered at the configured delay interval
 producer.newMessage().deliverAfter(3L, TimeUnit.Minute).value("Hello Pulsar!").send();
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-multi-tenancy.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-multi-tenancy.md
index 15c802f..8818e0b 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-multi-tenancy.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-multi-tenancy.md
@@ -5,12 +5,18 @@ sidebar_label: Multi Tenancy
 original_id: concepts-multi-tenancy
 ---
 
-Pulsar was created from the ground up as a multi-tenant system. To support multi-tenancy, Pulsar has a concept of tenants. Tenants can be spread across clusters and can each have their own [authentication and authorization](security-overview.md) scheme applied to them. They are also the administrative unit at which storage quotas, [message TTL](cookbooks-retention-expiry.md#time-to-live-ttl), and isolation policies can be managed.
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
+Pulsar was created from the ground up as a multi-tenant system. To support multi-tenancy, Pulsar has a concept of tenants. Tenants can be spread across clusters and can each have their own [authentication and authorization](security-overview) scheme applied to them. They are also the administrative unit at which storage quotas, [message TTL](cookbooks-retention-expiry.md#time-to-live-ttl), and isolation policies can be managed.
 
 The multi-tenant nature of Pulsar is reflected mostly visibly in topic URLs, which have this structure:
 
 ```http
+
 persistent://tenant/namespace/topic
+
 ```
 
 As you can see, the tenant is the most basic unit of categorization for topics (more fundamental than the namespace and topic name).
@@ -19,7 +25,7 @@ As you can see, the tenant is the most basic unit of categorization for topics (
 
 To each tenant in a Pulsar instance you can assign:
 
-* An [authorization](security-authorization.md) scheme
+* An [authorization](security-authorization) scheme
 * The set of [clusters](reference-terminology.md#cluster) to which the tenant's configuration applies
 
 ## Namespaces
@@ -27,16 +33,18 @@ To each tenant in a Pulsar instance you can assign:
 Tenants and namespaces are two key concepts of Pulsar to support multi-tenancy.
 
 * Pulsar is provisioned for specified tenants with appropriate capacity allocated to the tenant.
-* A namespace is the administrative unit nomenclature within a tenant. The configuration policies set on a namespace apply to all the topics created in that namespace. A tenant may create multiple namespaces via self-administration using the REST API and the [`pulsar-admin`](reference-pulsar-admin.md) CLI tool. For instance, a tenant with different applications can create a separate namespace for each application.
+* A namespace is the administrative unit nomenclature within a tenant. The configuration policies set on a namespace apply to all the topics created in that namespace. A tenant may create multiple namespaces via self-administration using the REST API and the [`pulsar-admin`](reference-pulsar-admin) CLI tool. For instance, a tenant with different applications can create a separate namespace for each application.
 
 Names for topics in the same namespace will look like this:
 
 ```http
+
 persistent://tenant/app1/topic-1
 
 persistent://tenant/app1/topic-2
 
 persistent://tenant/app1/topic-3
+
 ```
 
 ### Namespace change events and topic-level policies
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-multiple-advertised-listeners.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-multiple-advertised-listeners.md
index 8d49182..4e80543 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-multiple-advertised-listeners.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-multiple-advertised-listeners.md
@@ -5,6 +5,10 @@ sidebar_label: Multiple advertised listeners
 original_id: concepts-multiple-advertised-listeners
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 When a Pulsar cluster is deployed in the production environment, it may require to expose multiple advertised addresses for the broker. For example, when you deploy a Pulsar cluster in Kubernetes and want other clients, which are not in the same Kubernetes cluster, to connect to the Pulsar cluster, you need to assign a broker URL to external clients. But clients in the same Kubernetes cluster can still connect to the Pulsar cluster through the internal network of Kubernetes.
 
 ## Advertised listeners
@@ -25,15 +29,19 @@ This example shows how a Pulsar client uses multiple advertised listeners.
 1. Configure multiple advertised listeners in the broker configuration file.
 
 ```shell
+
 advertisedListeners={listenerName}:pulsar://xxxx:6650,
 {listenerName}:pulsar+ssl://xxxx:6651
+
 ```
 
 2. Specify the listener name for the client.
 
 ```java
+
 PulsarClient client = PulsarClient.builder()
     .serviceUrl("pulsar://xxxx:6650")
     .listenerName("external")
     .build();
+
 ```
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-overview.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-overview.md
index a37b11f..71ee9fe 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-overview.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-overview.md
@@ -5,27 +5,31 @@ sidebar_label: Overview
 original_id: concepts-overview
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 Pulsar is a multi-tenant, high-performance solution for server-to-server messaging. Pulsar was originally developed by Yahoo, it is under the stewardship of the [Apache Software Foundation](https://www.apache.org/).
 
 Key features of Pulsar are listed below:
 
-* Native support for multiple clusters in a Pulsar instance, with seamless [geo-replication](administration-geo.md) of messages across clusters.
+* Native support for multiple clusters in a Pulsar instance, with seamless [geo-replication](administration-geo) of messages across clusters.
 * Very low publish and end-to-end latency.
 * Seamless scalability to over a million topics.
-* A simple [client API](concepts-clients.md) with bindings for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md) and [C++](client-libraries-cpp.md).
+* A simple [client API](concepts-clients.md) with bindings for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md) and [C++](client-libraries-cpp).
 * Multiple [subscription modes](concepts-messaging.md#subscription-modes) ([exclusive](concepts-messaging.md#exclusive), [shared](concepts-messaging.md#shared), and [failover](concepts-messaging.md#failover)) for topics.
 * Guaranteed message delivery with [persistent message storage](concepts-architecture-overview.md#persistent-storage) provided by [Apache BookKeeper](http://bookkeeper.apache.org/).
-* A serverless light-weight computing framework [Pulsar Functions](functions-overview.md) offers the capability for stream-native data processing.
-* A serverless connector framework [Pulsar IO](io-overview.md), which is built on Pulsar Functions, makes it easier to move data in and out of Apache Pulsar.
-* [Tiered Storage](concepts-tiered-storage.md) offloads data from hot/warm storage to cold/longterm storage (such as S3 and GCS) when the data is aging out.
+* A serverless light-weight computing framework [Pulsar Functions](functions-overview) offers the capability for stream-native data processing.
+* A serverless connector framework [Pulsar IO](io-overview), which is built on Pulsar Functions, makes it easier to move data in and out of Apache Pulsar.
+* [Tiered Storage](concepts-tiered-storage) offloads data from hot/warm storage to cold/longterm storage (such as S3 and GCS) when the data is aging out.
 
 ## Contents
 
-- [Messaging Concepts](concepts-messaging.md)
-- [Architecture Overview](concepts-architecture-overview.md)
-- [Pulsar Clients](concepts-clients.md)
-- [Geo Replication](concepts-replication.md)
-- [Multi Tenancy](concepts-multi-tenancy.md)
-- [Authentication and Authorization](concepts-authentication.md)
-- [Topic Compaction](concepts-topic-compaction.md)
-- [Tiered Storage](concepts-tiered-storage.md)
+- [Messaging Concepts](concepts-messaging)
+- [Architecture Overview](concepts-architecture-overview)
+- [Pulsar Clients](concepts-clients)
+- [Geo Replication](concepts-replication)
+- [Multi Tenancy](concepts-multi-tenancy)
+- [Authentication and Authorization](concepts-authentication)
+- [Topic Compaction](concepts-topic-compaction)
+- [Tiered Storage](concepts-tiered-storage)
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-proxy-sni-routing.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-proxy-sni-routing.md
index 419ff6d..97fc00c 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-proxy-sni-routing.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-proxy-sni-routing.md
@@ -5,6 +5,10 @@ sidebar_label: Proxy support with SNI routing
 original_id: concepts-proxy-sni-routing
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 A proxy server is an intermediary server that forwards requests from multiple clients to different servers across the Internet. The proxy server acts as a "traffic cop" in both forward and reverse proxy scenarios, and benefits your system such as load balancing, performance, security, auto-scaling, and so on.
 
 The proxy in Pulsar acts as a reverse proxy, and creates a gateway in front of brokers. Proxies such as Apache Traffic Server (ATS), HAProxy, Nginx, and Envoy are not supported in Pulsar. These proxy-servers support **SNI routing**. SNI routing is used to route traffic to a destination without terminating the SSL connection. Layer 4 routing provides greater transparency because the outbound connection is determined by examining the destination address in the client TCP packets.
@@ -42,6 +46,7 @@ CONFIG proxy.config.ssl.client.cert.filename STRING /proxy-key.pem
 
 # The range of origin server ports that can be used for tunneling via CONNECT. # Traffic Server allows tunnels only to the specified ports. Supports both wildcards (*) and ranges (e.g. 0-1023).
 CONFIG proxy.config.http.connect_ports STRING 4443 6651
+
 ```
 
 The [ssl_server_name](https://docs.trafficserver.apache.org/en/8.0.x/admin-guide/files/ssl_server_name.yaml.en.html) file is used to configure TLS connection handling for inbound and outbound connections. The configuration is determined by the SNI values provided by the inbound connection. The file consists of a set of configuration items, and each is identified by an SNI value (`fqdn`). When an inbound TLS connection is made, the SNI value from the TLS negotiation is matched with the it [...]
@@ -66,6 +71,7 @@ server_config = {
      tunnel_route = 'pulsar-broker2:6651'
   },
 }
+
 ```
 
 After you configure the `ssl_server_name.config` and `records.config` files, the ATS-proxy server handles SNI routing and creates TCP tunnel between the client and the broker.
@@ -73,11 +79,27 @@ After you configure the `ssl_server_name.config` and `records.config` files, the
 ### Configure Pulsar-client with SNI routing
 ATS SNI-routing works only with TLS. You need to enable TLS for the ATS proxy and brokers first, configure the SNI routing protocol, and then connect Pulsar clients to brokers through ATS proxy. Pulsar clients support SNI routing by connecting to the proxy, and sending the target broker URL to the SNI header. This process is processed internally. You only need to configure the following proxy configuration initially when you create a Pulsar client to use the SNI routing protocol.
 
-<!--DOCUSAURUS_CODE_TABS-->
+<Tabs 
+  defaultValue="Java"
+  values={[
+  {
+    "label": "Java",
+    "value": "Java"
+  },
+  {
+    "label": "C++",
+    "value": "C++"
+  },
+  {
+    "label": "Python",
+    "value": "Python"
+  }
+]}>
 
-<!--Java-->
+<TabItem value="Java">
 
 ```java
+
 String brokerServiceUrl = “pulsar+ssl://pulsar-broker-vip:6651/”;
 String proxyUrl = “pulsar+ssl://ats-proxy:443”;
 ClientBuilder clientBuilder = PulsarClient.builder()
@@ -88,15 +110,17 @@ ClientBuilder clientBuilder = PulsarClient.builder()
         .proxyServiceUrl(proxyUrl, ProxyProtocol.SNI)
         .operationTimeout(1000, TimeUnit.MILLISECONDS);
 
-Map<String, String> authParams = new HashMap<>();
+Map<String, String> authParams = new HashMap();
 authParams.put("tlsCertFile", TLS_CLIENT_CERT_FILE_PATH);
 authParams.put("tlsKeyFile", TLS_CLIENT_KEY_FILE_PATH);
 clientBuilder.authentication(AuthenticationTls.class.getName(), authParams);
 
 PulsarClient pulsarClient = clientBuilder.build();
+
 ```
 
-<!--C++-->
+</TabItem>
+<TabItem value="C++">
 
 ```c++
 ClientConfiguration config = ClientConfiguration();
@@ -107,11 +131,14 @@ config.setAuth(pulsar::AuthTls::create(
             "/path/to/client-cert.pem", "/path/to/client-key.pem"););
 
 Client client("pulsar+ssl://ats-proxy:443", config);
+
 ```
 
-<!--Python-->
+</TabItem>
+<TabItem value="Python">
 
 ```python
+
 from pulsar import Client, AuthenticationTLS
 
 auth = AuthenticationTLS("/path/to/my-role.cert.pem", "/path/to/my-role.key-pk8.pem")
@@ -119,9 +146,12 @@ client = Client("pulsar+ssl://ats-proxy:443",
                 tls_trust_certs_file_path="/path/to/ca.cert.pem",
                 tls_allow_insecure_connection=False,
                 authentication=auth)
+
 ```
 
-<!--END_DOCUSAURUS_CODE_TABS-->
+</TabItem>
+
+</Tabs>
 
 ### Pulsar geo-replication with SNI routing
 You can use the ATS proxy for geo-replication. Pulsar brokers can connect to brokers in geo-replication by using SNI routing. To enable SNI routing for broker connection cross clusters, you need to configure SNI proxy URL to the cluster metadata. If you have configured SNI proxy URL in the cluster metadata, you can connect to broker cross clusters through the proxy over SNI routing.
@@ -138,6 +168,7 @@ In this example, a Pulsar cluster is deployed into two separate regions, `us-wes
 --url http://east-broker-vip:8080 \
 --proxy-protocol SNI \
 --proxy-url pulsar+ssl://east-ats-proxy:443
+
 ```
 
 (b) Configure the cluster metadata for `us-west` with `us-west` broker service URL and `us-west` ATS proxy URL with SNI proxy-protocol.
@@ -148,4 +179,5 @@ In this example, a Pulsar cluster is deployed into two separate regions, `us-wes
 --url http://west-broker-vip:8080 \
 --proxy-protocol SNI \
 --proxy-url pulsar+ssl://west-ats-proxy:443
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-replication.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-replication.md
index 09f16e4..fb76f6e 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-replication.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-replication.md
@@ -5,5 +5,9 @@ sidebar_label: Geo Replication
 original_id: concepts-replication
 ---
 
-Pulsar enables messages to be produced and consumed in different geo-locations. For instance, your application may be publishing data in one region or market and you would like to process it for consumption in other regions or markets. [Geo-replication](administration-geo.md) in Pulsar enables you to do that.
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
+Pulsar enables messages to be produced and consumed in different geo-locations. For instance, your application may be publishing data in one region or market and you would like to process it for consumption in other regions or markets. [Geo-replication](administration-geo) in Pulsar enables you to do that.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-tiered-storage.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-tiered-storage.md
index c00f109..61a9859 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-tiered-storage.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-tiered-storage.md
@@ -5,6 +5,10 @@ sidebar_label: Tiered Storage
 original_id: concepts-tiered-storage
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 Pulsar's segment oriented architecture allows for topic backlogs to grow very large, effectively without limit. However, this can become expensive over time.
 
 One way to alleviate this cost is to use Tiered Storage. With tiered storage, older messages in the backlog can be moved from BookKeeper to a cheaper storage mechanism, while still allowing clients to access the backlog as if nothing had changed.
@@ -15,4 +19,4 @@ One way to alleviate this cost is to use Tiered Storage. With tiered storage, ol
 
 Pulsar currently supports S3, Google Cloud Storage (GCS), and filesystem for [long term store](https://pulsar.apache.org/docs/en/cookbooks-tiered-storage/). Offloading to long term storage triggered via a Rest API or command line interface. The user passes in the amount of topic data they wish to retain on BookKeeper, and the broker will copy the backlog data to long term storage. The original data will then be deleted from BookKeeper after a configured delay (4 hours by default).
 
-> For a guide for setting up tiered storage, see the [Tiered storage cookbook](cookbooks-tiered-storage.md).
+> For a guide for setting up tiered storage, see the [Tiered storage cookbook](cookbooks-tiered-storage).
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-topic-compaction.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-topic-compaction.md
index 3aca60f..53975e2 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-topic-compaction.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-topic-compaction.md
@@ -5,9 +5,13 @@ sidebar_label: Topic Compaction
 original_id: concepts-topic-compaction
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 Pulsar was built with highly scalable [persistent storage](concepts-architecture-overview.md#persistent-storage) of message data as a primary objective. Pulsar topics enable you to persistently store as many unacknowledged messages as you need while preserving message ordering. By default, Pulsar stores *all* unacknowledged/unprocessed messages produced on a topic. Accumulating many unacknowledged messages on a topic is necessary for many Pulsar use cases but it can also be very time int [...]
 
-> For a more practical guide to topic compaction, see the [Topic compaction cookbook](cookbooks-compaction.md).
+> For a more practical guide to topic compaction, see the [Topic compaction cookbook](cookbooks-compaction).
 
 For some use cases consumers don't need a complete "image" of the topic log. They may only need a few values to construct a more "shallow" image of the log, perhaps even just the most recent value. For these kinds of use cases Pulsar offers **topic compaction**. When you run compaction on a topic, Pulsar goes through a topic's backlog and removes messages that are *obscured* by later messages, i.e. it goes through the topic on a per-key basis and leaves only the most recent message assoc [...]
 
@@ -15,7 +19,7 @@ Pulsar's topic compaction feature:
 
 * Allows for faster "rewind" through topic logs
 * Applies only to [persistent topics](concepts-architecture-overview.md#persistent-storage)
-* Triggered automatically when the backlog reaches a certain size or can be triggered manually via the command line. See the [Topic compaction cookbook](cookbooks-compaction.md)
+* Triggered automatically when the backlog reaches a certain size or can be triggered manually via the command line. See the [Topic compaction cookbook](cookbooks-compaction)
 * Is conceptually and operationally distinct from [retention and expiry](concepts-messaging.md#message-retention-and-expiry). Topic compaction *does*, however, respect retention. If retention has removed a message from the message backlog of a topic, the message will also not be readable from the compacted topic ledger.
 
 > #### Topic compaction example: the stock ticker
@@ -24,7 +28,7 @@ Pulsar's topic compaction feature:
 
 ## How topic compaction works
 
-When topic compaction is triggered [via the CLI](cookbooks-compaction.md), Pulsar will iterate over the entire topic from beginning to end. For each key that it encounters the compaction routine will keep a record of the latest occurrence of that key.
+When topic compaction is triggered [via the CLI](cookbooks-compaction), Pulsar will iterate over the entire topic from beginning to end. For each key that it encounters the compaction routine will keep a record of the latest occurrence of that key.
 
 After that, the broker will create a new [BookKeeper ledger](concepts-architecture-overview.md#ledgers) and make a second iteration through each message on the topic. For each message, if the key matches the latest occurrence of that key, then the key's data payload, message ID, and metadata will be written to the newly created ledger. If the key doesn't match the latest then the message will be skipped and left alone. If any given message has an empty payload, it will be skipped and con [...]
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/concepts-transactions.md b/site2/website-next/versioned_docs/version-2.8.0/concepts-transactions.md
index 12a32e8..c0297e1 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/concepts-transactions.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/concepts-transactions.md
@@ -5,6 +5,10 @@ sidebar_label: Overview
 original_id: transactions
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 Transactional semantics enable event streaming applications to consume, process, and produce messages in one atomic operation. In Pulsar, a producer or consumer can work with messages across multiple topics and partitions and ensure those messages are processed as a single unit. 
 
 The following concepts help you understand Pulsar transactions.
diff --git a/site2/website-next/versioned_docs/version-2.8.0/deploy-aws.md b/site2/website-next/versioned_docs/version-2.8.0/deploy-aws.md
index b554ab0..8b5b4c9 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/deploy-aws.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/deploy-aws.md
@@ -9,7 +9,7 @@ import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
 
-> For instructions on deploying a single Pulsar cluster manually rather than using Terraform and Ansible, see [Deploying a Pulsar cluster on bare metal](deploy-bare-metal.md). For instructions on manually deploying a multi-cluster Pulsar instance, see [Deploying a Pulsar instance on bare metal](deploy-bare-metal-multi-cluster.md).
+> For instructions on deploying a single Pulsar cluster manually rather than using Terraform and Ansible, see [Deploying a Pulsar cluster on bare metal](deploy-bare-metal.md). For instructions on manually deploying a multi-cluster Pulsar instance, see [Deploying a Pulsar instance on bare metal](deploy-bare-metal-multi-cluster).
 
 One of the easiest ways to get a Pulsar [cluster](reference-terminology.md#cluster) running on [Amazon Web Services](https://aws.amazon.com/) (AWS) is to use the [Terraform](https://terraform.io) infrastructure provisioning tool and the [Ansible](https://www.ansible.com) server automation tool. Terraform can create the resources necessary for running the Pulsar cluster---[EC2](https://aws.amazon.com/ec2/) instances, networking and security infrastructure, etc.---While Ansible can install [...]
 
@@ -24,7 +24,9 @@ In order to install a Pulsar cluster on AWS using Terraform and Ansible, you nee
 You also need to make sure that you are currently logged into your AWS account via the `aws` tool:
 
 ```bash
+
 $ aws configure
+
 ```
 
 ## Installation
@@ -32,7 +34,9 @@ $ aws configure
 You can install Ansible on Linux or macOS using pip.
 
 ```bash
+
 $ pip install ansible
+
 ```
 
 You can install Terraform using the instructions [here](https://www.terraform.io/intro/getting-started/install.html).
@@ -40,8 +44,10 @@ You can install Terraform using the instructions [here](https://www.terraform.io
 You also need to have the Terraform and Ansible configuration for Pulsar locally on your machine. You can find them in the [GitHub repository](https://github.com/apache/pulsar) of Pulsar, which you can fetch using Git commands:
 
 ```bash
+
 $ git clone https://github.com/apache/pulsar
 $ cd pulsar/deployment/terraform-ansible/aws
+
 ```
 
 ## SSH setup
@@ -55,26 +61,32 @@ $ cd pulsar/deployment/terraform-ansible/aws
 > 1. update `ansible.cfg` with following values:
 >
 > ```shell
+>
 > private_key_file=~/.ssh/pulsar_aws
 > ```
 >
 > 2. update `terraform.tfvars` with following values:
 >
 > ```shell
+>
 > public_key_path=~/.ssh/pulsar_aws.pub
 > ```
 
 In order to create the necessary AWS resources using Terraform, you need to create an SSH key. Enter the following commands to create a private SSH key in `~/.ssh/id_rsa` and a public key in `~/.ssh/id_rsa.pub`:
 
 ```bash
+
 $ ssh-keygen -t rsa
+
 ```
 
 Do *not* enter a passphrase (hit **Enter** instead when the prompt comes out). Enter the following command to verify that a key has been created:
 
 ```bash
+
 $ ls ~/.ssh
 id_rsa               id_rsa.pub
+
 ```
 
 ## Create AWS resources using Terraform
@@ -82,24 +94,30 @@ id_rsa               id_rsa.pub
 To start building AWS resources with Terraform, you need to install all Terraform dependencies. Enter the following command:
 
 ```bash
+
 $ terraform init
 # This will create a .terraform folder
+
 ```
 
 After that, you can apply the default Terraform configuration by entering this command:
 
 ```bash
+
 $ terraform apply
+
 ```
 
 Then you see this prompt below:
 
 ```bash
+
 Do you want to perform these actions?
   Terraform will perform the actions described above.
   Only 'yes' will be accepted to approve.
 
   Enter a value:
+
 ```
 
 Type `yes` and hit **Enter**. Applying the configuration could take several minutes. When the configuration applying finishes, you can see `Apply complete!` along with some other information, including the number of resources created.
@@ -144,12 +162,15 @@ When you apply the Terraform configuration by entering the command `terraform ap
 
 ```
 pulsar://pulsar-elb-1800761694.us-west-2.elb.amazonaws.com:6650
+
 ```
 
 You can fetch that value at any time by entering the command `terraform output pulsar_service_url` or parsing the `terraform.tstate` file (which is JSON, even though the filename does not reflect that):
 
 ```bash
+
 $ cat terraform.tfstate | jq .modules[0].outputs.pulsar_service_url.value
+
 ```
 
 ### Destroy your cluster
@@ -157,7 +178,9 @@ $ cat terraform.tfstate | jq .modules[0].outputs.pulsar_service_url.value
 At any point, you can destroy all AWS resources associated with your cluster using Terraform's `destroy` command:
 
 ```bash
+
 $ terraform destroy
+
 ```
 
 ## Setup Disks
@@ -167,10 +190,12 @@ Before you run the Pulsar playbook, you need to mount the disks to the correct d
 To setup disks on bookie nodes, enter this command:
 
 ```bash
+
 $ ansible-playbook \
   --user='ec2-user' \
   --inventory=`which terraform-inventory` \
   setup-disk.yaml
+
 ```
 
 After that, the disks is mounted under `/mnt/journal` as journal disk, and `/mnt/storage` as ledger disk.
@@ -180,25 +205,29 @@ Remember to enter this command just only once. If you attempt to enter this comm
 
 Once you have created the necessary AWS resources using Terraform, you can install and run Pulsar on the Terraform-created EC2 instances using Ansible. 
 
-(Optional) If you want to use any [built-in IO connectors](io-connectors.md) , edit the `Download Pulsar IO packages` task in the `deploy-pulsar.yaml` file and uncomment the connectors you want to use. 
+(Optional) If you want to use any [built-in IO connectors](io-connectors) , edit the `Download Pulsar IO packages` task in the `deploy-pulsar.yaml` file and uncomment the connectors you want to use. 
 
 To run the playbook, enter this command:
 
 ```bash
+
 $ ansible-playbook \
   --user='ec2-user' \
   --inventory=`which terraform-inventory` \
   ../deploy-pulsar.yaml
+
 ```
 
 If you have created a private SSH key at a location different from `~/.ssh/id_rsa`, you can specify the different location using the `--private-key` flag in the following command:
 
 ```bash
+
 $ ansible-playbook \
   --user='ec2-user' \
   --inventory=`which terraform-inventory` \
   --private-key="~/.ssh/some-non-default-key" \
   ../deploy-pulsar.yaml
+
 ```
 
 ## Access the cluster
@@ -208,24 +237,30 @@ You can now access your running Pulsar using the unique Pulsar connection URL fo
 For a quick demonstration of accessing the cluster, we can use the Python client for Pulsar and the Python shell. First, install the Pulsar Python module using pip:
 
 ```bash
+
 $ pip install pulsar-client
+
 ```
 
 Now, open up the Python shell using the `python` command:
 
 ```bash
+
 $ python
+
 ```
 
 Once you are in the shell, enter the following command:
 
 ```python
+
 >>> import pulsar
 >>> client = pulsar.Client('pulsar://pulsar-elb-1800761694.us-west-2.elb.amazonaws.com:6650')
 # Make sure to use your connection URL
 >>> producer = client.create_producer('persistent://public/default/test-topic')
 >>> producer.send('Hello world')
 >>> client.close()
+
 ```
 
 If all of these commands are successful, Pulsar clients can now use your cluster!
diff --git a/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal-multi-cluster.md b/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal-multi-cluster.md
index c924352..f62b81e 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal-multi-cluster.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal-multi-cluster.md
@@ -13,17 +13,17 @@ import TabItem from '@theme/TabItem';
 >
 > 1. Single-cluster Pulsar installations should be sufficient for all but the most ambitious use cases. If you are interested in experimenting with
 > Pulsar or using it in a startup or on a single team, you had better opt for a single cluster. For instructions on deploying a single cluster,
-> see the guide [here](deploy-bare-metal.md).
+> see the guide [here](deploy-bare-metal).
 >
-> 2. If you want to use all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you need to download `apache-pulsar-io-connectors`
+> 2. If you want to use all builtin [Pulsar IO](io-overview) connectors in your Pulsar deployment, you need to download `apache-pulsar-io-connectors`
 > package and install `apache-pulsar-io-connectors` under `connectors` directory in the pulsar directory on every broker node or on every function-worker node if you
-> run a separate cluster of function workers for [Pulsar Functions](functions-overview.md).
+> run a separate cluster of function workers for [Pulsar Functions](functions-overview).
 >
-> 3. If you want to use [Tiered Storage](concepts-tiered-storage.md) feature in your Pulsar deployment, you need to download `apache-pulsar-offloaders`
+> 3. If you want to use [Tiered Storage](concepts-tiered-storage) feature in your Pulsar deployment, you need to download `apache-pulsar-offloaders`
 > package and install `apache-pulsar-offloaders` under `offloaders` directory in the pulsar directory on every broker node. For more details of how to configure
-> this feature, you can refer to the [Tiered storage cookbook](cookbooks-tiered-storage.md).
+> this feature, you can refer to the [Tiered storage cookbook](cookbooks-tiered-storage).
 
-A Pulsar *instance* consists of multiple Pulsar clusters working in unison. You can distribute clusters across data centers or geographical regions and replicate the clusters amongst themselves using [geo-replication](administration-geo.md). Deploying a multi-cluster Pulsar instance involves the following basic steps:
+A Pulsar *instance* consists of multiple Pulsar clusters working in unison. You can distribute clusters across data centers or geographical regions and replicate the clusters amongst themselves using [geo-replication](administration-geo). Deploying a multi-cluster Pulsar instance involves the following basic steps:
 
 * Deploying two separate [ZooKeeper](#deploy-zookeeper) quorums: a [local](#deploy-local-zookeeper) quorum for each cluster in the instance and a [configuration store](#configuration-store) quorum for instance-wide tasks
 * Initializing [cluster metadata](#cluster-metadata-initialization) for each cluster
@@ -33,7 +33,7 @@ A Pulsar *instance* consists of multiple Pulsar clusters working in unison. You
 If you want to deploy a single Pulsar cluster, see [Clusters and Brokers](getting-started-standalone.md#start-the-cluster).
 
 > #### Run Pulsar locally or on Kubernetes?
-> This guide shows you how to deploy Pulsar in production in a non-Kubernetes environment. If you want to run a standalone Pulsar cluster on a single machine for development purposes, see the [Setting up a local cluster](getting-started-standalone.md) guide. If you want to run Pulsar on [Kubernetes](https://kubernetes.io), see the [Pulsar on Kubernetes](deploy-kubernetes.md) guide, which includes sections on running Pulsar on Kubernetes on [Google Kubernetes Engine](deploy-kubernetes#pul [...]
+> This guide shows you how to deploy Pulsar in production in a non-Kubernetes environment. If you want to run a standalone Pulsar cluster on a single machine for development purposes, see the [Setting up a local cluster](getting-started-standalone.md) guide. If you want to run Pulsar on [Kubernetes](https://kubernetes.io), see the [Pulsar on Kubernetes](deploy-kubernetes) guide, which includes sections on running Pulsar on Kubernetes on [Google Kubernetes Engine](deploy-kubernetes#pulsar [...]
 
 ## System requirement
 
@@ -59,14 +59,18 @@ To get started running Pulsar, download a binary tarball release in one of the f
 * using [wget](https://www.gnu.org/software/wget):
 
   ```shell
+
   $ wget 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=pulsar/pulsar-@pulsar:version@/apache-pulsar-@pulsar:version@-bin.tar.gz' -O apache-pulsar-@pulsar:version@-bin.tar.gz
+
   ```
 
 Once you download the tarball, untar it and `cd` into the resulting directory:
 
 ```bash
+
 $ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
 $ cd apache-pulsar-@pulsar:version@
+
 ```
 
 ## What your package contains
@@ -75,9 +79,9 @@ The Pulsar binary package initially contains the following directories:
 
 Directory | Contains
 :---------|:--------
-`bin` | [Command-line tools](reference-cli-tools.md) of Pulsar, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/)
+`bin` | [Command-line tools](reference-cli-tools) of Pulsar, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/)
 `conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
-`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview.md)
+`examples` | A Java JAR file containing example [Pulsar Functions](functions-overview)
 `lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files that Pulsar uses 
 `licenses` | License files, in `.txt` form, for various components of the Pulsar codebase
 
@@ -86,7 +90,7 @@ The following directories are created once you begin running Pulsar:
 Directory | Contains
 :---------|:--------
 `data` | The data storage directory that ZooKeeper and BookKeeper use
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md)
+`instances` | Artifacts created for [Pulsar Functions](functions-overview)
 `logs` | Logs that the installation creates
 
 
@@ -109,9 +113,11 @@ You need to stand up one local ZooKeeper cluster *per Pulsar cluster* for deploy
 To begin, add all ZooKeeper servers to the quorum configuration specified in the [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) file. Add a `server.N` line for each node in the cluster to the configuration, where `N` is the number of the ZooKeeper node. The following is an example for a three-node cluster:
 
 ```properties
+
 server.1=zk1.us-west.example.com:2888:3888
 server.2=zk2.us-west.example.com:2888:3888
 server.3=zk3.us-west.example.com:2888:3888
+
 ```
 
 On each host, you need to specify the ID of the node in the `myid` file of each node, which is in `data/zookeeper` folder of each server by default (you can change the file location via the [`dataDir`](reference-configuration.md#zookeeper-dataDir) parameter).
@@ -121,8 +127,10 @@ On each host, you need to specify the ID of the node in the `myid` file of each
 On a ZooKeeper server at `zk1.us-west.example.com`, for example, you could set the `myid` value like this:
 
 ```shell
+
 $ mkdir -p data/zookeeper
 $ echo 1 > data/zookeeper/myid
+
 ```
 
 On `zk2.us-west.example.com` the command looks like `echo 2 > data/zookeeper/myid` and so on.
@@ -130,7 +138,9 @@ On `zk2.us-west.example.com` the command looks like `echo 2 > data/zookeeper/myi
 Once you add each server to the `zookeeper.conf` configuration and each server has the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```shell
+
 $ bin/pulsar-daemon start zookeeper
+
 ```
 
 ### Deploy the configuration store 
@@ -143,13 +153,15 @@ If you deploy a [single-cluster](#single-cluster-pulsar-instance) instance, you
 
 If your Pulsar instance consists of just one cluster, then you can deploy a configuration store on the same machines as the local ZooKeeper quorum but run on different TCP ports.
 
-To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorom uses to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
+To deploy a ZooKeeper configuration store in a single-cluster instance, add the same ZooKeeper servers that the local quorum uses to the configuration file in [`conf/global_zookeeper.conf`](reference-configuration.md#configuration-store) using the same method for [local ZooKeeper](#local-zookeeper), but make sure to use a different port (2181 is the default for ZooKeeper). The following is an example that uses port 2184 for a three-node ZooKeeper cluster:
 
 ```properties
+
 clientPort=2184
 server.1=zk1.us-west.example.com:2185:2186
 server.2=zk2.us-west.example.com:2185:2186
 server.3=zk3.us-west.example.com:2185:2186
+
 ```
 
 As before, create the `myid` files for each server on `data/global-zookeeper/myid`.
@@ -168,6 +180,7 @@ For example, assume a Pulsar instance with the following clusters `us-west`,
 
 ```
 zk[1-3].${CLUSTER}.example.com
+
 ```
 
 In this scenario if you want to pick the quorum participants from few clusters and
@@ -178,6 +191,7 @@ This method guarantees that writes to configuration store is possible even if on
 The ZK configuration in all the servers looks like:
 
 ```properties
+
 clientPort=2184
 server.1=zk1.us-west.example.com:2185:2186
 server.2=zk2.us-west.example.com:2185:2186
@@ -194,12 +208,15 @@ server.12=zk3.eu-central.example.com:2185:2186:observer
 server.13=zk1.ap-south.example.com:2185:2186:observer
 server.14=zk2.ap-south.example.com:2185:2186:observer
 server.15=zk3.ap-south.example.com:2185:2186:observer
+
 ```
 
 Additionally, ZK observers need to have the following parameters:
 
 ```properties
+
 peerType=observer
+
 ```
 
 ##### Start the service
@@ -207,7 +224,9 @@ peerType=observer
 Once your configuration store configuration is in place, you can start up the service using [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon)
 
 ```shell
+
 $ bin/pulsar-daemon start configuration-store
+
 ```
 
 ## Cluster metadata initialization
@@ -217,6 +236,7 @@ Once you set up the cluster-specific ZooKeeper and configuration store quorums f
 You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. The following is an example:
 
 ```shell
+
 $ bin/pulsar initialize-cluster-metadata \
   --cluster us-west \
   --zookeeper zk1.us-west.example.com:2181 \
@@ -225,6 +245,7 @@ $ bin/pulsar initialize-cluster-metadata \
   --web-service-url-tls https://pulsar.us-west.example.com:8443/ \
   --broker-service-url pulsar://pulsar.us-west.example.com:6650/ \
   --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651/
+
 ```
 
 As you can see from the example above, you need to specify the following:
@@ -235,7 +256,7 @@ As you can see from the example above, you need to specify the following:
 * The web service URL for the cluster
 * A broker service URL enabling interaction with the [brokers](reference-terminology.md#broker) in the cluster
 
-If you use [TLS](security-tls-transport.md), you also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster.
+If you use [TLS](security-tls-transport), you also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster.
 
 Make sure to run `initialize-cluster-metadata` for each cluster in your instance.
 
@@ -256,12 +277,17 @@ You can start a bookie in two ways: in the foreground or as a background daemon.
 To start a bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```bash
+
 $ bin/pulsar-daemon start bookie
+
 ```
 
 You can verify that the bookie works properly using the `bookiesanity` command for the [BookKeeper shell](reference-cli-tools.md#bookkeeper-shell):
+
 ```shell
+
 $ bin/bookkeeper shell bookiesanity
+
 ```
 
 This command creates a new ledger on the local bookie, writes a few entries, reads them back and finally deletes the ledger.
@@ -269,7 +295,9 @@ This command creates a new ledger on the local bookie, writes a few entries, rea
 After you have started all bookies, you can use the `simpletest` command for [BookKeeper shell](reference-cli-tools.md#shell) on any bookie node, to verify that all bookies in the cluster are running.
 
 ```bash
+
 $ bin/bookkeeper shell simpletest --ensemble <num-bookies> --writeQuorum <num-bookies> --ackQuorum <num-bookies> --numEntries <num-entries>
+
 ```
 
 Bookie hosts are responsible for storing message data on disk. In order for bookies to provide optimal performance, having a suitable hardware configuration is essential for the bookies. The following are key dimensions for bookie hardware capacity.
@@ -300,6 +328,7 @@ You also need to specify the name of the [cluster](reference-terminology.md#clus
 The following is an example configuration:
 
 ```properties
+
 # Local ZooKeeper servers
 zookeeperServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
 
@@ -319,6 +348,7 @@ webServicePort=8080
 
 # Port to use to server HTTPS request
 webServicePortTls=8443
+
 ```
 
 ### Broker hardware
@@ -330,20 +360,24 @@ Pulsar brokers do not require any special hardware since they do not use the loc
 You can start a broker in the background by using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```shell
+
 $ bin/pulsar-daemon start broker
+
 ```
 
 You can also start brokers in the foreground by using [`pulsar broker`](reference-cli-tools.md#broker):
 
 ```shell
+
 $ bin/pulsar broker
+
 ```
 
 ## Service discovery
 
-[Clients](getting-started-clients.md) connecting to Pulsar brokers need to be able to communicate with an entire Pulsar instance using a single URL. Pulsar provides a built-in service discovery mechanism that you can set up using the instructions [immediately below](#service-discovery-setup).
+[Clients](getting-started-clients) connecting to Pulsar brokers need to be able to communicate with an entire Pulsar instance using a single URL. Pulsar provides a built-in service discovery mechanism that you can set up using the instructions [immediately below](#service-discovery-setup).
 
-You can also use your own service discovery system if you want. If you use your own system, you only need to satisfy just one requirement: when a client performs an HTTP request to an [endpoint](reference-configuration.md) for a Pulsar cluster, such as `http://pulsar.us-west.example.com:8080`, the client needs to be redirected to *some* active broker in the desired cluster, whether via DNS, an HTTP or IP redirect, or some other means.
+You can also use your own service discovery system if you want. If you use your own system, you only need to satisfy just one requirement: when a client performs an HTTP request to an [endpoint](reference-configuration) for a Pulsar cluster, such as `http://pulsar.us-west.example.com:8080`, the client needs to be redirected to *some* active broker in the desired cluster, whether via DNS, an HTTP or IP redirect, or some other means.
 
 > #### Service discovery already provided by many scheduling systems
 > Many large-scale deployment systems, such as [Kubernetes](deploy-kubernetes), have service discovery systems built in. If you run Pulsar on such a system, you may not need to provide your own service discovery mechanism.
@@ -351,33 +385,39 @@ You can also use your own service discovery system if you want. If you use your
 
 ### Service discovery setup
 
-The service discovery mechanism that included with Pulsar maintains a list of active brokers, which stored in ZooKeeper, and supports lookup using HTTP and also the [binary protocol](developing-binary-protocol.md) of Pulsar.
+The service discovery mechanism that included with Pulsar maintains a list of active brokers, which stored in ZooKeeper, and supports lookup using HTTP and also the [binary protocol](developing-binary-protocol) of Pulsar.
 
 To get started setting up the built-in service of discovery of Pulsar, you need to change a few parameters in the [`conf/discovery.conf`](reference-configuration.md#service-discovery) configuration file. Set the [`zookeeperServers`](reference-configuration.md#service-discovery-zookeeperServers) parameter to the ZooKeeper quorum connection string of the cluster and the [`configurationStoreServers`](reference-configuration.md#service-discovery-configurationStoreServers) setting to the [con [...]
 store](reference-terminology.md#configuration-store) quorum connection string.
 
 ```properties
+
 # Zookeeper quorum connection string
 zookeeperServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
 
 # Global configuration store connection string
 configurationStoreServers=zk1.us-west.example.com:2184,zk2.us-west.example.com:2184,zk3.us-west.example.com:2184
+
 ```
 
 To start the discovery service:
 
 ```shell
+
 $ bin/pulsar-daemon start discovery
+
 ```
 
 ## Admin client and verification
 
-At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as [administrative clients](admin-api-overview.md) for each cluster. You can use the [`conf/client.conf`](reference-configuration.md#client) configuration file to configure admin clients.
+At this point your Pulsar instance should be ready to use. You can now configure client machines that can serve as [administrative clients](admin-api-overview) for each cluster. You can use the [`conf/client.conf`](reference-configuration.md#client) configuration file to configure admin clients.
 
 The most important thing is that you point the [`serviceUrl`](reference-configuration.md#client-serviceUrl) parameter to the correct service URL for the cluster:
 
 ```properties
+
 serviceUrl=http://pulsar.us-west.example.com:8080/
+
 ```
 
 ## Provision new tenants
@@ -388,9 +428,11 @@ Pulsar is built as a fundamentally multi-tenant system.
 If a new tenant wants to use the system, you need to create a new one. You can create a new tenant by using the [`pulsar-admin`](reference-pulsar-admin.md#tenants) CLI tool:
 
 ```shell
+
 $ bin/pulsar-admin tenants create test-tenant \
   --allowed-clusters us-west \
   --admin-roles test-admin-role
+
 ```
 
 In this command, users who identify with `test-admin-role` role can administer the configuration for the `test-tenant` tenant. The `test-tenant` tenant can only use the `us-west` cluster. From now on, this tenant can manage its resources.
@@ -401,7 +443,9 @@ Once you create a tenant, you need to create [namespaces](reference-terminology.
 The first step is to create a namespace. A namespace is an administrative unit that can contain many topics. A common practice is to create a namespace for each different use case from a single tenant.
 
 ```shell
+
 $ bin/pulsar-admin namespaces create test-tenant/ns1
+
 ```
 
 ##### Test producer and consumer
@@ -415,23 +459,31 @@ You can use a topic in the namespace that you have just created. Topics are auto
 The topic name in this case could be:
 
 ```http
+
 persistent://test-tenant/ns1/my-topic
+
 ```
 
 Start a consumer that creates a subscription on the topic and waits for messages:
 
 ```shell
+
 $ bin/pulsar-perf consume persistent://test-tenant/ns1/my-topic
+
 ```
 
 Start a producer that publishes messages at a fixed rate and reports stats every 10 seconds:
 
 ```shell
+
 $ bin/pulsar-perf produce persistent://test-tenant/ns1/my-topic
+
 ```
 
 To report the topic stats:
 
 ```shell
+
 $ bin/pulsar-admin topics stats persistent://test-tenant/ns1/my-topic
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal.md b/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal.md
index 35fdfe4..0f3111c 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/deploy-bare-metal.md
@@ -14,15 +14,15 @@ import TabItem from '@theme/TabItem';
 >
 > 1. Single-cluster Pulsar installations should be sufficient for all but the most ambitious use cases. If you are interested in experimenting with
 > Pulsar or using Pulsar in a startup or on a single team, it is simplest to opt for a single cluster. If you do need to run a multi-cluster Pulsar instance,
-> see the guide [here](deploy-bare-metal-multi-cluster.md).
+> see the guide [here](deploy-bare-metal-multi-cluster).
 >
-> 2. If you want to use all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you need to download `apache-pulsar-io-connectors`
+> 2. If you want to use all builtin [Pulsar IO](io-overview) connectors in your Pulsar deployment, you need to download `apache-pulsar-io-connectors`
 > package and install `apache-pulsar-io-connectors` under `connectors` directory in the pulsar directory on every broker node or on every function-worker node if you
-> have run a separate cluster of function workers for [Pulsar Functions](functions-overview.md).
+> have run a separate cluster of function workers for [Pulsar Functions](functions-overview).
 >
-> 3. If you want to use [Tiered Storage](concepts-tiered-storage.md) feature in your Pulsar deployment, you need to download `apache-pulsar-offloaders`
+> 3. If you want to use [Tiered Storage](concepts-tiered-storage) feature in your Pulsar deployment, you need to download `apache-pulsar-offloaders`
 > package and install `apache-pulsar-offloaders` under `offloaders` directory in the pulsar directory on every broker node. For more details of how to configure
-> this feature, you can refer to the [Tiered storage cookbook](cookbooks-tiered-storage.md).
+> this feature, you can refer to the [Tiered storage cookbook](cookbooks-tiered-storage).
 
 Deploying a Pulsar cluster involves doing the following (in order):
 
@@ -95,21 +95,25 @@ To get started deploying a Pulsar cluster on bare metal, you need to download a
 * Using [wget](https://www.gnu.org/software/wget):
 
 ```bash
+
 $ wget pulsar:binary_release_url
+
 ```
 
 Once you download the tarball, untar it and `cd` into the resulting directory:
 
 ```bash
+
 $ tar xvzf apache-pulsar-@pulsar:version@-bin.tar.gz
 $ cd apache-pulsar-@pulsar:version@
+
 ```
 
 The extracted directory contains the following subdirectories:
 
 Directory | Contains
 :---------|:--------
-`bin` |[command-line tools](reference-cli-tools.md) of Pulsar, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/)
+`bin` |[command-line tools](reference-cli-tools) of Pulsar, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/)
 `conf` | Configuration files for Pulsar, including for [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more
 `data` | The data storage directory that ZooKeeper and BookKeeper use
 `lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files that Pulsar uses
@@ -132,19 +136,23 @@ To get started using builtin connectors, you need to download the connectors tar
 * using [wget](https://www.gnu.org/software/wget):
 
   ```shell
+
   $ wget pulsar:connector_release_url/{connector}-@pulsar:version@.nar
+
   ```
 
 Once you download the .nar file, copy the file to directory `connectors` in the pulsar directory. 
 For example, if you download the connector file `pulsar-io-aerospike-@pulsar:version@.nar`:
 
 ```bash
+
 $ mkdir connectors
 $ mv pulsar-io-aerospike-@pulsar:version@.nar connectors
 
 $ ls connectors
 pulsar-io-aerospike-@pulsar:version@.nar
 ...
+
 ```
 
 ## [Install Tiered Storage Offloaders (optional)](https://pulsar.apache.org/docs/en/next/standalone/#install-tiered-storage-offloaders-optional)
@@ -164,12 +172,15 @@ To get started using tiered storage offloaders, you need to download the offload
 * using [wget](https://www.gnu.org/software/wget):
 
   ```shell
+
   $ wget pulsar:offloader_release_url
+
   ```
 
 Once you download the tarball, in the pulsar directory, untar the offloaders package and copy the offloaders as `offloaders` in the pulsar directory:
 
 ```bash
+
 $ tar xvfz apache-pulsar-offloaders-@pulsar:version@-bin.tar.gz
 
 // you can find a directory named `apache-pulsar-offloaders-@pulsar:version@` in the pulsar directory
@@ -179,9 +190,10 @@ $ mv apache-pulsar-offloaders-@pulsar:version@/offloaders offloaders
 
 $ ls offloaders
 tiered-storage-jcloud-@pulsar:version@.nar
+
 ```
 
-For more details of how to configure tiered storage feature, you can refer to the [Tiered storage cookbook](cookbooks-tiered-storage.md)
+For more details of how to configure tiered storage feature, you can refer to the [Tiered storage cookbook](cookbooks-tiered-storage)
 
 
 ## Deploy a ZooKeeper cluster
@@ -193,9 +205,11 @@ For more details of how to configure tiered storage feature, you can refer to th
 To begin, add all ZooKeeper servers to the configuration specified in [`conf/zookeeper.conf`](reference-configuration.md#zookeeper) (in the Pulsar directory that you create [above](#install-the-pulsar-binary-package)). The following is an example:
 
 ```properties
+
 server.1=zk1.us-west.example.com:2888:3888
 server.2=zk2.us-west.example.com:2888:3888
 server.3=zk3.us-west.example.com:2888:3888
+
 ```
 
 > If you only have one machine on which to deploy Pulsar, you only need to add one server entry in the configuration file.
@@ -207,8 +221,10 @@ On each host, you need to specify the ID of the node in the `myid` file, which i
 For example, on a ZooKeeper server like `zk1.us-west.example.com`, you can set the `myid` value as follows:
 
 ```bash
+
 $ mkdir -p data/zookeeper
 $ echo 1 > data/zookeeper/myid
+
 ```
 
 On `zk2.us-west.example.com`, the command is `echo 2 > data/zookeeper/myid` and so on.
@@ -216,7 +232,9 @@ On `zk2.us-west.example.com`, the command is `echo 2 > data/zookeeper/myid` and
 Once you add each server to the `zookeeper.conf` configuration and have the appropriate `myid` entry, you can start ZooKeeper on all hosts (in the background, using nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```bash
+
 $ bin/pulsar-daemon start zookeeper
+
 ```
 
 > If you plan to deploy Zookeeper with the Bookie on the same node, you need to start zookeeper by using different stats
@@ -229,6 +247,7 @@ Once you deploy ZooKeeper for your cluster, you need to write some metadata to Z
 You can initialize this metadata using the [`initialize-cluster-metadata`](reference-cli-tools.md#pulsar-initialize-cluster-metadata) command of the [`pulsar`](reference-cli-tools.md#pulsar) CLI tool. This command can be run on any machine in your ZooKeeper cluster. The following is an example:
 
 ```shell
+
 $ bin/pulsar initialize-cluster-metadata \
   --cluster pulsar-cluster-1 \
   --zookeeper zk1.us-west.example.com:2181 \
@@ -237,6 +256,7 @@ $ bin/pulsar initialize-cluster-metadata \
   --web-service-url-tls https://pulsar.us-west.example.com:8443 \
   --broker-service-url pulsar://pulsar.us-west.example.com:6650 \
   --broker-service-url-tls pulsar+ssl://pulsar.us-west.example.com:6651
+
 ```
 
 As you can see from the example above, you will need to specify the following:
@@ -247,23 +267,25 @@ Flag | Description
 `--zookeeper` | A "local" ZooKeeper connection string for the cluster. This connection string only needs to include *one* machine in the ZooKeeper cluster.
 `--configuration-store` | The configuration store connection string for the entire instance. As with the `--zookeeper` flag, this connection string only needs to include *one* machine in the ZooKeeper cluster.
 `--web-service-url` | The web service URL for the cluster, plus a port. This URL should be a standard DNS name. The default port is 8080 (you had better not use a different port).
-`--web-service-url-tls` | If you use [TLS](security-tls-transport.md), you also need to specify a TLS web service URL for the cluster. The default port is 8443 (you had better not use a different port).
+`--web-service-url-tls` | If you use [TLS](security-tls-transport), you also need to specify a TLS web service URL for the cluster. The default port is 8443 (you had better not use a different port).
 `--broker-service-url` | A broker service URL enabling interaction with the brokers in the cluster. This URL should not use the same DNS name as the web service URL but should use the `pulsar` scheme instead. The default port is 6650 (you had better not use a different port).
-`--broker-service-url-tls` | If you use [TLS](security-tls-transport.md), you also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster. The default port is 6651 (you had better not use a different port).
+`--broker-service-url-tls` | If you use [TLS](security-tls-transport), you also need to specify a TLS web service URL for the cluster as well as a TLS broker service URL for the brokers in the cluster. The default port is 6651 (you had better not use a different port).
 
 
 > If you do not have a DNS server, you can use multi-host format in the service URL with the following settings:
 >
 > ```properties
+>
 > --web-service-url http://host1:8080,host2:8080,host3:8080 \
 > --web-service-url-tls https://host1:8443,host2:8443,host3:8443 \
 > --broker-service-url pulsar://host1:6650,host2:6650,host3:6650 \
 > --broker-service-url-tls pulsar+ssl://host1:6651,host2:6651,host3:6651
 > ```
-
+>
 > If you want to use an existing BookKeeper cluster, you can add the `--existing-bk-metadata-service-uri` flag as follows:
 >
 > ```properties
+>
 > --existing-bk-metadata-service-uri "zk+null://zk1:2181;zk2:2181/ledgers" \
 > --web-service-url http://host1:8080,host2:8080,host3:8080 \
 > --web-service-url-tls https://host1:8443,host2:8443,host3:8443 \
@@ -279,7 +301,9 @@ Flag | Description
 You can configure BookKeeper bookies using the [`conf/bookkeeper.conf`](reference-configuration.md#bookkeeper) configuration file. The most important step in configuring bookies for our purposes here is ensuring that [`zkServers`](reference-configuration.md#bookkeeper-zkServers) is set to the connection string for the ZooKeeper cluster. The following is an example:
 
 ```properties
+
 zkServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
+
 ```
 
 Once you appropriately modify the `zkServers` parameter, you can make any other configuration changes that you require. You can find a full listing of the available BookKeeper configuration parameters [here](reference-configuration.md#bookkeeper). However, consulting the [BookKeeper documentation](http://bookkeeper.apache.org/docs/latest/reference/config/) for a more in-depth guide might be a better choice.
@@ -289,19 +313,25 @@ Once you apply the desired configuration in `conf/bookkeeper.conf`, you can star
 To start the bookie in the background, use the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```bash
+
 $ bin/pulsar-daemon start bookie
+
 ```
 
 To start the bookie in the foreground:
 
 ```bash
+
 $ bin/pulsar bookie
+
 ```
 
 You can verify that a bookie works properly by running the `bookiesanity` command on the [BookKeeper shell](reference-cli-tools.md#shell):
 
 ```bash
+
 $ bin/bookkeeper shell bookiesanity
+
 ```
 
 This command creates an ephemeral BookKeeper ledger on the local bookie, writes a few entries, reads them back, and finally deletes the ledger.
@@ -309,7 +339,9 @@ This command creates an ephemeral BookKeeper ledger on the local bookie, writes
 After you start all the bookies, you can use `simpletest` command for [BookKeeper shell](reference-cli-tools.md#shell) on any bookie node, to verify all the bookies in the cluster are up running.
 
 ```bash
+
 $ bin/bookkeeper shell simpletest --ensemble <num-bookies> --writeQuorum <num-bookies> --ackQuorum <num-bookies> --numEntries <num-entries>
+
 ```
 
 This command creates a `num-bookies` sized ledger on the cluster, writes a few entries, and finally deletes the ledger.
@@ -324,28 +356,35 @@ Pulsar brokers are the last thing you need to deploy in your Pulsar cluster. Bro
 The most important element of broker configuration is ensuring that each broker is aware of the ZooKeeper cluster that you have deployed. Ensure that the [`zookeeperServers`](reference-configuration.md#broker-zookeeperServers) and [`configurationStoreServers`](reference-configuration.md#broker-configurationStoreServers) parameters are correct. In this case, since you only have 1 cluster and no configuration store setup, the `configurationStoreServers` point to the same `zookeeperServers`.
 
 ```properties
+
 zookeeperServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
 configurationStoreServers=zk1.us-west.example.com:2181,zk2.us-west.example.com:2181,zk3.us-west.example.com:2181
+
 ```
 
 You also need to specify the cluster name (matching the name that you provided when you [initialize the metadata of the cluster](#initialize-cluster-metadata)):
 
 ```properties
+
 clusterName=pulsar-cluster-1
+
 ```
 
 In addition, you need to match the broker and web service ports provided when you initialize the metadata of the cluster (especially when you use a different port than the default):
 
 ```properties
+
 brokerServicePort=6650
 brokerServicePortTls=6651
 webServicePort=8080
 webServicePortTls=8443
+
 ```
 
 > If you deploy Pulsar in a one-node cluster, you should update the replication settings in `conf/broker.conf` to `1`.
 >
 > ```properties
+>
 > # Number of bookies to use when creating a ledger
 > managedLedgerDefaultEnsembleSize=1
 >
@@ -358,21 +397,25 @@ webServicePortTls=8443
 
 ### Enable Pulsar Functions (optional)
 
-If you want to enable [Pulsar Functions](functions-overview.md), you can follow the instructions as below:
+If you want to enable [Pulsar Functions](functions-overview), you can follow the instructions as below:
 
 1. Edit `conf/broker.conf` to enable functions worker, by setting `functionsWorkerEnabled` to `true`.
 
     ```conf
+
     functionsWorkerEnabled=true
+
     ```
 
 2. Edit `conf/functions_worker.yml` and set `pulsarFunctionsCluster` to the cluster name that you provide when you [initialize the metadata of the cluster](#initialize-cluster-metadata). 
 
     ```conf
+
     pulsarFunctionsCluster: pulsar-cluster-1
+
     ```
 
-If you want to learn more options about deploying the functions worker, check out [Deploy and manage functions worker](functions-worker.md).
+If you want to learn more options about deploying the functions worker, check out [Deploy and manage functions worker](functions-worker).
 
 ### Start Brokers
 
@@ -381,13 +424,17 @@ You can then provide any other configuration changes that you want in the [`conf
 You can start a broker in the foreground using the [`pulsar broker`](reference-cli-tools.md#pulsar-broker) command:
 
 ```bash
+
 $ bin/pulsar broker
+
 ```
 
 You can start a broker in the background using the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
 ```bash
+
 $ bin/pulsar-daemon start broker
+
 ```
 
 Once you successfully start up all the brokers that you intend to use, your Pulsar cluster should be ready to go!
@@ -399,13 +446,16 @@ Once your Pulsar cluster is up and running, you should be able to connect with i
 To use the `pulsar-client` tool, first modify the client configuration file in [`conf/client.conf`](reference-configuration.md#client) in your binary package. You need to change the values for `webServiceUrl` and `brokerServiceUrl`, substituting `localhost` (which is the default), with the DNS name that you assign to your broker/bookie hosts. The following is an example:
 
 ```properties
+
 webServiceUrl=http://us-west.example.com:8080
 brokerServiceurl=pulsar://us-west.example.com:6650
+
 ```
 
 > If you do not have a DNS server, you can specify multi-host in service URL as follows:
 >
 > ```properties
+>
 > webServiceUrl=http://host1:8080,host2:8080,host3:8080
 > brokerServiceurl=pulsar://host1:6650,host2:6650,host3:6650
 > ```
@@ -413,10 +463,12 @@ brokerServiceurl=pulsar://us-west.example.com:6650
 Once that is complete, you can publish a message to the Pulsar topic:
 
 ```bash
+
 $ bin/pulsar-client produce \
   persistent://public/default/test \
   -n 1 \
   -m "Hello Pulsar"
+
 ```
 
 > You may need to use a different cluster name in the topic if you specify a cluster name other than `pulsar-cluster-1`.
@@ -424,18 +476,22 @@ $ bin/pulsar-client produce \
 This command publishes a single message to the Pulsar topic. In addition, you can subscribe to the Pulsar topic in a different terminal before publishing messages as below:
 
 ```bash
+
 $ bin/pulsar-client consume \
   persistent://public/default/test \
   -n 100 \
   -s "consumer-test" \
   -t "Exclusive"
+
 ```
 
 Once you successfully publish the above message to the topic, you should see it in the standard output:
 
 ```bash
+
 ----- got message -----
 Hello Pulsar
+
 ```
 
 ## Run Functions
@@ -445,6 +501,7 @@ Hello Pulsar
 Create an ExclamationFunction `exclamation`.
 
 ```bash
+
 bin/pulsar-admin functions create \
   --jar examples/api-examples.jar \
   --classname org.apache.pulsar.functions.api.examples.ExclamationFunction \
@@ -453,16 +510,21 @@ bin/pulsar-admin functions create \
   --tenant public \
   --namespace default \
   --name exclamation
+
 ```
 
 Check whether the function runs as expected by [triggering](functions-deploying.md#triggering-pulsar-functions) the function.
 
 ```bash
+
 bin/pulsar-admin functions trigger --name exclamation --trigger-value "hello world"
+
 ```
 
 You should see the following output:
 
 ```shell
+
 hello world!
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/deploy-dcos.md b/site2/website-next/versioned_docs/version-2.8.0/deploy-dcos.md
index 99a142a..9cf71f0 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/deploy-dcos.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/deploy-dcos.md
@@ -11,7 +11,7 @@ import TabItem from '@theme/TabItem';
 
 > ### Tips
 >
-> If you want to enable all builtin [Pulsar IO](io-overview.md) connectors in your Pulsar deployment, you can choose to use `apachepulsar/pulsar-all` image instead of
+> If you want to enable all builtin [Pulsar IO](io-overview) connectors in your Pulsar deployment, you can choose to use `apachepulsar/pulsar-all` image instead of
 > `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
 
 [DC/OS](https://dcos.io/) (the <strong>D</strong>ata<strong>C</strong>enter <strong>O</strong>perating <strong>S</strong>ystem) is a distributed operating system used for deploying and managing applications and systems on [Apache Mesos](http://mesos.apache.org/). DC/OS is an open-source tool that [Mesosphere](https://mesosphere.com/) creates and maintains .
@@ -28,7 +28,9 @@ In order to run Pulsar on DC/OS, you need the following:
 * The [`PulsarGroups.json`](https://github.com/apache/pulsar/blob/master/deployment/dcos/PulsarGroups.json) configuration file from the Pulsar GitHub repo.
 
   ```bash
+
   $ curl -O https://raw.githubusercontent.com/apache/pulsar/master/deployment/dcos/PulsarGroups.json
+
   ```
 
 Each node in the DC/OS-managed Mesos cluster must have at least:
@@ -44,7 +46,9 @@ Alternatively, you can change the configuration in `PulsarGroups.json` according
 You can deploy Pulsar on DC/OS using this command:
 
 ```bash
+
 $ dcos marathon group add PulsarGroups.json
+
 ```
 
 This command deploys Docker container instances in three groups, which together comprise a Pulsar cluster:
@@ -131,7 +135,9 @@ Now that you have a fully deployed Pulsar cluster, you can run a simple consumer
 You can clone a [Pulsar Java tutorial](https://github.com/streamlio/pulsar-java-tutorial) repo. This repo contains a simple Pulsar consumer and producer (you can find more information in the `README` file of the repo).
 
 ```bash
+
 $ git clone https://github.com/streamlio/pulsar-java-tutorial
+
 ```
 
 Change the `SERVICE_URL` from `pulsar://localhost:6650` to `pulsar://a1.dcos:6650` in both [`ConsumerTutorial.java`](https://github.com/streamlio/pulsar-java-tutorial/blob/master/src/main/java/tutorial/ConsumerTutorial.java) and [`ProducerTutorial.java`](https://github.com/streamlio/pulsar-java-tutorial/blob/master/src/main/java/tutorial/ProducerTutorial.java).
@@ -142,7 +148,9 @@ Now, change the message number from 10 to 10000000 in main method of [`ProducerT
 Now compile the project code using the command below:
 
 ```bash
+
 $ mvn clean package
+
 ```
 
 ### Run the consumer and producer
@@ -150,13 +158,17 @@ $ mvn clean package
 Execute this command to run the consumer:
 
 ```bash
+
 $ mvn exec:java -Dexec.mainClass="tutorial.ConsumerTutorial"
+
 ```
 
 Execute this command to run the producer:
 
 ```bash
+
 $ mvn exec:java -Dexec.mainClass="tutorial.ProducerTutorial"
+
 ```
 
 You can see the producer producing messages and the consumer consuming messages through the DC/OS GUI.
@@ -183,5 +195,7 @@ You can shut down and uninstall the `pulsar` application from DC/OS at any time
 2. You can use the following command:
 
     ```bash
+
     $ dcos marathon group remove /pulsar
+
     ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/deploy-docker.md b/site2/website-next/versioned_docs/version-2.8.0/deploy-docker.md
index 07d0e00..e094193 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/deploy-docker.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/deploy-docker.md
@@ -24,6 +24,7 @@ You can pull a Pulsar image from [Docker Hub](https://hub.docker.com/r/apachepul
 
 ```
 docker pull apachepulsar/pulsar-all:latest
+
 ```
 
 ### Create three containers
@@ -33,6 +34,7 @@ Create containers for ZooKeeper, BookKeeper and broker. In this example, they ar
 docker run -it --name bookkeeper apachepulsar/pulsar-all:latest /bin/bash
 docker run -it --name zookeeper apachepulsar/pulsar-all:latest /bin/bash
 docker run -it --name broker apachepulsar/pulsar-all:latest /bin/bash
+
 ```
 
 ### Create a network
@@ -40,6 +42,7 @@ To deploy a Pulsar cluster on Docker, you need to create a `network` and connect
 
 ```
 docker network create pulsar
+
 ```
 
 ### Connect containers to network
@@ -49,8 +52,9 @@ Connect the containers of ZooKeeper, BookKeeper and broker to the `pulsar` netwo
 docker network connect pulsar zookeeper
 docker network connect pulsar bookkeeper
 docker network connect pulsar broker
+
 ```
 
 To check whether the containers are successfully connected to the network, enter the `docker network inspect pulsar` command.
 
-For detailed information about how to deploy ZooKeeper cluster, BookKeeper cluster, brokers, see [deploy a cluster on bare metal](deploy-bare-metal.md).
+For detailed information about how to deploy ZooKeeper cluster, BookKeeper cluster, brokers, see [deploy a cluster on bare metal](deploy-bare-metal).
diff --git a/site2/website-next/versioned_docs/version-2.8.0/deploy-kubernetes.md b/site2/website-next/versioned_docs/version-2.8.0/deploy-kubernetes.md
index d2760e7..31111df 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/deploy-kubernetes.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/deploy-kubernetes.md
@@ -10,6 +10,6 @@ import TabItem from '@theme/TabItem';
 
 
 To get up and running with these charts as fast as possible, in a **non-production** use case, we provide
-a [quick start guide](getting-started-helm.md) for Proof of Concept (PoC) deployments.
+a [quick start guide](getting-started-helm) for Proof of Concept (PoC) deployments.
 
-To configure and install a Pulsar cluster on Kubernetes for production usage, follow the complete [Installation Guide](helm-install.md).
\ No newline at end of file
+To configure and install a Pulsar cluster on Kubernetes for production usage, follow the complete [Installation Guide](helm-install).
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/deploy-monitoring.md b/site2/website-next/versioned_docs/version-2.8.0/deploy-monitoring.md
index 015f7f8..40901d3 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/deploy-monitoring.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/deploy-monitoring.md
@@ -22,13 +22,17 @@ You can collect Pulsar broker metrics from brokers and export the metrics in JSO
 * *Destination dumps*, which contain stats for each individual topic. You can fetch the destination dumps using the command below:
 
   ```shell
+
   bin/pulsar-admin broker-stats destinations
+
   ```
 
 * Broker metrics, which contain the broker information and topics stats aggregated at namespace level. You can fetch the broker metrics by using the following command:
 
   ```shell
+
   bin/pulsar-admin broker-stats monitoring-metrics
+
   ```
 
 All the message rates are updated every minute.
@@ -36,7 +40,9 @@ All the message rates are updated every minute.
 The aggregated broker metrics are also exposed in the [Prometheus](https://prometheus.io) format at:
 
 ```shell
+
 http://$BROKER_ADDRESS:8080/metrics
+
 ```
 
 ### ZooKeeper stats
@@ -44,8 +50,10 @@ http://$BROKER_ADDRESS:8080/metrics
 The local ZooKeeper, configuration store server and clients that are shipped with Pulsar can expose detailed stats through Prometheus.
 
 ```shell
+
 http://$LOCAL_ZK_SERVER:8000/metrics
 http://$GLOBAL_ZK_SERVER:8001/metrics
+
 ```
 
 The default port of local ZooKeeper is `8000` and the default port of configuration store is `8001`. You can change the default port of local ZooKeeper and configuration store by specifying system property `stats_server_port`.
@@ -57,7 +65,9 @@ You can configure the stats frameworks for BookKeeper by modifying the `statsPro
 The default BookKeeper configuration enables the Prometheus exporter. The configuration is included with Pulsar distribution.
 
 ```shell
+
 http://$BOOKIE_ADDRESS:8000/metrics
+
 ```
 
 The default port for bookie is `8000`. You can change the port by configuring `prometheusStatsHttpPort` in the `conf/bookkeeper.conf` file.
@@ -71,6 +81,7 @@ brk_ml_cursor_persistLedgerErrors(namespace="", ledger_name="", cursor_name:"")
 brk_ml_cursor_persistZookeeperSucceed(namespace="", ledger_name="", cursor_name:"")
 brk_ml_cursor_persistZookeeperErrors(namespace="", ledger_name="", cursor_name:"")
 brk_ml_cursor_nonContiguousDeletedMessagesRange(namespace="", ledger_name="", cursor_name:"")
+
 ```
 
 Those metrics are added in the Prometheus interface, you can monitor and check the metrics stats in the Grafana.
@@ -81,25 +92,28 @@ You can collect functions worker stats from `functions-worker` and export the me
 
 ```
 pulsar-admin functions-worker monitoring-metrics
+
 ```
 
 You can collect functions and connectors metrics from `functions-worker` and export the metrics in JSON formats.
 
 ```
 pulsar-admin functions-worker function-stats
+
 ```
 
 The aggregated functions and connectors metrics can be exposed in Prometheus formats as below. You can get [`FUNCTIONS_WORKER_ADDRESS`](http://pulsar.apache.org/docs/en/next/functions-worker/) and `WORKER_PORT` from the `functions_worker.yml` file.
 
 ```
 http://$FUNCTIONS_WORKER_ADDRESS:$WORKER_PORT/metrics:
+
 ```
 
 ## Configure Prometheus
 
 You can use Prometheus to collect all the metrics exposed for Pulsar components and set up [Grafana](https://grafana.com/) dashboards to display the metrics and monitor your Pulsar cluster. For details, refer to [Prometheus guide](https://prometheus.io/docs/introduction/getting_started/).
 
-When you run Pulsar on bare metal, you can provide the list of nodes to be probed. When you deploy Pulsar in a Kubernetes cluster, the monitoring is setup automatically. For details, refer to [Kubernetes instructions](helm-deploy.md). 
+When you run Pulsar on bare metal, you can provide the list of nodes to be probed. When you deploy Pulsar in a Kubernetes cluster, the monitoring is setup automatically. For details, refer to [Kubernetes instructions](helm-deploy). 
 
 ## Dashboards
 
@@ -107,7 +121,7 @@ When you collect time series statistics, the major problem is to make sure the n
 
 ### Pulsar per-topic dashboard
 
-The per-topic dashboard instructions are available at [Pulsar manager](administration-pulsar-manager.md).
+The per-topic dashboard instructions are available at [Pulsar manager](administration-pulsar-manager).
 
 ### Grafana
 
@@ -118,9 +132,11 @@ When you deploy Pulsar on Kubernetes, a `pulsar-grafana` Docker image is enabled
 Enter the command below to use the dashboard manually:
 
 ```shell
+
 docker run -p3000:3000 \
         -e PROMETHEUS_URL=http://$PROMETHEUS_HOST:9090/ \
         apachepulsar/pulsar-grafana:latest
+
 ```
 
 The following are some Grafana dashboards examples:
diff --git a/site2/website-next/versioned_docs/version-2.8.0/functions-debug.md b/site2/website-next/versioned_docs/version-2.8.0/functions-debug.md
index f98429b..7d5c13e 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/functions-debug.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/functions-debug.md
@@ -29,8 +29,8 @@ A Pulsar Function is a function with inputs and outputs, you can test a Pulsar F
 
 For example, if you have the following Pulsar Function:
 
-
 ```java
+
 import java.util.function.Function;
 
 public class JavaNativeExclamationFunction implements Function<String, String> {
@@ -39,27 +39,32 @@ public class JavaNativeExclamationFunction implements Function<String, String> {
        return String.format("%s!", input);
    }
 }
+
 ```
 
 You can write a simple unit test to test Pulsar Function.
 
-> #### Tip
-> Pulsar uses testng for testing.
+:::tip
 
+Pulsar uses testng for testing.
+
+:::
 
 ```java
+
 @Test
 public void testJavaNativeExclamationFunction() {
    JavaNativeExclamationFunction exclamation = new JavaNativeExclamationFunction();
    String output = exclamation.apply("foo");
    Assert.assertEquals(output, "foo!");
 }
+
 ```
 
 The following Pulsar Function implements the `org.apache.pulsar.functions.api.Function` interface.
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 
@@ -69,21 +74,26 @@ public class ExclamationFunction implements Function<String, String> {
        return String.format("%s!", input);
    }
 }
+
 ```
 
 In this situation, you can write a unit test for this function as well. Remember to mock the `Context` parameter. The following is an example.
 
-> #### Tip
-> Pulsar uses testng for testing.
+:::tip
 
+Pulsar uses testng for testing.
+
+:::
 
 ```java
+
 @Test
 public void testExclamationFunction() {
    ExclamationFunction exclamation = new ExclamationFunction();
    String output = exclamation.process("foo", mock(Context.class));
    Assert.assertEquals(output, "foo!");
 }
+
 ```
 
 ## Debug with localrun mode
@@ -91,13 +101,16 @@ When you run a Pulsar Function in localrun mode, it launches an instance of the
 
 In this mode, a Pulsar Function consumes and produces actual data to a Pulsar cluster, and mirrors how the function actually runs in a Pulsar cluster.
 
-> Note  
-> Currently, debugging with localrun mode is only supported by Pulsar Functions written in Java. You need Pulsar version 2.4.0 or later to do the following. Even though localrun is available in versions earlier than Pulsar 2.4.0, you cannot debug with localrun mode programmatically or run Functions as threads.
+:::note
 
-You can launch your function in the following manner.
+Currently, debugging with localrun mode is only supported by Pulsar Functions written in Java. You need Pulsar version 2.4.0 or later to do the following. Even though localrun is available in versions earlier than Pulsar 2.4.0, you cannot debug with localrun mode programmatically or run Functions as threads.
+
+:::
 
+You can launch your function in the following manner.
 
 ```java
+
 FunctionConfig functionConfig = new FunctionConfig();
 functionConfig.setName(functionName);
 functionConfig.setInputs(Collections.singleton(sourceTopic));
@@ -107,14 +120,15 @@ functionConfig.setOutput(sinkTopic);
 
 LocalRunner localRunner = LocalRunner.builder().functionConfig(functionConfig).build();
 localRunner.start(true);
+
 ```
 
 So you can debug functions using an IDE easily. Set breakpoints and manually step through a function to debug with real data.
 
 The following example illustrates how to programmatically launch a function in localrun mode.
 
-
 ```java
+
 public class ExclamationFunction implements Function<String, String> {
 
    @Override
@@ -133,12 +147,13 @@ public static void main(String[] args) throws Exception {
     LocalRunner localRunner = LocalRunner.builder().functionConfig(functionConfig).build();
     localRunner.start(false);
 }
+
 ```
 
 To use localrun mode programmatically, add the following dependency.
 
-
 ```xml
+
 <dependency>
    <groupId>org.apache.pulsar</groupId>
    <artifactId>pulsar-functions-local-runner</artifactId>
@@ -149,8 +164,11 @@ To use localrun mode programmatically, add the following dependency.
 
 For complete code samples, see [here](https://github.com/jerrypeng/pulsar-functions-demos/tree/master/debugging).
 
-> Note   
-> Debugging with localrun mode for Pulsar Functions written in other languages will be supported soon.
+:::note
+
+Debugging with localrun mode for Pulsar Functions written in other languages will be supported soon.
+
+:::
 
 ## Use log topic
 
@@ -160,8 +178,8 @@ In Pulsar Functions, you can generate log information defined in functions to a
 
 **Example** 
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 import org.slf4j.Logger;
@@ -181,17 +199,19 @@ public class LoggingFunction implements Function<String, Void> {
         return null;
     }
 }
+
 ```
 
 As shown in the example above, you can get the logger via `context.getLogger()` and assign the logger to the `LOG` variable of `slf4j`, so you can define your desired log information in a function using the `LOG` variable. Meanwhile, you need to specify the topic to which the log information is produced.
 
 **Example** 
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --log-topic persistent://public/default/logging-function-logs \
   # Other function configs
+
 ```
 
 ## Use Functions CLI
@@ -204,9 +224,12 @@ With [Pulsar Functions CLI](reference-pulsar-admin.md#functions), you can debug
 * `list`
 * `trigger`
 
-> **Tip**
-> 
-> For complete commands of **Pulsar Functions CLI**, see [here](reference-pulsar-admin.md#functions)。
+:::tip
+
+
+For complete commands of **Pulsar Functions CLI**, see [here](reference-pulsar-admin.md#functions)。
+
+:::
 
 ### `get`
 
@@ -214,9 +237,10 @@ Get information about a Pulsar Function.
 
 **Usage**
 
-
 ```bash
+
 $ pulsar-admin functions get options
+
 ```
 
 **Options**
@@ -228,32 +252,37 @@ $ pulsar-admin functions get options
 |`--namespace`|The namespace of a Pulsar Function.
 |`--tenant`|The tenant of a Pulsar Function.
 
-> **Tip**
-> 
-> `--fqfn` consists of `--name`, `--namespace` and `--tenant`, so you can specify either `--fqfn` or `--name`, `--namespace` and `--tenant`.
+:::tip
+
+
+`--fqfn` consists of `--name`, `--namespace` and `--tenant`, so you can specify either `--fqfn` or `--name`, `--namespace` and `--tenant`.
+
+:::
 
 **Example** 
 
 You can specify `--fqfn` to get information about a Pulsar Function.
 
-
 ```bash
+
 $ ./bin/pulsar-admin functions get public/default/ExclamationFunctio6
+
 ```
 Optionally, you can specify `--name`, `--namespace` and `--tenant` to get information about a Pulsar Function.
 
-
 ```bash
+
 $ ./bin/pulsar-admin functions get \
     --tenant public \
     --namespace default \
     --name ExclamationFunctio6
+
 ```
 
 As shown below, the `get` command shows input, output, runtime, and other information about the _ExclamationFunctio6_ function.
 
-
 ```json
+
 {
   "tenant": "public",
   "namespace": "default",
@@ -272,6 +301,7 @@ As shown below, the `get` command shows input, output, runtime, and other inform
   "autoAck": true,
   "parallelism": 1
 }
+
 ```
 
 ### `status`
@@ -280,9 +310,10 @@ Check the current status of a Pulsar Function.
 
 **Usage**
 
-
 ```bash
+
 $ pulsar-admin functions status options
+
 ```
 
 **Options**
@@ -297,18 +328,19 @@ $ pulsar-admin functions status options
 
 **Example** 
 
-
 ```bash
+
 $ ./bin/pulsar-admin functions status \
     --tenant public \
     --namespace default \
     --name ExclamationFunctio6 \
+
 ```
 
 As shown below, the `status` command shows the number of instances, running instances, the instance running under the _ExclamationFunctio6_ function, received messages, successfully processed messages, system exceptions, the average latency and so on.
 
-
 ```json
+
 {
   "numInstances" : 1,
   "numRunning" : 1,
@@ -330,6 +362,7 @@ As shown below, the `status` command shows the number of instances, running inst
     }
   } ]
 }
+
 ```
 
 ### `stats`
@@ -338,9 +371,10 @@ Get the current stats of a Pulsar Function.
 
 **Usage**
 
-
 ```bash
+
 $ pulsar-admin functions stats options
+
 ```
 
 **Options**
@@ -355,18 +389,19 @@ $ pulsar-admin functions stats options
 
 **Example**
 
-
 ```bash
+
 $ ./bin/pulsar-admin functions stats \
     --tenant public \
     --namespace default \
     --name ExclamationFunctio6 \
+
 ```
 
 The output is shown as follows:
 
-
 ```json
+
 {
   "receivedTotal" : 1,
   "processedSuccessfullyTotal" : 1,
@@ -401,6 +436,7 @@ The output is shown as follows:
     }
   } ]
 }
+
 ```
 
 ### `list`
@@ -409,9 +445,10 @@ List all Pulsar Functions running under a specific tenant and namespace.
 
 **Usage**
 
-
 ```bash
+
 $ pulsar-admin functions list options
+
 ```
 
 **Options**
@@ -423,19 +460,21 @@ $ pulsar-admin functions list options
 
 **Example** 
 
-
 ```bash
+
 $ ./bin/pulsar-admin functions list \
     --tenant public \
     --namespace default
+
 ```
 As shown below, the `list` command returns three functions running under the _public_ tenant and the _default_ namespace.
 
-
 ```text
+
 ExclamationFunctio1
 ExclamationFunctio2
 ExclamationFunctio3
+
 ```
 
 ### `trigger`
@@ -444,9 +483,10 @@ Trigger a specified Pulsar Function with a supplied value. This command simulate
 
 **Usage**
 
-
 ```bash
+
 $ pulsar-admin functions trigger options
+
 ```
 
 **Options**
@@ -463,29 +503,35 @@ $ pulsar-admin functions trigger options
 
 **Example** 
 
-
 ```bash
+
 $ ./bin/pulsar-admin functions trigger \
     --tenant public \
     --namespace default \
     --name ExclamationFunctio6 \
     --topic persistent://public/default/my-topic-1 \
     --trigger-value "hello pulsar functions"
+
 ```
 
 As shown below, the `trigger` command returns the following result:
 
-
 ```text
+
 This is my function!
+
 ```
 
-> #### **Note**
-> You must specify the [entire topic name](getting-started-pulsar.md#topic-names) when using the `--topic` option. Otherwise, the following error occurs.
->
->
+:::note
+
+You must specify the [entire topic name](getting-started-pulsar.md#topic-names) when using the `--topic` option. Otherwise, the following error occurs.
+
 ```text
->Function in trigger function has unidentified topic
->
->Reason: Function in trigger function has unidentified topic
->```
+
+Function in trigger function has unidentified topic
+
+Reason: Function in trigger function has unidentified topic
+
+```
+
+:::
diff --git a/site2/website-next/versioned_docs/version-2.8.0/functions-deploy.md b/site2/website-next/versioned_docs/version-2.8.0/functions-deploy.md
index f694e23..fd7bd62 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/functions-deploy.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/functions-deploy.md
@@ -13,12 +13,12 @@ import TabItem from '@theme/TabItem';
 
 To deploy and manage Pulsar Functions, you need to have a Pulsar cluster running. There are several options for this:
 
-* You can run a [standalone cluster](getting-started-standalone.md) locally on your own machine.
-* You can deploy a Pulsar cluster on [Kubernetes](deploy-kubernetes.md), [Amazon Web Services](deploy-aws.md), [bare metal](deploy-bare-metal.md), [DC/OS](deploy-dcos.md), and more.
+* You can run a [standalone cluster](getting-started-standalone) locally on your own machine.
+* You can deploy a Pulsar cluster on [Kubernetes](deploy-kubernetes.md), [Amazon Web Services](deploy-aws.md), [bare metal](deploy-bare-metal.md), [DC/OS](deploy-dcos), and more.
 
 If you run a non-[standalone](reference-terminology.md#standalone) cluster, you need to obtain the service URL for the cluster. How you obtain the service URL depends on how you deploy your Pulsar cluster.
 
-If you want to deploy and trigger Python user-defined functions, you need to install [the pulsar python client](http://pulsar.apache.org/docs/en/client-libraries-python/) on all the machines running [functions workers](functions-worker.md).
+If you want to deploy and trigger Python user-defined functions, you need to install [the pulsar python client](http://pulsar.apache.org/docs/en/client-libraries-python/) on all the machines running [functions workers](functions-worker).
 
 ## Command-line interface
 
@@ -44,12 +44,13 @@ Pulsar service URL | `pulsar://localhost:6650`
 
 Take the `create` command as an example.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --jar my-pulsar-functions.jar \
   --classname org.example.MyFunction \
   --inputs my-function-input-topic1,my-function-input-topic2
+
 ```
 
 The function has default values for the function name (`MyFunction`), tenant (`public`), namespace (`default`), subscription type (`SHARED`), processing guarantees (`ATLEAST_ONCE`), and Pulsar service URL (`pulsar://localhost:6650`).
@@ -58,48 +59,52 @@ The function has default values for the function name (`MyFunction`), tenant (`p
 
 If you run a Pulsar Function in **local run** mode, it runs on the machine from which you enter the commands (on your laptop, an [AWS EC2](https://aws.amazon.com/ec2/) instance, and so on). The following is a [`localrun`](reference-pulsar-admin.md#localrun) command example.
 
-
 ```bash
+
 $ bin/pulsar-admin functions localrun \
   --py myfunc.py \
   --classname myfunc.SomeFunction \
   --inputs persistent://public/default/input-1 \
   --output persistent://public/default/output-1
+
 ```
 
 By default, the function connects to a Pulsar cluster running on the same machine, via a local [broker](reference-terminology.md#broker) service URL of `pulsar://localhost:6650`. If you use local run mode to run a function but connect it to a non-local Pulsar cluster, you can specify a different broker URL using the `--brokerServiceUrl` flag. The following is an example.
 
-
 ```bash
+
 $ bin/pulsar-admin functions localrun \
   --broker-service-url pulsar://my-cluster-host:6650 \
   # Other function parameters
+
 ```
 
 ## Cluster mode
 
 When you run a Pulsar Function in **cluster** mode, the function code is uploaded to a Pulsar broker and runs *alongside the broker* rather than in your [local environment](#local-run-mode). You can run a function in cluster mode using the [`create`](reference-pulsar-admin.md#create-1) command. 
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --py myfunc.py \
   --classname myfunc.SomeFunction \
   --inputs persistent://public/default/input-1 \
   --output persistent://public/default/output-1
+
 ```
 
 ### Update functions in cluster mode 
 
 You can use the [`update`](reference-pulsar-admin.md#update-1) command to update a Pulsar Function running in cluster mode. The following command updates the function created in the [cluster mode](#cluster-mode) section.
 
-
 ```bash
+
 $ bin/pulsar-admin functions update \
   --py myfunc.py \
   --classname myfunc.SomeFunction \
   --inputs persistent://public/default/new-input-topic \
   --output persistent://public/default/new-output-topic
+
 ```
 
 ### Parallelism
@@ -108,40 +113,44 @@ Pulsar Functions run as processes or threads, which are called **instances**. Wh
 
 When you create a function, you can specify the *parallelism* of a function (the number of instances to run). You can set the parallelism factor using the `--parallelism` flag of the [`create`](reference-pulsar-admin.md#functions-create) command. 
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --parallelism 3 \
   # Other function info
+
 ```
 
 You can adjust the parallelism of an already created function using the [`update`](reference-pulsar-admin.md#update-1) interface.
 
-
 ```bash
+
 $ bin/pulsar-admin functions update \
   --parallelism 5 \
   # Other function
+
 ```
 
 If you specify a function configuration via YAML, use the `parallelism` parameter. The following is a config file example.
 
-
 ```yaml
+
 # function-config.yaml
 parallelism: 3
 inputs:
 - persistent://public/default/input-1
 output: persistent://public/default/output-1
 # other parameters
+
 ```
 
 The following is corresponding update command.
 
-
 ```bash
+
 $ bin/pulsar-admin functions update \
   --function-config-file function-config.yaml
+
 ```
 
 ### Function instance resources
@@ -156,14 +165,15 @@ Disk space | The number of bytes | Docker
 
 The following function creation command allocates 8 cores, 8 GB of RAM, and 10 GB of disk space to a function.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --jar target/my-functions.jar \
   --classname org.example.functions.MyFunction \
   --cpu 8 \
   --ram 8589934592 \
   --disk 10737418240
+
 ```
 
 > #### Resources are *per instance*
@@ -177,17 +187,18 @@ If a Pulsar Function is running in [cluster mode](#cluster-mode), you can **trig
 
 To learn how to trigger a function, you can start with Python function that returns a simple string based on the input.
 
-
 ```python
+
 # myfunc.py
 def process(input):
     return "This function has been triggered with a value of {0}".format(input)
+
 ```
 
 You can run the function in [local run mode](functions-deploy.md#local-run-mode).
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --tenant public \
   --namespace default \
@@ -196,34 +207,37 @@ $ bin/pulsar-admin functions create \
   --classname myfunc \
   --inputs persistent://public/default/in \
   --output persistent://public/default/out
+
 ```
 
 Then assign a consumer to listen on the output topic for messages from the `myfunc` function with the [`pulsar-client consume`](reference-cli-tools.md#consume) command.
 
-
 ```bash
+
 $ bin/pulsar-client consume persistent://public/default/out \
   --subscription-name my-subscription
   --num-messages 0 # Listen indefinitely
+
 ```
 
 And then you can trigger the function.
 
-
 ```bash
+
 $ bin/pulsar-admin functions trigger \
   --tenant public \
   --namespace default \
   --name myfunc \
   --trigger-value "hello world"
+
 ```
 
 The consumer listening on the output topic produces something as follows in the log.
 
-
 ```
 ----- got message -----
 This function has been triggered with a value of hello world
+
 ```
 
 > #### Topic info is not required
diff --git a/site2/website-next/versioned_docs/version-2.8.0/functions-develop.md b/site2/website-next/versioned_docs/version-2.8.0/functions-develop.md
index 3d8aead..d0607c6 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/functions-develop.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/functions-develop.md
@@ -36,6 +36,7 @@ The language-native function, which adds an exclamation point to all incoming st
 <TabItem value="Java">
 
 ```Java
+
 import java.util.function.Function;
 
 public class JavaNativeExclamationFunction implements Function<String, String> {
@@ -44,6 +45,7 @@ public class JavaNativeExclamationFunction implements Function<String, String> {
         return String.format("%s!", input);
     }
 }
+
 ```
 For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/JavaNativeExclamationFunction.java).
 
@@ -51,22 +53,28 @@ For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsa
 <TabItem value="Python">
 
 ```python
+
 def process(input):
     return "{}!".format(input)
+
 ```
 For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsar-functions/python-examples/native_exclamation_function.py).
 
-> Note
-> You can write Pulsar Functions in python2 or python3. However, Pulsar only looks for `python` as the interpreter.
-> 
-> If you're running Pulsar Functions on an Ubuntu system that only supports python3, you might fail to
-> start the functions. In this case, you can create a symlink. Your system will fail if
-> you subsequently install any other package that depends on Python 2.x. A solution is under development in [Issue 5518](https://github.com/apache/pulsar/issues/5518).
-> 
->
+:::note
+
+You can write Pulsar Functions in python2 or python3. However, Pulsar only looks for `python` as the interpreter.
+
+If you're running Pulsar Functions on an Ubuntu system that only supports python3, you might fail to
+start the functions. In this case, you can create a symlink. Your system will fail if
+you subsequently install any other package that depends on Python 2.x. A solution is under development in [Issue 5518](https://github.com/apache/pulsar/issues/5518).
+
 ```bash
-> sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
->```
+
+sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+
+```
+
+:::
 
 </TabItem>
 
@@ -92,6 +100,7 @@ The following example uses Pulsar Functions SDK.
 <TabItem value="Java">
 
 ```Java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 
@@ -101,6 +110,7 @@ public class ExclamationFunction implements Function<String, String> {
         return String.format("%s!", input);
     }
 }
+
 ```
 For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/ExclamationFunction.java).
 
@@ -108,6 +118,7 @@ For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsa
 <TabItem value="Python">
 
 ```python
+
 from pulsar import Function
 
 class ExclamationFunction(Function):
@@ -116,6 +127,7 @@ class ExclamationFunction(Function):
 
   def process(self, input, context):
     return input + '!'
+
 ```
 For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsar-functions/python-examples/exclamation_function.py).
 
@@ -123,6 +135,7 @@ For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsa
 <TabItem value="Go">
 
 ```Go
+
 package main
 
 import (
@@ -140,6 +153,7 @@ func HandleRequest(ctx context.Context, in []byte) error{
 func main() {
 	pf.Start(HandleRequest)
 }
+
 ```
 For complete code, see [here](https://github.com/apache/pulsar/blob/77cf09eafa4f1626a53a1fe2e65dd25f377c1127/pulsar-function-go/examples/inputFunc/inputFunc.go#L20-L36).
 
@@ -174,12 +188,13 @@ When you write Pulsar Functions in Java, the following basic Java types are buil
 
 To customize Java types, you need to implement the following interface.
 
-
 ```java
+
 public interface SerDe<T> {
     T deserialize(byte[] input);
     byte[] serialize(T input);
 }
+
 ```
 SerDe works in the following ways in Java Functions.
 - If the input and output topics have schema, Pulsar Functions use schema for SerDe.
@@ -194,8 +209,8 @@ In Python, the default SerDe is identity, meaning that the type is serialized as
 
 You can specify the SerDe when [creating](functions-deploy.md#cluster-mode) or [running](functions-deploy.md#local-run-mode) functions. 
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --tenant public \
   --namespace default \
@@ -205,6 +220,7 @@ $ bin/pulsar-admin functions create \
   --custom-serde-inputs '{"input-topic-1":"Serde1","input-topic-2":"Serde2"}' \
   --output-serde-classname Serde3 \
   --output output-topic-1
+
 ```
 
 This case contains two input topics: `input-topic-1` and `input-topic-2`, each of which is mapped to a different SerDe class (the map must be specified as a JSON string). The output topic, `output-topic-1`, uses the `Serde3` class for SerDe. At the moment, all Pulsar Functions logic, include processing function and SerDe classes, must be contained within a single Python file.
@@ -248,8 +264,8 @@ Imagine that you're writing Pulsar Functions that are processing tweet objects,
 ]}>
 <TabItem value="Java">
 
-
 ```java
+
 public class Tweet {
     private String username;
     private String tweetContent;
@@ -261,12 +277,13 @@ public class Tweet {
 
     // Standard setters and getters
 }
+
 ```
 
 To pass `Tweet` objects directly between Pulsar Functions, you need to provide a custom SerDe class. In the example below, `Tweet` objects are basically strings in which the username and tweet content are separated by a `|`.
 
-
 ```java
+
 package com.example.serde;
 
 import org.apache.pulsar.functions.api.SerDe;
@@ -284,6 +301,7 @@ public class TweetSerde implements SerDe<Tweet> {
         return "%s|%s".format(input.getUsername(), input.getTweetContent()).getBytes();
     }
 }
+
 ```
 
 To apply this customized SerDe to a particular Pulsar Function, you need to:
@@ -293,12 +311,13 @@ To apply this customized SerDe to a particular Pulsar Function, you need to:
 
 The following is an example of [`create`](reference-pulsar-admin.md#create-1) operation.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --jar /path/to/your.jar \
   --output-serde-classname com.example.serde.TweetSerde \
   # Other function attributes
+
 ```
 
 > #### Custom SerDe classes must be packaged with your function JARs
@@ -307,12 +326,13 @@ $ bin/pulsar-admin functions create \
 </TabItem>
 <TabItem value="Python">
 
-
 ```python
+
 class Tweet(object):
     def __init__(self, username, tweet_content):
         self.username = username
         self.tweet_content = tweet_content
+
 ```
 
 In order to use this class in Pulsar Functions, you have two options:
@@ -320,8 +340,8 @@ In order to use this class in Pulsar Functions, you have two options:
 1. You can specify `PickleSerDe`, which applies the [`pickle`](https://docs.python.org/3/library/pickle.html) library SerDe.
 2. You can create your own SerDe class. The following is an example.
 
+  ```python
 
-```python
 from pulsar import SerDe
 
 class TweetSerDe(SerDe):
@@ -332,7 +352,8 @@ class TweetSerDe(SerDe):
     def deserialize(self, input_bytes):
         tweet_components = str(input_bytes).split('|')
         return Tweet(tweet_components[0], tweet_componentsp[1])
-```
+
+  ```
 For complete code, see [here](https://github.com/apache/pulsar/blob/master/pulsar-functions/python-examples/custom_object_function.py).
 
 </TabItem>
@@ -380,8 +401,8 @@ Java, Python and Go SDKs provide access to a **context object** that can be used
 <TabItem value="Java">
 The [Context](https://github.com/apache/pulsar/blob/master/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Context.java) interface provides a number of methods that you can use to access the function [context](#context). The various method signatures for the `Context` interface are listed as follows.
 
-
 ```java
+
 public interface Context {
     Record<?> getCurrentRecord();
     Collection<String> getInputTopics();
@@ -414,12 +435,13 @@ public interface Context {
     PulsarAdmin getPulsarAdmin();
     PulsarAdmin getPulsarAdmin(String clusterName);
 }
+
 ```
 
 The following example uses several methods available via the `Context` object.
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 import org.slf4j.Logger;
@@ -444,6 +466,7 @@ public class ContextFunction implements Function<String, Void> {
         return null;
     }
 }
+
 ```
 
 </TabItem>
@@ -510,6 +533,7 @@ class ContextImpl(pulsar.Context):
     ...
   def get_state(self, key):
     ...
+
 ```
 
 </TabItem>
@@ -567,11 +591,11 @@ func (c *FunctionContext) GetCurrentRecord() pulsar.Message {
 func (c *FunctionContext) NewOutputMessage(topic string) pulsar.Producer {
 	return c.outputMessage(topic)
 }
+
 ```
 
 The following example uses several methods available via the `Context` object.
 
-
 ```
 import (
     "context"
@@ -586,6 +610,7 @@ func contextFunc(ctx context.Context) {
         fmt.Printf("function version is:%s\n", fc.GetFuncVersion())
     }
 }
+
 ```
 
 For complete code, see [here](https://github.com/apache/pulsar/blob/77cf09eafa4f1626a53a1fe2e65dd25f377c1127/pulsar-function-go/examples/contextFunc/contextFunc.go#L29-L34).
@@ -597,12 +622,13 @@ For complete code, see [here](https://github.com/apache/pulsar/blob/77cf09eafa4f
 ### User config
 When you run or update Pulsar Functions created using SDK, you can pass arbitrary key/values to them with the command line with the `--user-config` flag. Key/values must be specified as JSON. The following function creation command passes a user configured key/value to a function.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --name word-filter \
   # Other function configs
   --user-config '{"forbidden-word":"rosebud"}'
+
 ```
 
 <Tabs 
@@ -624,17 +650,18 @@ $ bin/pulsar-admin functions create \
 <TabItem value="Java"> 
 The Java SDK [`Context`](#context) object enables you to access key/value pairs provided to Pulsar Functions via the command line (as JSON). The following example passes a key/value pair.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   # Other function configs
   --user-config '{"word-of-the-day":"verdure"}'
+
 ```
 
 To access that value in a Java function:
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 import org.slf4j.Logger;
@@ -654,19 +681,21 @@ public class UserConfigFunction implements Function<String, Void> {
         return null;
     }
 }
+
 ```
 
 The `UserConfigFunction` function will log the string `"The word of the day is verdure"` every time the function is invoked (which means every time a message arrives). The `word-of-the-day` user config will be changed only when the function is updated with a new config value via the command line.
 
 You can also access the entire user config map or set a default value in case no value is present:
 
-
 ```java
+
 // Get the whole config map
 Map<String, String> allConfigs = context.getUserConfigMap();
 
 // Get value or resort to default
 String wotd = context.getUserConfigValueOrDefault("word-of-the-day", "perspicacious");
+
 ```
 
 > For all key/value pairs passed to Java functions, both the key *and* the value are `String`. To set the value to be a different type, you need to deserialize from the `String` type.
@@ -675,8 +704,8 @@ String wotd = context.getUserConfigValueOrDefault("word-of-the-day", "perspicaci
 <TabItem value="Python">
 In Python function, you can access the configuration value like this.
 
-
 ```python
+
 from pulsar import Function
 
 class WordFilter(Function):
@@ -690,21 +719,23 @@ class WordFilter(Function):
         # Otherwise publish the message
         else:
             return input
+
 ```
 
 The Python SDK [`Context`](#context) object enables you to access key/value pairs provided to Pulsar Functions via the command line (as JSON). The following example passes a key/value pair.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   # Other function configs \
   --user-config '{"word-of-the-day":"verdure"}'
+
 ```
 
 To access that value in a Python function:
 
-
 ```python
+
 from pulsar import Function
 
 class UserConfigFunction(Function):
@@ -715,23 +746,25 @@ class UserConfigFunction(Function):
             logger.warn('No word of the day provided')
         else:
             logger.info("The word of the day is {0}".format(wotd))
+
 ```
 </TabItem>
 <TabItem value="Go">
 
 The Go SDK [`Context`](#context) object enables you to access key/value pairs provided to Pulsar Functions via the command line (as JSON). The following example passes a key/value pair.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --go path/to/go/binary
   --user-config '{"word-of-the-day":"lackadaisical"}'
+
 ```
 
 To access that value in a Go function:
 
-
 ```go
+
 func contextFunc(ctx context.Context) {
   fc, ok := pf.FromContext(ctx)
   if !ok {
@@ -746,6 +779,7 @@ func contextFunc(ctx context.Context) {
     logutil.Infof("The word of the day is %s", wotd.(string))
   }
 }
+
 ```
 
 </TabItem>
@@ -773,8 +807,8 @@ func contextFunc(ctx context.Context) {
 <TabItem value="Java">
 Pulsar Functions that use the Java SDK have access to an [SLF4j](https://www.slf4j.org/) [`Logger`](https://www.slf4j.org/api/org/apache/log4j/Logger.html) object that can be used to produce logs at the chosen log level. The following example logs either a `WARNING`- or `INFO`-level log based on whether the incoming string contains the word `danger`.
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 import org.slf4j.Logger;
@@ -794,17 +828,19 @@ public class LoggingFunction implements Function<String, Void> {
         return null;
     }
 }
+
 ```
 
 If you want your function to produce logs, you need to specify a log topic when creating or running the function. The following is an example.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --jar my-functions.jar \
   --classname my.package.LoggingFunction \
   --log-topic persistent://public/default/logging-function-logs \
   # Other function configs
+
 ```
 
 All logs produced by `LoggingFunction` above can be accessed via the `persistent://public/default/logging-function-logs` topic.
@@ -813,8 +849,8 @@ All logs produced by `LoggingFunction` above can be accessed via the `persistent
 Additionally, you can use the XML file, `functions_log4j2.xml`, to customize the function log level. 
 To customize the function log level, create or update `functions_log4j2.xml` in your Pulsar conf directory (for example, `/etc/pulsar/` on bare-metal, or `/pulsar/conf` on Kubernetes) to contain contents such as:
 
-
 ```xml
+
 <Configuration>
     <name>pulsar-functions-instance</name>
     <monitorInterval>30</monitorInterval>
@@ -837,7 +873,7 @@ To customize the function log level, create or update `functions_log4j2.xml` in
             <name>Console</name>
             <target>SYSTEM_OUT</target>
             <PatternLayout>
-                <Pattern>%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Pattern>
+                <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%n</Pattern>
             </PatternLayout>
         </Console>
         <RollingFile>
@@ -846,7 +882,7 @@ To customize the function log level, create or update `functions_log4j2.xml` in
             <filePattern>${sys:pulsar.function.log.dir}/${sys:pulsar.function.log.file}-%d{MM-dd-yyyy}-%i.log.gz</filePattern>
             <immediateFlush>true</immediateFlush>
             <PatternLayout>
-                <Pattern>%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Pattern>
+                <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%n</Pattern>
             </PatternLayout>
             <Policies>
                 <TimeBasedTriggeringPolicy>
@@ -879,7 +915,7 @@ To customize the function log level, create or update `functions_log4j2.xml` in
             <filePattern>${sys:pulsar.function.log.dir}/${sys:pulsar.function.log.file}.bk-%d{MM-dd-yyyy}-%i.log.gz</filePattern>
             <immediateFlush>true</immediateFlush>
             <PatternLayout>
-                <Pattern>%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Pattern>
+                <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%n</Pattern>
             </PatternLayout>
             <Policies>
                 <TimeBasedTriggeringPolicy>
@@ -925,19 +961,23 @@ To customize the function log level, create or update `functions_log4j2.xml` in
         </Root>
     </Loggers>
 </Configuration>
+
 ```
 
 The properties set like:
 
 ```xml
+
         <Property>
             <name>pulsar.log.level</name>
             <value>debug</value>
         </Property>
+
 ```
 propagate to places where they are referenced, such as:
 
 ```xml
+
         <Root>
             <level>${sys:pulsar.log.level}</level>
             <AppenderRef>
@@ -945,12 +985,13 @@ propagate to places where they are referenced, such as:
                 <level>${sys:pulsar.log.level}</level>
             </AppenderRef>
         </Root>
+
 ```
 In the above example, debug level logging would be applied to ALL function logs. 
 This may be more verbose than you desire. To be more selective, you can apply different log levels to different classes or modules. For example:
 
-
 ```xml
+
         <Logger>
             <name>com.example.module</name>
             <level>info</level>
@@ -959,10 +1000,12 @@ This may be more verbose than you desire. To be more selective, you can apply di
                 <ref>${sys:pulsar.log.appender}</ref>
             </AppenderRef>
         </Logger>
+
 ```
 You can be more specific as well, such as applying a more verbose log level to a class in the module, such as:
 
 ```xml
+
         <Logger>
             <name>com.example.module.className</name>
             <level>debug</level>
@@ -971,6 +1014,7 @@ You can be more specific as well, such as applying a more verbose log level to a
                 <ref>Console</ref>
             </AppenderRef>
         </Logger>
+
 ```
 
 Each `<AppenderRef>` entry allows you to output the log to a target specified in the definition of the Appender.
@@ -980,27 +1024,30 @@ To disable additivity, specify
 
 ```xml 
 <additivity>false</additivity>
+
 ```
 as shown in examples above. Disabling additivity prevents duplication of log messages when one or more `<Logger>` entries contain classes or modules that overlap.
 
 The `<AppenderRef>` is defined in the `<Appenders>` section, such as:
 
 ```xml
+
 <Console>
   <name>Console</name>
   <target>SYSTEM_OUT</target>
   <PatternLayout>
-    <Pattern>%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Pattern>
+    <Pattern>%d{ISO8601_OFFSET_DATE_TIME_HHMM} [%t] %-5level %logger{36} - %msg%n</Pattern>
   </PatternLayout>
 </Console>
+
 ```
 
 </TabItem>
 <TabItem value="Python">
 Pulsar Functions that use the Python SDK have access to a logging object that can be used to produce logs at the chosen log level. The following example function that logs either a `WARNING`- or `INFO`-level log based on whether the incoming string contains the word `danger`.
 
-
 ```python
+
 from pulsar import Function
 
 class LoggingFunction(Function):
@@ -1011,17 +1058,19 @@ class LoggingFunction(Function):
             logger.warn("A warning was received in message {0}".format(context.get_message_id()))
         else:
             logger.info("Message {0} received\nContent: {1}".format(msg_id, input))
+
 ```
 
 If you want your function to produce logs on a Pulsar topic, you need to specify a **log topic** when creating or running the function. The following is an example.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --py logging_function.py \
   --classname logging_function.LoggingFunction \
   --log-topic logging-function-logs \
   # Other function configs
+
 ```
 
 All logs produced by `LoggingFunction` above can be accessed via the `logging-function-logs` topic.
@@ -1031,7 +1080,6 @@ Additionally, you can specify the function log level through the broker XML file
 <TabItem value="Go">
 The following Go Function example shows different log levels based on the function input.
 
-
 ```
 import (
     "context"
@@ -1052,6 +1100,7 @@ func loggerFunc(ctx context.Context, input []byte) {
 func main() {
 	pf.Start(loggerFunc)
 }
+
 ```
 
 When you use `logTopic` related functionalities in Go Function, import `github.com/apache/pulsar/pulsar-function-go/logutil`, and you do not have to use the `getLogger()` context object.
@@ -1078,7 +1127,6 @@ Pulsar Functions using the Java SDK has access to the Pulsar admin client, which
 
 Below is an example of how to use the Pulsar admin client exposed from the Function `context`.
 
-
 ```
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.functions.api.Context;
@@ -1107,17 +1155,18 @@ public class CursorManagementFunction implements Function<String, String> {
         return null;
     }
 }
+
 ```
 
 If you want your function to get access to the Pulsar admin client, you need to enable this feature by setting `exposeAdminClientEnabled=true` in the `functions_worker.yml` file. You can test whether this feature is enabled or not using the command `pulsar-admin functions localrun` with the flag `--web-service-url`.
 
-
 ```
 $ bin/pulsar-admin functions localrun \
  --jar my-functions.jar \
  --classname my.package.CursorManagementFunction \
  --web-service-url http://pulsar-web-service:8080 \
  # Other function configs
+
 ```
 
 </TabItem>
@@ -1126,17 +1175,20 @@ $ bin/pulsar-admin functions localrun \
 
 ## Metrics
 
-Pulsar Functions allows you to deploy and manage processing functions that consume messages from and publish messages to Pulsar topics easily. It is important to ensure that the running functions are healthy at any time. Pulsar Functions can publish arbitrary metrics to the metrics interface which can be queried. 
+Pulsar Functions allows you to deploy and manage processing functions that consume messages from and publish messages to Pulsar topics easily. It is important to ensure that the running functions are healthy at any time. Pulsar Functions can publish arbitrary metrics to the metrics interface which can be queried.
+
+:::note
+
+
+If a Pulsar Function uses the language-native interface for Java or Python, that function is not able to publish metrics and stats to Pulsar.
 
-> **Note**
-> 
-> If a Pulsar Function uses the language-native interface for Java or Python, that function is not able to publish metrics and stats to Pulsar.
+:::
 
 You can monitor Pulsar Functions that have been deployed with the following methods:
 
 - Check the metrics provided by Pulsar.
 
-  Pulsar Functions expose the metrics that can be collected and used for monitoring the health of **Java, Python, and Go** functions. You can check the metrics by following the [monitoring](deploy-monitoring.md) guide.
+  Pulsar Functions expose the metrics that can be collected and used for monitoring the health of **Java, Python, and Go** functions. You can check the metrics by following the [monitoring](deploy-monitoring) guide.
 
   For the complete list of the function metrics, see [here](reference-metrics.md#pulsar-functions).
 
@@ -1165,8 +1217,8 @@ Here are examples of how to customize metrics for Java and Python functions.
 <TabItem value="Java">
 You can record metrics using the [`Context`](#context) object on a per-key basis. For example, you can set a metric for the `process-count` key and a different metric for the `elevens-count` key every time the function processes a message. 
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 
@@ -1184,14 +1236,15 @@ public class MetricRecorderFunction implements Function<Integer, Void> {
         return null;
     }
 }
+
 ```
 
 </TabItem>
 <TabItem value="Python">
 You can record metrics using the [`Context`](#context) object on a per-key basis. For example, you can set a metric for the `process-count` key and a different metric for the `elevens-count` key every time the function processes a message. The following is an example.
 
-
 ```python
+
 from pulsar import Function
 
 class MetricRecorderFunction(Function):
@@ -1200,6 +1253,7 @@ class MetricRecorderFunction(Function):
 
         if input == 11:
             context.record_metric('elevens-count', 1)
+
 ```
 </TabItem>
 <TabItem value="Go">
@@ -1211,7 +1265,7 @@ Currently, the feature is not available in Go.
 
 ## Security
 
-If you want to enable security on Pulsar Functions, first you should enable security on [Functions Workers](functions-worker.md). For more details, refer to [Security settings](functions-worker.md#security-settings).
+If you want to enable security on Pulsar Functions, first you should enable security on [Functions Workers](functions-worker). For more details, refer to [Security settings](functions-worker.md#security-settings).
 
 Pulsar Functions can support the following providers:
 
@@ -1241,8 +1295,8 @@ At the same time, Pulsar Functions provides two interfaces, **SecretsProvider**
 <TabItem value="Java">
 You can get secret provider using the [`Context`](#context) object. The following is an example:
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 import org.slf4j.Logger;
@@ -1263,14 +1317,15 @@ public class GetSecretProviderFunction implements Function<String, Void> {
         return null;
     }
 }
+
 ```
 
 </TabItem>
 <TabItem value="Python">
 You can get secret provider using the [`Context`](#context) object. The following is an example:
 
-
 ```python
+
 from pulsar import Function
 
 class GetSecretProviderFunction(Function):
@@ -1281,8 +1336,8 @@ class GetSecretProviderFunction(Function):
             logger.warn('No secret provider')
         else:
             logger.info("The secret provider is {0}".format(secret_provider))
-```
 
+```
 
 </TabItem>
 <TabItem value="Go">
@@ -1301,8 +1356,11 @@ States are key-value pairs, where the key is a string and the value is arbitrary
 
 You can access states within Pulsar Java Functions using the `putState`, `putStateAsync`, `getState`, `getStateAsync`, `incrCounter`, `incrCounterAsync`,  `getCounter`, `getCounterAsync` and `deleteState` calls on the context object. You can access states within Pulsar Python Functions using the `putState`, `getState`, `incrCounter`, `getCounter` and `deleteState` calls on the context object. You can also manage states using the [querystate](#query-state) and [putstate](#putstate) option [...]
 
-> Note  
-> State storage is not available in Go.
+:::note
+
+State storage is not available in Go.
+
+:::
 
 ### API
 
@@ -1323,22 +1381,23 @@ Currently Pulsar Functions expose the following APIs for mutating and accessing
 
 #### incrCounter
 
-
 ```java
+
     /**
      * Increment the builtin distributed counter referred by key
      * @param key The name of the key
      * @param amount The amount to be incremented
      */
     void incrCounter(String key, long amount);
+
 ```
 
 The application can use `incrCounter` to change the counter of a given `key` by the given `amount`.
 
 #### incrCounterAsync
 
-
 ```java
+
      /**
      * Increment the builtin distributed counter referred by key
      * but dont wait for the completion of the increment operation
@@ -1347,14 +1406,15 @@ The application can use `incrCounter` to change the counter of a given `key` by
      * @param amount The amount to be incremented
      */
     CompletableFuture<Void> incrCounterAsync(String key, long amount);
+
 ```
 
 The application can use `incrCounterAsync` to asynchronously change the counter of a given `key` by the given `amount`.
 
 #### getCounter
 
-
 ```java
+
     /**
      * Retrieve the counter value for the key.
      *
@@ -1362,6 +1422,7 @@ The application can use `incrCounterAsync` to asynchronously change the counter
      * @return the amount of the counter value for this key
      */
     long getCounter(String key);
+
 ```
 
 The application can use `getCounter` to retrieve the counter of a given `key` mutated by `incrCounter`.
@@ -1371,8 +1432,8 @@ general key/value state.
 
 #### getCounterAsync
 
-
 ```java
+
      /**
      * Retrieve the counter value for the key, but don't wait
      * for the operation to be completed
@@ -1381,14 +1442,15 @@ general key/value state.
      * @return the amount of the counter value for this key
      */
     CompletableFuture<Long> getCounterAsync(String key);
+
 ```
 
 The application can use `getCounterAsync` to asynchronously retrieve the counter of a given `key` mutated by `incrCounterAsync`.
 
 #### putState
 
-
 ```java
+
     /**
      * Update the state value for the key.
      *
@@ -1396,12 +1458,13 @@ The application can use `getCounterAsync` to asynchronously retrieve the counter
      * @param value state value of the key
      */
     void putState(String key, ByteBuffer value);
+
 ```
 
 #### putStateAsync
 
-
 ```java
+
     /**
      * Update the state value for the key, but don't wait for the operation to be completed
      *
@@ -1409,14 +1472,15 @@ The application can use `getCounterAsync` to asynchronously retrieve the counter
      * @param value state value of the key
      */
     CompletableFuture<Void> putStateAsync(String key, ByteBuffer value);
+
 ```
 
 The application can use `putStateAsync` to asynchronously update the state of a given `key`.
 
 #### getState
 
-
 ```java
+
     /**
      * Retrieve the state value for the key.
      *
@@ -1424,12 +1488,13 @@ The application can use `putStateAsync` to asynchronously update the state of a
      * @return the state value for the key.
      */
     ByteBuffer getState(String key);
+
 ```
 
 #### getStateAsync
 
-
 ```java
+
     /**
      * Retrieve the state value for the key, but don't wait for the operation to be completed
      *
@@ -1437,19 +1502,21 @@ The application can use `putStateAsync` to asynchronously update the state of a
      * @return the state value for the key.
      */
     CompletableFuture<ByteBuffer> getStateAsync(String key);
+
 ```
 
 The application can use `getStateAsync` to asynchronously retrieve the state of a given `key`.
 
 #### deleteState
 
-
 ```java
+
     /**
      * Delete the state value for the key.
      *
      * @param key   name of the key
      */
+
 ```
 
 Counters and binary values share the same keyspace, so this deletes either type.
@@ -1460,10 +1527,11 @@ Currently Pulsar Functions expose the following APIs for mutating and accessing
 
 #### incr_counter
 
-
 ```python
+
   def incr_counter(self, key, amount):
     """incr the counter of a given key in the managed state"""
+
 ```
 
 Application can use `incr_counter` to change the counter of a given `key` by the given `amount`.
@@ -1471,10 +1539,11 @@ If the `key` does not exist, a new key is created.
 
 #### get_counter
 
-
 ```python
+
   def get_counter(self, key):
     """get the counter of a given key in the managed state"""
+
 ```
 
 Application can use `get_counter` to retrieve the counter of a given `key` mutated by `incrCounter`.
@@ -1484,28 +1553,31 @@ general key/value state.
 
 #### put_state
 
-
 ```python
+
   def put_state(self, key, value):
     """update the value of a given key in the managed state"""
+
 ```
 
 The key is a string, and the value is arbitrary binary data.
 
 #### get_state
 
-
 ```python
+
   def get_state(self, key):
     """get the value of a given key in the managed state"""
+
 ```
 
 #### del_counter
 
-
 ```python
+
   def del_counter(self, key):
     """delete the counter of a given key in the managed state"""
+
 ```
 
 Counters and binary values share the same keyspace, so this deletes either type.
@@ -1520,8 +1592,8 @@ A Pulsar Function can use the [State API](#api) for storing state into Pulsar's
 and retrieving state back from Pulsar's state storage. Additionally Pulsar also provides
 CLI commands for querying its state.
 
-
 ```shell
+
 $ bin/pulsar-admin functions querystate \
     --tenant <tenant> \
     --namespace <namespace> \
@@ -1529,6 +1601,7 @@ $ bin/pulsar-admin functions querystate \
     --state-storage-url <bookkeeper-service-url> \
     --key <state-key> \
     [---watch]
+
 ```
 
 If `--watch` is specified, the CLI will watch the value of the provided `state-key`.
@@ -1549,11 +1622,11 @@ If `--watch` is specified, the CLI will watch the value of the provided `state-k
 ]}>
 <TabItem value="Java">
 
-{@inject: github:`WordCountFunction`:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java} is a very good example
+{@inject: github:WordCountFunction:/pulsar-functions/java-examples/src/main/java/org/apache/pulsar/functions/api/examples/WordCountFunction.java} is a very good example
 demonstrating on how Application can easily store `state` in Pulsar Functions.
 
-
 ```java
+
 import org.apache.pulsar.functions.api.Context;
 import org.apache.pulsar.functions.api.Function;
 
@@ -1566,6 +1639,7 @@ public class WordCountFunction implements Function<String, Void> {
         return null;
     }
 }
+
 ```
 
 The logic of this `WordCount` function is pretty simple and straightforward:
@@ -1576,14 +1650,15 @@ The logic of this `WordCount` function is pretty simple and straightforward:
 </TabItem>
 <TabItem value="Python">
 
-
 ```python
+
 from pulsar import Function
 
 class WordCount(Function):
     def process(self, item, context):
         for word in item.split():
             context.incr_counter(word, 1)
+
 ```
 
 The logic of this `WordCount` function is pretty simple and straightforward:
diff --git a/site2/website-next/versioned_docs/version-2.8.0/functions-overview.md b/site2/website-next/versioned_docs/version-2.8.0/functions-overview.md
index 5d2d41b..9cf5d18 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/functions-overview.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/functions-overview.md
@@ -60,8 +60,8 @@ If you implement the classic word count example using Pulsar Functions, it looks
 
 To write the function in Java with [Pulsar Functions SDK for Java](functions-develop.md#available-apis), you can write the function as follows.
 
-
 ```java
+
 package org.example.functions;
 
 import org.apache.pulsar.functions.api.Context;
@@ -80,12 +80,13 @@ public class WordCountFunction implements Function<String, Void> {
         return null;
     }
 }
+
 ```
 
 Bundle and build the JAR file to be deployed, and then deploy it in your Pulsar cluster using the [command line](functions-deploy.md#command-line-interface) as follows.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --jar target/my-jar-with-dependencies.jar \
   --classname org.example.functions.WordCountFunction \
@@ -94,6 +95,7 @@ $ bin/pulsar-admin functions create \
   --name word-count \
   --inputs persistent://public/default/sentences \
   --output persistent://public/default/count
+
 ```
 
 ### Content-based routing example
@@ -106,8 +108,8 @@ For example, a function takes items (strings) as input and publishes them to eit
 
 If you implement this routing functionality in Python, it looks something like this:
 
-
 ```python
+
 from pulsar import Function
 
 class RoutingFunction(Function):
@@ -131,12 +133,13 @@ class RoutingFunction(Function):
         else:
             warning = "The item {0} is neither a fruit nor a vegetable".format(item)
             context.get_logger().warn(warning)
+
 ```
 
 If this code is stored in `~/router.py`, then you can deploy it in your Pulsar cluster using the [command line](functions-deploy.md#command-line-interface) as follows.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --py ~/router.py \
   --classname router.RoutingFunction \
@@ -144,6 +147,7 @@ $ bin/pulsar-admin functions create \
   --namespace default \
   --name route-fruit-veg \
   --inputs persistent://public/default/basket-items
+
 ```
 
 ### Functions, messages and message types
@@ -155,15 +159,16 @@ Pulsar Functions take byte arrays as inputs and spit out byte arrays as output.
 ## Fully Qualified Function Name (FQFN)
 Each Pulsar Function has a **Fully Qualified Function Name** (FQFN) that consists of three elements: the function tenant, namespace, and function name. FQFN looks like this:
 
-
 ```http
+
 tenant/namespace/name
+
 ```
 
 FQFNs enable you to create multiple functions with the same name provided that they are in different namespaces.
 
 ## Supported languages
-Currently, you can write Pulsar Functions in Java, Python, and Go. For details, refer to [Develop Pulsar Functions](functions-develop.md).
+Currently, you can write Pulsar Functions in Java, Python, and Go. For details, refer to [Develop Pulsar Functions](functions-develop).
 
 ## Processing guarantees
 Pulsar Functions provide three different messaging semantics that you can apply to any function.
@@ -178,12 +183,13 @@ Delivery semantics | Description
 ### Apply processing guarantees to a function
 You can set the processing guarantees for a Pulsar Function when you create the Function. The following [`pulsar-function create`](reference-pulsar-admin.md#create-1) command creates a function with effectively-once guarantees applied.
 
-
 ```bash
+
 $ bin/pulsar-admin functions create \
   --name my-effectively-once-function \
   --processing-guarantees EFFECTIVELY_ONCE \
   # Other function configs
+
 ```
 
 The available options for `--processing-guarantees` are:
@@ -197,9 +203,10 @@ The available options for `--processing-guarantees` are:
 ### Update the processing guarantees of a function
 You can change the processing guarantees applied to a function using the [`update`](reference-pulsar-admin.md#update-1) command. The following is an example.
 
-
 ```bash
+
 $ bin/pulsar-admin functions update \
   --processing-guarantees ATMOST_ONCE \
   # Other function configs
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/functions-package.md b/site2/website-next/versioned_docs/version-2.8.0/functions-package.md
index 28db441..c0e4188 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/functions-package.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/functions-package.md
@@ -11,12 +11,15 @@ import TabItem from '@theme/TabItem';
 
 You can package Pulsar functions in Java, Python, and Go. Packaging the window function in Java is the same as [packaging a function in Java](#java).
 
-> **Note**    
-> Currently, the window function is not available in Python and Go.
+:::note
+
+Currently, the window function is not available in Python and Go.
+
+:::
 
 ## Prerequisite
 
-Before running a Pulsar function, you need to start Pulsar. You can [run a standalone Pulsar in Docker](getting-started-docker.md), or [run Pulsar in Kubernetes](getting-started-helm.md).
+Before running a Pulsar function, you need to start Pulsar. You can [run a standalone Pulsar in Docker](getting-started-docker.md), or [run Pulsar in Kubernetes](getting-started-helm).
 
 To check whether the Docker image starts, you can use the `docker ps` command.
 
@@ -26,8 +29,8 @@ To package a function in Java, complete the following steps.
 
 1. Create a new maven project with a pom file. In the following code sample, the value of `mainClass` is your package name.
 
+    ```Java
 
-```Java
     <?xml version="1.0" encoding="UTF-8"?>
     <project xmlns="http://maven.apache.org/POM/4.0.0"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -83,12 +86,12 @@ To package a function in Java, complete the following steps.
         </build>
 
     </project>
-```
 
-2. Write a Java function.
+    ```
 
+2. Write a Java function.
 
-```
+    ```
     package org.example.test;
 
     import java.util.function.Function;
@@ -99,7 +102,8 @@ To package a function in Java, complete the following steps.
             return "This is my function!";
         }
     }
-```
+
+    ```
  
      For the imported package, you can use one of the following interfaces:
     - Function interface provided by Java 8: `java.util.function.Function`
@@ -109,8 +113,7 @@ To package a function in Java, complete the following steps.
 
     The following example uses `org.apache.pulsar.functions.api.Function` interface with context.
 
-
-```
+    ```
     package org.example.functions;
     import org.apache.pulsar.functions.api.Context;
     import org.apache.pulsar.functions.api.Function;
@@ -127,14 +130,16 @@ To package a function in Java, complete the following steps.
            return null;
        }
      }
-```
+
+     ```
 
 3. Package the Java function.
 
+    ```bash
 
-```bash
     mvn package
-```
+
+    ```
 
     After the Java function is packaged, a `target` directory is created automatically. Open the `target` directory to check if there is a JAR package similar to `java-function-1.0-SNAPSHOT.jar`.
 
@@ -143,16 +148,17 @@ To package a function in Java, complete the following steps.
 
      (1) Copy the packaged jar file to the Pulsar image.
 
+    ```bash
 
-```bash
     docker exec -it [CONTAINER ID] /bin/bash
     docker cp <path of java-function-1.0-SNAPSHOT.jar>  CONTAINER ID:/pulsar
-```
+
+    ```
 
     (2) Run the Java function using the following command.
 
+    ```bash
 
-```bash
     ./bin/pulsar-admin functions localrun \
     --classname org.example.test.ExclamationFunction \
     --jar java-function-1.0-SNAPSHOT.jar \
@@ -161,16 +167,18 @@ To package a function in Java, complete the following steps.
     --tenant public \
     --namespace default \
     --name JavaFunction
-```
+
+    ```
 
     The following log indicates that the Java function starts successfully.
 
+    ```text
 
-```text
     ...
     07:55:03.724 [main] INFO  org.apache.pulsar.functions.runtime.ProcessRuntime - Started process successfully
     ...
-```
+
+    ```
 
 ## Python 
 
@@ -186,8 +194,7 @@ To package a function with **one python file** in Python, complete the following
 
 1. Write a Python function.
 
-
-```
+    ```
     from pulsar import Function //  import the Function module from Pulsar
 
     # The classic ExclamationFunction that appends an exclamation at the end
@@ -198,7 +205,8 @@ To package a function with **one python file** in Python, complete the following
 
       def process(self, input, context):
         return input + '!'
-```
+
+    ```
 
     In this example, when you write a Python function, you need to inherit the Function class and implement the `process()` method.
 
@@ -212,25 +220,27 @@ To package a function with **one python file** in Python, complete the following
 
     The implementation of a Python function depends on the Python client, so before deploying a Python function, you need to install the corresponding version of the Python client. 
 
+    ```bash
 
-```bash
     pip install python-client==2.6.0
-```
+
+    ```
 
 3. Run the Python Function.
 
     (1) Copy the Python function file to the Pulsar image.
 
+    ```bash
 
-```bash
     docker exec -it [CONTAINER ID] /bin/bash
     docker cp <path of Python function file>  CONTAINER ID:/pulsar
-```
+
+    ```
 
     (2) Run the Python function using the following command.
 
+    ```bash
 
-```bash
     ./bin/pulsar-admin functions localrun \
     --classname org.example.test.ExclamationFunction \
     --py <path of Python Function file> \
@@ -239,16 +249,18 @@ To package a function with **one python file** in Python, complete the following
     --tenant public \
     --namespace default \
     --name PythonFunction
-```
+
+    ```
 
     The following log indicates that the Python function starts successfully.
 
+    ```text
 
-```text
     ...
     07:55:03.724 [main] INFO  org.apache.pulsar.functions.runtime.ProcessRuntime - Started process successfully
     ...
-```
+
+    ```
 
 ### ZIP file
 
@@ -258,38 +270,41 @@ To package a function with the **ZIP file** in Python, complete the following st
 
     The following is required when packaging the ZIP file of the Python Function.
 
+    ```text
 
-```text
     Assuming the zip file is named as `func.zip`, unzip the `func.zip` folder:
         "func/src"
         "func/requirements.txt"
         "func/deps"
-```
+
+    ```
     Take [exclamation.zip](https://github.com/apache/pulsar/tree/master/tests/docker-images/latest-version-image/python-examples) as an example. The internal structure of the example is as follows.
 
+    ```text
 
-```text
     .
     ├── deps
     │   └── sh-1.12.14-py2.py3-none-any.whl
     └── src
         └── exclamation.py
-```
+
+    ```
 
 2. Run the Python Function.
 
     (1) Copy the ZIP file to the Pulsar image.
 
+    ```bash
 
-```bash
     docker exec -it [CONTAINER ID] /bin/bash
     docker cp <path of ZIP file>  CONTAINER ID:/pulsar
-```
+
+    ```
 
     (2) Run the Python function using the following command.
 
+    ```bash
 
-```bash
     ./bin/pulsar-admin functions localrun \
     --classname exclamation \
     --py <path of ZIP file> \
@@ -298,16 +313,18 @@ To package a function with the **ZIP file** in Python, complete the following st
     --tenant public \
     --namespace default \
     --name PythonFunction
-```
+
+    ```
 
     The following log indicates that the Python function starts successfully.
 
+    ```text
 
-```text
     ...
     07:55:03.724 [main] INFO  org.apache.pulsar.functions.runtime.ProcessRuntime - Started process successfully
     ...
-```
+
+    ```
 
 ### PIP
 
@@ -315,16 +332,16 @@ The PIP method is only supported in Kubernetes runtime. To package a function wi
 
 1. Configure the `functions_worker.yml` file.
 
+    ```text
 
-```text
     #### Kubernetes Runtime ####
     installUserCodeDependencies: true
-```
 
-2. Write your Python Function.
+    ```
 
+2. Write your Python Function.
 
-```
+    ```
     from pulsar import Function
     import js2xml
 
@@ -337,28 +354,30 @@ The PIP method is only supported in Kubernetes runtime. To package a function wi
      def process(self, input, context):
       // add your logic
       return input + '!'
-```
+
+    ```
 
     You can introduce additional dependencies. When Python Function detects that the file currently used is `whl` and the `installUserCodeDependencies` parameter is specified, the system uses the `pip install` command to install the dependencies required in Python Function.
 
 3. Generate the `whl` file.
 
-
-```shell script
+    ```shell script
     $ cd $PULSAR_HOME/pulsar-functions/scripts/python
     $ chmod +x generate.sh
     $ ./generate.sh <path of your Python Function> <path of the whl output dir> <the version of whl>
     # e.g: ./generate.sh /path/to/python /path/to/python/output 1.0.0
-```
+
+    ```
 
     The output is written in `/path/to/python/output`:
 
+    ```text
 
-```text
     -rw-r--r--  1 root  staff   1.8K  8 27 14:29 pulsarfunction-1.0.0-py2-none-any.whl
     -rw-r--r--  1 root  staff   1.4K  8 27 14:29 pulsarfunction-1.0.0.tar.gz
     -rw-r--r--  1 root  staff     0B  8 27 14:29 pulsarfunction.whl
-```
+
+    ```
 
 ## Go 
 
@@ -368,8 +387,7 @@ To package a function in Go, complete the following steps.
 
     Currently, Go function can be **only** implemented using SDK and the interface of the function is exposed in the form of SDK. Before using the Go function, you need to import "github.com/apache/pulsar/pulsar-function-go/pf". 
 
-
-```
+    ```
     import (
         "context"
         "fmt"
@@ -385,24 +403,26 @@ To package a function in Go, complete the following steps.
     func main() {
         pf.Start(HandleRequest)
     }
-```
+
+    ```
 
     You can use context to connect to the Go function.
     
 
-```
+    ```
     if fc, ok := pf.FromContext(ctx); ok {
         fmt.Printf("function ID is:%s, ", fc.GetFuncID())
         fmt.Printf("function version is:%s\n", fc.GetFuncVersion())
      }
-```
+
+     ```
 
     When writing a Go function, remember that
     - In `main()`, you **only** need to register the function name to `Start()`. **Only** one function name is received in `Start()`. 
     - Go function uses Go reflection, which is based on the received function name, to verify whether the parameter list and returned value list are correct. The parameter list and returned value list **must be** one of the following sample functions:
     
 
-```
+      ```
        func ()
        func () error
        func (input) error
@@ -412,29 +432,30 @@ To package a function in Go, complete the following steps.
        func (context.Context, input) error
        func (context.Context) (output, error)
        func (context.Context, input) (output, error)
-```
 
-2. Build the Go function.
+       ```
 
+2. Build the Go function.
 
-```
+    ```
     go build <your Go Function filename>.go 
-```
+
+    ```
 
 3. Run the Go Function.
 
     (1) Copy the Go function file to the Pulsar image.
 
+    ```bash
 
-```bash
     docker exec -it [CONTAINER ID] /bin/bash
     docker cp <your go function path>  CONTAINER ID:/pulsar
-```
 
-    (2) Run the Go function with the following command.
+    ```
 
+    (2) Run the Go function with the following command.
 
-```
+    ```
     ./bin/pulsar-admin functions localrun \
         --go [your go function path] 
         --inputs [input topics] \
@@ -442,23 +463,26 @@ To package a function in Go, complete the following steps.
         --tenant [default:public] \
         --namespace [default:default] \
         --name [custom unique go function name] 
-```
+
+    ```
 
     The following log indicates that the Go function starts successfully.
 
+    ```text
 
-```text
     ...
     07:55:03.724 [main] INFO  org.apache.pulsar.functions.runtime.ProcessRuntime - Started process successfully
     ...
-```
+
+    ```
 
 ## Start Functions in cluster mode
 If you want to start a function in cluster mode, replace `localrun` with `create` in the commands above. The following log indicates that your function starts successfully.
 
+ ```text
 
-```text
    "Created successfully"
-```
+
+   ```
 
 For information about parameters on `--classname`, `--jar`, `--py`, `--go`, `--inputs`, run the command `./bin/pulsar-admin functions` or see [here](reference-pulsar-admin.md#functions).
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/functions-runtime.md b/site2/website-next/versioned_docs/version-2.8.0/functions-runtime.md
index 55f746a..9aeb676 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/functions-runtime.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/functions-runtime.md
@@ -15,8 +15,11 @@ You can use the following methods to run functions.
 - *Process*: Invoke functions in processes forked by functions worker.
 - *Kubernetes*: Submit functions as Kubernetes StatefulSets by functions worker.
 
-> **Note**  
-> Pulsar supports adding labels to the Kubernetes StatefulSets and services while launching functions, which facilitates selecting the target Kubernetes objects.
+:::note
+
+Pulsar supports adding labels to the Kubernetes StatefulSets and services while launching functions, which facilitates selecting the target Kubernetes objects.
+
+:::
 
 The differences of the thread and process modes are:
 - Thread mode: when a function runs in thread mode, it runs on the same Java virtual machine (JVM) with functions worker.
@@ -25,11 +28,12 @@ The differences of the thread and process modes are:
 ## Configure thread runtime
 It is easy to configure *Thread* runtime. In most cases, you do not need to configure anything. You can customize the thread group name with the following settings:
 
-
 ```yaml
+
 functionRuntimeFactoryClassName: org.apache.pulsar.functions.runtime.thread.ThreadRuntimeFactory
 functionRuntimeFactoryConfigs:
   threadGroupName: "Your Function Container Group"
+
 ```
 
 *Thread* runtime is only supported in Java function.
@@ -37,8 +41,8 @@ functionRuntimeFactoryConfigs:
 ## Configure process runtime
 When you enable *Process* runtime, you do not need to configure anything.
 
-
 ```yaml
+
 functionRuntimeFactoryClassName: org.apache.pulsar.functions.runtime.process.ProcessRuntimeFactory
 functionRuntimeFactoryConfigs:
   # the directory for storing the function logs
@@ -49,6 +53,7 @@ functionRuntimeFactoryConfigs:
   pythonInstanceLocation:
   # change the extra dependencies location:
   extraFunctionDependenciesDir:
+
 ```
 
 *Process* runtime is supported in Java, Python, and Go functions.
@@ -61,16 +66,19 @@ The manifests, generated by the functions worker, include a `StatefulSet`, a `Se
 
 The Kubernetes runtime supports secrets, so you can create a Kubernetes secret and expose it as an environment variable in the pod. The Kubernetes runtime is extensible, you can implement classes and customize the way how to generate Kubernetes manifests, how to pass auth data to pods, and how to integrate secrets.
 
-> **Tip**
-> 
-> For the rules of translating Pulsar object names into Kubernetes resource labels, see [here](admin-api-overview.md#how-to-define-pulsar-resource-names-when-running-pulsar-in-kubernetes).
+:::tip
+
+
+For the rules of translating Pulsar object names into Kubernetes resource labels, see [here](admin-api-overview.md#how-to-define-pulsar-resource-names-when-running-pulsar-in-kubernetes).
+
+:::
 
 ### Basic configuration
 
 It is easy to configure Kubernetes runtime. You can just uncomment the settings of `kubernetesContainerFactory` in the `functions_worker.yaml` file. The following is an example.
 
-
 ```yaml
+
 functionRuntimeFactoryClassName: org.apache.pulsar.functions.runtime.kubernetes.KubernetesRuntimeFactory
 functionRuntimeFactoryConfigs:
   # uri to kubernetes cluster, leave it to empty and it will use the kubernetes settings in function worker
@@ -144,6 +152,7 @@ functionRuntimeFactoryConfigs:
   extraFunctionDependenciesDir:
   # Additional memory padding added on top of the memory requested by the function per on a per instance basis
   percentMemoryPadding: 10
+
 ```
 
 If you run functions worker embedded in a broker on Kubernetes, you can use the default settings. 
@@ -154,10 +163,11 @@ If you run functions worker standalone (that is, not embedded) on Kubernetes, yo
 
 For example, both Pulsar brokers and Function Workers run in the `pulsar` K8S namespace. The brokers have a service called `brokers` and the functions worker has a service called `func-worker`. The settings are as follows:
 
-
 ```yaml
+
 pulsarServiceUrl: pulsar://broker.pulsar:6650 // or pulsar+ssl://broker.pulsar:6651 if using TLS
 pulsarAdminUrl: http://func-worker.pulsar:8080 // or https://func-worker:8443 if using TLS
+
 ```
 
 ### Run RBAC in Kubernetes clusters
@@ -171,8 +181,8 @@ If you run RBAC in your Kubernetes cluster, make sure that the service account y
 
 The following is sufficient:
 
-
 ```yaml
+
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
@@ -208,11 +218,13 @@ roleRef:
 subjectsKubernetesSec:
 - kind: ServiceAccount
   name: functions-worker
+
 ```
 
 If the service-account is not properly configured, an error message similar to this is displayed:
 
 ```bash
+
 22:04:27.696 [Timer-0] ERROR org.apache.pulsar.functions.runtime.KubernetesRuntimeFactory - Error while trying to fetch configmap example-pulsar-4qvmb5gur3c6fc9dih0x1xn8b-function-worker-config at namespace pulsar
 io.kubernetes.client.ApiException: Forbidden
 	at io.kubernetes.client.ApiClient.handleResponse(ApiClient.java:882) ~[io.kubernetes-client-java-2.0.0.jar:?]
@@ -223,6 +235,7 @@ io.kubernetes.client.ApiException: Forbidden
 	at org.apache.pulsar.functions.runtime.KubernetesRuntimeFactory$1.run(KubernetesRuntimeFactory.java:275) [org.apache.pulsar-pulsar-functions-runtime-2.4.0-42c3bf949.jar:2.4.0-42c3bf949]
 	at java.util.TimerThread.mainLoop(Timer.java:555) [?:1.8.0_212]
 	at java.util.TimerThread.run(Timer.java:505) [?:1.8.0_212]
+
 ```
 
 ### Integrate Kubernetes secrets
@@ -231,8 +244,8 @@ In order to safely distribute secrets, Pulasr Functions can reference Kubernetes
 
 You can create a secret in the namespace where your functions are deployed. For example, you deploy functions to the `pulsar-func` Kubernetes namespace, and you have a secret named `database-creds` with a field name `password`, which you want to mount in the pod as an environment variable called `DATABASE_PASSWORD`. The following functions configuration enables you to reference that secret and mount the value as an environment variable in the pod.
 
-
 ```Yaml
+
 tenant: "mytenant"
 namespace: "mynamespace"
 name: "myfunction"
@@ -255,17 +268,21 @@ The `org.apache.pulsar.functions.auth.KubernetesFunctionAuthProvider` interface
 
 Pulsar includes an implementation of this interface for token authentication, and distributes the certificate authority via the same implementation. The configuration is similar as follows:
 
-
 ```Yaml
+
 functionAuthProviderClassName: org.apache.pulsar.functions.auth.KubernetesSecretsTokenAuthProvider
+
 ```
 
 For token authentication, the functions worker captures the token that is used to deploy (or update) the function. The token is saved as a secret and mounted into the pod.
 
 For custom authentication or TLS, you need to implement this interface or use an alternative mechanism to provide authentication. If you use token authentication and TLS encryption to secure the communication with the cluster, Pulsar passes your certificate authority (CA) to the client, so the client obtains what it needs to authenticate the cluster, and trusts the cluster with your signed certificate.
 
-> **Note**   
-> If you use tokens that expire when deploying functions, these tokens will expire.
+:::note
+
+If you use tokens that expire when deploying functions, these tokens will expire.
+
+:::
 
 ### Run clusters with authentication
 
@@ -273,8 +290,8 @@ When you run a functions worker in a standalone process (that is, not embedded i
 
 For example, if you use token authentication, you need to configure the following properties in the `function-worker.yml` file.
 
-
 ```Yaml
+
 clientAuthenticationPlugin: org.apache.pulsar.client.impl.auth.AuthenticationToken
 clientAuthenticationParameters: file:///etc/pulsar/token/admin-token.txt
 configurationStoreServers: zookeeper-cluster:2181 # auth requires a connection to zookeeper
@@ -288,10 +305,14 @@ superUserRoles:
 properties:
   tokenSecretKey: file:///etc/pulsar/jwt/secret # if using a secret token, key file must be DER-encoded
   tokenPublicKey: file:///etc/pulsar/jwt/public.key # if using public/private key tokens, key file must be DER-encoded
+
 ```
 
-> **Note**   
-> You must configure both the Function Worker authorization or authentication for the server to authenticate requests and configure the client to be authenticated to communicate with the broker.
+:::note
+
+You must configure both the Function Worker authorization or authentication for the server to authenticate requests and configure the client to be authenticated to communicate with the broker.
+
+:::
 
 ### Customize Kubernetes runtime
 
@@ -305,8 +326,8 @@ Pulsar includes a built-in implementation. To use the basic implementation, set
 
 Below is an example of `customRuntimeOptions`.
 
-
 ```json
+
 {
   "jobName": "jobname", // the k8s pod name to run this function instance
   "jobNamespace": "namespace", // the k8s namespace to run this function in
@@ -337,6 +358,7 @@ Below is an example of `customRuntimeOptions`.
     }
   }
 }
+
 ```
 
 ## Run clusters with geo-replication
@@ -345,16 +367,18 @@ If you run multiple clusters tied together with geo-replication, it is important
 
 For example, if you have two clusters: `east-1` and `west-1`, you can configure the functions workers for `east-1` and `west-1` perspectively as follows.
 
-
 ```Yaml
+
 pulsarFunctionsCluster: east-1
 pulsarFunctionsNamespace: public/functions-east-1
-```
 
+```
 
 ```Yaml
+
 pulsarFunctionsCluster: west-1
 pulsarFunctionsNamespace: public/functions-west-1
+
 ```
 
 This ensures the two different Functions Workers use distinct sets of topics for their internal coordination.
@@ -365,8 +389,8 @@ When configuring a standalone functions worker, you need to configure properties
 
 You need to configure the following required properties.
 
-
 ```Yaml
+
 workerPort: 8080
 workerPortTls: 8443 # when using TLS
 tlsCertificateFilePath: /etc/pulsar/tls/tls.crt # when using TLS
diff --git a/site2/website-next/versioned_docs/version-2.8.0/functions-worker.md b/site2/website-next/versioned_docs/version-2.8.0/functions-worker.md
index 7c0482f..81c76ce 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/functions-worker.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/functions-worker.md
@@ -8,14 +8,17 @@ original_id: functions-worker
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-Before using Pulsar Functions, you need to learn how to set up Pulsar Functions worker and how to [configure Functions runtime](functions-runtime.md).  
+Before using Pulsar Functions, you need to learn how to set up Pulsar Functions worker and how to [configure Functions runtime](functions-runtime).  
 
 Pulsar `functions-worker` is a logic component to run Pulsar Functions in cluster mode. Two options are available, and you can select either based on your requirements. 
 - [run with brokers](#run-functions-worker-with-brokers)
 - [run it separately](#run-functions-worker-separately) in a different broker
 
-> Note  
-> The `--- Service Urls---` lines in the following diagrams represent Pulsar service URLs that Pulsar client and admin use to connect to a Pulsar cluster.
+:::note
+
+The `--- Service Urls---` lines in the following diagrams represent Pulsar service URLs that Pulsar client and admin use to connect to a Pulsar cluster.
+
+:::
 
 ## Run Functions-worker with brokers
 
@@ -25,9 +28,10 @@ The following diagram illustrates the deployment of functions-workers running al
 
 To enable functions-worker running as part of a broker, you need to set `functionsWorkerEnabled` to `true` in the `broker.conf` file.
 
-
 ```conf
+
 functionsWorkerEnabled=true
+
 ```
 
 If the `functionsWorkerEnabled` is set to `true`, the functions-worker is started as part of a broker. You need to configure the `conf/functions_worker.yml` file to customize your functions_worker.
@@ -56,33 +60,38 @@ If you want to use Stateful-Functions related functions (for example,  `putState
 
    Currently, the service uses the NAR package, so you need to set the configuration in `bookkeeper.conf`.
 
+    ```text
 
-```text
     extraServerComponents=org.apache.bookkeeper.stream.server.StreamStorageLifecycleComponent
-```
+
+    ```
 
    After starting bookie, use the following methods to check whether the streamStorage service is started correctly.
 
    Input:
 
+    ```shell
 
-```shell
     telnet localhost 4181
-```
+
+    ```
    Output:
 
-```text
+    ```text
+
     Trying 127.0.0.1...
     Connected to localhost.
     Escape character is '^]'.
-```
+
+    ```
 
 2. Turn on this function in `functions_worker.yml`.
 
+    ```text
 
-```text
     stateStorageServiceUrl: bk://<bk-service-url>:4181
-```
+
+    ```
     
     `bk-service-url` is the service URL pointing to the BookKeeper table service.
 
@@ -92,16 +101,16 @@ Once you have configured the `functions_worker.yml` file, you can start or resta
 
 And then you can use the following command to verify if `functions-worker` is running well.
 
-
 ```bash
+
 curl <broker-ip>:8080/admin/v2/worker/cluster
+
 ```
 
 After entering the command above, a list of active function workers in the cluster is returned. The output is similar to the following.
 
+```json [{"workerId":"<worker-id>","workerHostname":"<worker-hostname>","port":8080}]
 
-```json
-[{"workerId":"<worker-id>","workerHostname":"<worker-hostname>","port":8080}]
 ```
 
 ## Run Functions-worker separately
@@ -110,8 +119,11 @@ This section illustrates how to run `functions-worker` as a separate process in
 
 ![assets/functions-worker-separated.png](/assets/functions-worker-separated.png)
 
-> Note    
-> In this mode, make sure `functionsWorkerEnabled` is set to `false`, so you won't start `functions-worker` with brokers by mistake. Also, while accessing the `functions-worker` to manage any of the functions, the `pulsar-admin` CLI tool or any of the clients should use the `workerHostname` and `workerPort` that you set in [Worker parameters](#worker-parameters) to generate an `--admin-url`.  
+:::note
+
+In this mode, make sure `functionsWorkerEnabled` is set to `false`, so you won't start `functions-worker` with brokers by mistake. Also, while accessing the `functions-worker` to manage any of the functions, the `pulsar-admin` CLI tool or any of the clients should use the `workerHostname` and `workerPort` that you set in [Worker parameters](#worker-parameters) to generate an `--admin-url`.  
+
+:::
 
 ### Configure Functions-worker to run separately
 
@@ -151,7 +163,6 @@ If you want to enable security on functions workers, you *should*:
 
 To enable TLS transport encryption, configure the following settings.
 
-
 ```
 useTLS: true
 pulsarServiceUrl: pulsar+ssl://localhost:6651/
@@ -164,26 +175,29 @@ tlsTrustCertsFilePath:  /path/to/ca.cert.pem
 
 // The path to trusted certificates used by the Pulsar client to authenticate with Pulsar brokers
 brokerClientTrustCertsFilePath: /path/to/ca.cert.pem
+
 ```
 
-For details on TLS encryption, refer to [Transport Encryption using TLS](security-tls-transport.md).
+For details on TLS encryption, refer to [Transport Encryption using TLS](security-tls-transport).
 
 ##### Enable Authentication Provider
 
 To enable authentication on Functions Worker, you need to configure the following settings.
 
-> Note  
-> Substitute the *providers list* with the providers you want to enable.
+:::note
 
+Substitute the *providers list* with the providers you want to enable.
+
+:::
 
 ```
 authenticationEnabled: true
 authenticationProviders: [ provider1, provider2 ]
+
 ```
 
 For *TLS Authentication* provider, follow the example below to add the necessary settings.
-See [TLS Authentication](security-tls-authentication.md) for more details.
-
+See [TLS Authentication](security-tls-authentication) for more details.
 
 ```
 brokerClientAuthenticationPlugin: org.apache.pulsar.client.impl.auth.AuthenticationTls
@@ -191,20 +205,21 @@ brokerClientAuthenticationParameters: tlsCertFile:/path/to/admin.cert.pem,tlsKey
 
 authenticationEnabled: true
 authenticationProviders: ['org.apache.pulsar.broker.authentication.AuthenticationProviderTls']
+
 ```
 
 For *SASL Authentication* provider, add `saslJaasClientAllowedIds` and `saslJaasBrokerSectionName`
 under `properties` if needed. 
 
-
 ```
 properties:
   saslJaasClientAllowedIds: .*pulsar.*
   saslJaasBrokerSectionName: Broker
+
 ```
 
 For *Token Authentication* provider, add necessary settings for `properties` if needed.
-See [Token Authentication](security-jwt.md) for more details.
+See [Token Authentication](security-jwt) for more details.
 Note: key files must be DER-encoded
 
 ```
@@ -212,39 +227,42 @@ properties:
   tokenSecretKey:       file://my/secret.key 
   # If using public/private
   # tokenPublicKey:     file:///path/to/public.key 
+
 ```
 
 ##### Enable Authorization Provider
 
 To enable authorization on Functions Worker, you need to configure `authorizationEnabled`, `authorizationProvider` and `configurationStoreServers`. The authentication provider connects to `configurationStoreServers` to receive namespace policies.
 
-
 ```yaml
+
 authorizationEnabled: true
 authorizationProvider: org.apache.pulsar.broker.authorization.PulsarAuthorizationProvider
 configurationStoreServers: <configuration-store-servers>
+
 ```
 
 You should also configure a list of superuser roles. The superuser roles are able to access any admin API. The following is a configuration example.
 
-
 ```yaml
+
 superUserRoles:
   - role1
   - role2
   - role3
+
 ```
 
 ##### Enable End-to-End Encryption
 
 You can use the public and private key pair that the application configures to perform encryption. Only the consumers with a valid key can decrypt the encrypted messages.
 
-To enable End-to-End encryption on Functions Worker, you can set it by specifying `--producer-config` in the command line terminal, for more information, please refer to [here](security-encryption.md).
+To enable End-to-End encryption on Functions Worker, you can set it by specifying `--producer-config` in the command line terminal, for more information, please refer to [here](security-encryption).
 
 We include the relevant configuration information of `CryptoConfig` into `ProducerConfig`. The specific configurable field information about `CryptoConfig` is as follows:
 
-
 ```text
+
 public class CryptoConfig {
     private String cryptoKeyReaderClassName;
     private Map<String, Object> cryptoKeyReaderConfig;
@@ -254,6 +272,7 @@ public class CryptoConfig {
 
     private ConsumerCryptoFailureAction consumerCryptoFailureAction;
 }
+
 ```
 
 - `producerCryptoFailureAction`: define the action if producer fail to encrypt data one of `FAIL`, `SEND`.
@@ -271,16 +290,18 @@ If authentication is enabled on the BookKeeper cluster, you need configure the B
 
 Once you have finished configuring the `functions_worker.yml` configuration file, you can start a `functions-worker` in the background by using [nohup](https://en.wikipedia.org/wiki/Nohup) with the [`pulsar-daemon`](reference-cli-tools.md#pulsar-daemon) CLI tool:
 
-
 ```bash
+
 bin/pulsar-daemon start functions-worker
+
 ```
 
 You can also start `functions-worker` in the foreground by using `pulsar` CLI tool:
 
-
 ```bash
+
 bin/pulsar functions-worker
+
 ```
 
 ### Configure Proxies for Functions-workers
@@ -298,10 +319,11 @@ start proxies.
 
 To enable routing functions related admin requests to `functions-worker` in a proxy, you can edit the `proxy.conf` file to modify the following settings:
 
-
 ```conf
+
 functionWorkerWebServiceURL=<pulsar-functions-worker-web-service-url>
 functionWorkerWebServiceURLTLS=<pulsar-functions-worker-web-service-url>
+
 ```
 
 ## Compare the Run-with-Broker and Run-separately modes
@@ -322,9 +344,9 @@ Use the `Run-separately` mode in the following cases:
 
 **Error message: Namespace missing local cluster name in clusters list**
 
-
 ```
 Failed to get partitioned topic metadata: org.apache.pulsar.client.api.PulsarClientException$BrokerMetadataException: Namespace missing local cluster name in clusters list: local_cluster=xyz ns=public/functions clusters=[standalone]
+
 ```
 
 The error message prompts when either of the cases occurs:
@@ -339,16 +361,18 @@ If any of these cases happens, follow the instructions below to fix the problem:
 
 2. Get the current clusters list of `public/functions` namespace.
 
-
 ```bash
+
 bin/pulsar-admin namespaces get-clusters public/functions
+
 ```
 
 3. Check if the cluster is in the clusters list. If the cluster is not in the list, add it to the list and update the clusters list.
 
-
 ```bash
+
 bin/pulsar-admin namespaces set-clusters --clusters <existing-clusters>,<new-cluster> public/functions
+
 ```
 
 4. After setting the cluster successfully, enable functions worker by setting `functionsWorkerEnabled=true`. 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/getting-started-concepts-and-architecture.md b/site2/website-next/versioned_docs/version-2.8.0/getting-started-concepts-and-architecture.md
index e5131f1..f6f5ff1 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/getting-started-concepts-and-architecture.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/getting-started-concepts-and-architecture.md
@@ -5,6 +5,10 @@ sidebar_label: Concepts and architecture
 original_id: concepts-architecture
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 
 
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/getting-started-docker.md b/site2/website-next/versioned_docs/version-2.8.0/getting-started-docker.md
index 13b75d2..087acb6 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/getting-started-docker.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/getting-started-docker.md
@@ -5,6 +5,10 @@ sidebar_label: Run Pulsar in Docker
 original_id: standalone-docker
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 For local development and testing, you can run Pulsar in standalone
 mode on your own machine within a Docker container.
 
@@ -16,13 +20,15 @@ and follow the instructions for your OS.
 * For MacOS, Linux, and Windows:
 
   ```shell
+
   $ docker run -it \
     -p 6650:6650 \
     -p 8080:8080 \
     --mount source=pulsardata,target=/pulsar/data \
     --mount source=pulsarconf,target=/pulsar/conf \
-    apachepulsar/pulsar:{{pulsar:version}} \
+    apachepulsar/pulsar:@pulsar:version@ \
     bin/pulsar standalone
+
   ```
 
 A few things to note about this command:
@@ -36,30 +42,36 @@ If you start Pulsar successfully, you will see `INFO`-level log messages like th
 2017-08-09 22:34:04,030 - INFO  - [main:WebService@213] - Web Service started at http://127.0.0.1:8080
 2017-08-09 22:34:04,038 - INFO  - [main:PulsarService@335] - messaging service is ready, bootstrap service on port=8080, broker url=pulsar://127.0.0.1:6650, cluster=standalone, configs=org.apache.pulsar.broker.ServiceConfiguration@4db60246
 ...
+
 ```
 
-> #### Tip
-> 
-> When you start a local standalone cluster, a `public/default`
+:::tip
+
+
+When you start a local standalone cluster, a `public/default`
+
+:::
 namespace is created automatically. The namespace is used for development purposes. All Pulsar topics are managed within namespaces.
 For more information, see [Topics](concepts-messaging.md#topics).
 
 ## Use Pulsar in Docker
 
-Pulsar offers client libraries for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python.md) 
-and [C++](client-libraries-cpp.md). If you're running a local standalone cluster, you can
+Pulsar offers client libraries for [Java](client-libraries-java.md), [Go](client-libraries-go.md), [Python](client-libraries-python) 
+and [C++](client-libraries-cpp). If you're running a local standalone cluster, you can
 use one of these root URLs to interact with your cluster:
 
 * `pulsar://localhost:6650`
 * `http://localhost:8080`
 
-The following example will guide you get started with Pulsar quickly by using the [Python](client-libraries-python.md)
+The following example will guide you get started with Pulsar quickly by using the [Python](client-libraries-python)
 client API.
 
 Install the Pulsar Python client library directly from [PyPI](https://pypi.org/project/pulsar-client/):
 
 ```shell
+
 $ pip install pulsar-client
+
 ```
 
 ### Consume a message
@@ -67,6 +79,7 @@ $ pip install pulsar-client
 Create a consumer and subscribe to the topic:
 
 ```python
+
 import pulsar
 
 client = pulsar.Client('pulsar://localhost:6650')
@@ -79,6 +92,7 @@ while True:
     consumer.acknowledge(msg)
 
 client.close()
+
 ```
 
 ### Produce a message
@@ -86,6 +100,7 @@ client.close()
 Now start a producer to send some test messages:
 
 ```python
+
 import pulsar
 
 client = pulsar.Client('pulsar://localhost:6650')
@@ -95,22 +110,26 @@ for i in range(10):
     producer.send(('hello-pulsar-%d' % i).encode('utf-8'))
 
 client.close()
+
 ```
 
 ## Get the topic statistics
 
 In Pulsar, you can use REST, Java, or command-line tools to control every aspect of the system.
-For details on APIs, refer to [Admin API Overview](admin-api-overview.md).
+For details on APIs, refer to [Admin API Overview](admin-api-overview).
 
 In the simplest example, you can use curl to probe the stats for a particular topic:
 
 ```shell
+
 $ curl http://localhost:8080/admin/v2/persistent/public/default/my-topic/stats | python -m json.tool
+
 ```
 
 The output is something like this:
 
 ```json
+
 {
   "averageMsgSize": 0.0,
   "msgRateIn": 0.0,
@@ -158,4 +177,5 @@ The output is something like this:
     }
   }
 }
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/getting-started-helm.md b/site2/website-next/versioned_docs/version-2.8.0/getting-started-helm.md
index 8e1cc5a..cc857d0 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/getting-started-helm.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/getting-started-helm.md
@@ -5,6 +5,10 @@ sidebar_label: Run Pulsar in Kubernetes
 original_id: kubernetes-helm
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 This section guides you through every step of installing and running Apache Pulsar with Helm on Kubernetes quickly, including the following sections:
 
 - Install the Apache Pulsar on Kubernetes using Helm
@@ -13,7 +17,7 @@ This section guides you through every step of installing and running Apache Puls
 - Produce and consume messages using Pulsar clients
 - Monitor Apache Pulsar status with Prometheus and Grafana
 
-For deploying a Pulsar cluster for production usage, read the documentation on [how to configure and install a Pulsar Helm chart](helm-deploy.md).
+For deploying a Pulsar cluster for production usage, read the documentation on [how to configure and install a Pulsar Helm chart](helm-deploy).
 
 ## Prerequisite
 
@@ -21,19 +25,24 @@ For deploying a Pulsar cluster for production usage, read the documentation on [
 - kubectl 1.14.0+
 - Helm 3.0+
 
-> #### Tip
-> For the following steps, step 2 and step 3 are for **developers** and step 4 and step 5 are for **administrators**.
+:::tip
+
+For the following steps, step 2 and step 3 are for **developers** and step 4 and step 5 are for **administrators**.
+
+:::
 
 ## Step 0: Prepare a Kubernetes cluster
 
-Before installing a Pulsar Helm chart, you have to create a Kubernetes cluster. You can follow [the instructions](helm-prepare.md) to prepare a Kubernetes cluster.
+Before installing a Pulsar Helm chart, you have to create a Kubernetes cluster. You can follow [the instructions](helm-prepare) to prepare a Kubernetes cluster.
 
 We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start guide. To prepare a Kubernetes cluster, follow these steps:
 
 1. Create a Kubernetes cluster on Minikube.
 
     ```bash
+
     minikube start --memory=8192 --cpus=4 --kubernetes-version=<k8s-version>
+
     ```
 
     The `<k8s-version>` can be any [Kubernetes version supported by your Minikube installation](https://minikube.sigs.k8s.io/docs/reference/configuration/kubernetes/), such as `v1.16.1`.
@@ -41,13 +50,17 @@ We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start
 2. Set `kubectl` to use Minikube.
 
     ```bash
+
     kubectl config use-context minikube
+
     ```
 
 3. To use the [Kubernetes Dashboard](https://kubernetes.io/docs/tasks/access-application-cluster/web-ui-dashboard/) with the local Kubernetes cluster on Minikube, enter the command below:
 
     ```bash
+
     minikube dashboard
+
     ```
     The command automatically triggers opening a webpage in your browser. 
 
@@ -56,27 +69,35 @@ We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start
 0. Add Pulsar charts repo.
 
     ```bash
+
     helm repo add apache https://pulsar.apache.org/charts
+
     ```
 
     ```bash
+
     helm repo update
+
     ```
 
 1. Clone the Pulsar Helm chart repository.
 
     ```bash
+
     git clone https://github.com/apache/pulsar-helm-chart
     cd pulsar-helm-chart
+
     ```
 
 2. Run the script `prepare_helm_release.sh` to create secrets required for installing the Apache Pulsar Helm chart. The username `pulsar` and password `pulsar` are used for logging into the Grafana dashboard and Pulsar Manager.
 
     ```bash
+
     ./scripts/pulsar/prepare_helm_release.sh \
         -n pulsar \
         -k pulsar-mini \
         -c
+
     ```
 
 3. Use the Pulsar Helm chart to install a Pulsar cluster to Kubernetes.
@@ -85,17 +106,21 @@ We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start
    > You need to specify `--set initialize=true` when installing Pulsar the first time. This command installs and starts Apache Pulsar.
 
     ```bash
+
     helm install \
         --values examples/values-minikube.yaml \
         --set initialize=true \
         --namespace pulsar \
         pulsar-mini apache/pulsar
+
     ```
 
 4. Check the status of all pods.
 
     ```bash
+
     kubectl get pods -n pulsar
+
     ```
 
     If all pods start up successfully, you can see that the `STATUS` is changed to `Running` or `Completed`.
@@ -103,6 +128,7 @@ We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start
     **Output**
 
     ```bash
+
     NAME                                         READY   STATUS      RESTARTS   AGE
     pulsar-mini-bookie-0                         1/1     Running     0          9m27s
     pulsar-mini-bookie-init-5gphs                0/1     Completed   0          9m27s
@@ -114,17 +140,22 @@ We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start
     pulsar-mini-pulsar-manager-9bcbb4d9f-htpcs   1/1     Running     0          9m27s
     pulsar-mini-toolset-0                        1/1     Running     0          9m27s
     pulsar-mini-zookeeper-0                      1/1     Running     0          9m27s
+
     ```
 
 5. Check the status of all services in the namespace `pulsar`.
 
     ```bash
+
     kubectl get services -n pulsar
+
     ```
 
     **Output**
     
+
     ```bash
+
     NAME                         TYPE           CLUSTER-IP       EXTERNAL-IP   PORT(S)                       AGE
     pulsar-mini-bookie           ClusterIP      None             <none>        3181/TCP,8000/TCP             11m
     pulsar-mini-broker           ClusterIP      None             <none>        8080/TCP,6650/TCP             11m
@@ -134,6 +165,7 @@ We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start
     pulsar-mini-pulsar-manager   LoadBalancer   10.103.192.175   <pending>     9527:30190/TCP                11m
     pulsar-mini-toolset          ClusterIP      None             <none>        <none>                        11m
     pulsar-mini-zookeeper        ClusterIP      None             <none>        2888/TCP,3888/TCP,2181/TCP    11m
+
     ```
 
 ## Step 2: Use pulsar-admin to create Pulsar tenants/namespaces/topics
@@ -143,63 +175,83 @@ We use [Minikube](https://minikube.sigs.k8s.io/docs/start/) in this quick start
 1. Enter the `toolset` container.
 
     ```bash
+
     kubectl exec -it -n pulsar pulsar-mini-toolset-0 -- /bin/bash
+
     ```
 
 2. In the `toolset` container, create a tenant named `apache`.
 
     ```bash
+
     bin/pulsar-admin tenants create apache
+
     ```
 
     Then you can list the tenants to see if the tenant is created successfully.
 
     ```bash
+
     bin/pulsar-admin tenants list
+
     ```
 
     You should see a similar output as below. The tenant `apache` has been successfully created. 
 
     ```bash
+
     "apache"
     "public"
     "pulsar"
+
     ```
 
 3. In the `toolset` container, create a namespace named `pulsar` in the tenant `apache`.
 
     ```bash
+
     bin/pulsar-admin namespaces create apache/pulsar
+
     ```
 
     Then you can list the namespaces of tenant `apache` to see if the namespace is created successfully.
 
     ```bash
+
     bin/pulsar-admin namespaces list apache
+
     ```
 
     You should see a similar output as below. The namespace `apache/pulsar` has been successfully created. 
 
     ```bash
+
     "apache/pulsar"
+
     ```
 
 4. In the `toolset` container, create a topic `test-topic` with `4` partitions in the namespace `apache/pulsar`.
 
     ```bash
+
     bin/pulsar-admin topics create-partitioned-topic apache/pulsar/test-topic -p 4
+
     ```
 
 5. In the `toolset` container, list all the partitioned topics in the namespace `apache/pulsar`.
 
     ```bash
+
     bin/pulsar-admin topics list-partitioned-topics apache/pulsar
+
     ```
 
     Then you can see all the partitioned topics in the namespace `apache/pulsar`.
 
     ```bash
+
     "persistent://apache/pulsar/test-topic"
+
     ```
 
 ## Step 3: Use Pulsar client to produce and consume messages
@@ -209,13 +261,17 @@ You can use the Pulsar client to create producers and consumers to produce and c
 By default, the Pulsar Helm chart exposes the Pulsar cluster through a Kubernetes `LoadBalancer`. In Minikube, you can use the following command to check the proxy service.
 
 ```bash
+
 kubectl get services -n pulsar | grep pulsar-mini-proxy
+
 ```
 
 You will see a similar output as below.
 
 ```bash
+
 pulsar-mini-proxy            LoadBalancer   10.97.240.109    <pending>     80:32305/TCP,6650:31816/TCP   28m
+
 ```
 
 This output tells what are the node ports that Pulsar cluster's binary port and HTTP port are mapped to. The port after `80:` is the HTTP port while the port after `6650:` is the binary port.
@@ -223,12 +279,15 @@ This output tells what are the node ports that Pulsar cluster's binary port and
 Then you can find the IP address and exposed ports of your Minikube server by running the following command.
 
 ```bash
+
 minikube service pulsar-mini-proxy -n pulsar
+
 ```
 
 **Output**
 
 ```bash
+
 |-----------|-------------------|-------------|-------------------------|
 | NAMESPACE |       NAME        | TARGET PORT |           URL           |
 |-----------|-------------------|-------------|-------------------------|
@@ -242,12 +301,15 @@ minikube service pulsar-mini-proxy -n pulsar
 | pulsar    | pulsar-mini-proxy |             | http://127.0.0.1:61853 |
 |           |                   |             | http://127.0.0.1:61854 |
 |-----------|-------------------|-------------|------------------------|
+
 ```
 
 At this point, you can get the service URLs to connect to your Pulsar client. Here are URL examples:
+
 ```
 webServiceUrl=http://127.0.0.1:61853/
 brokerServiceUrl=pulsar://127.0.0.1:61854/
+
 ```
 
 Then you can proceed with the following steps:
@@ -257,7 +319,9 @@ Then you can proceed with the following steps:
 2. Decompress the tarball based on your download file.
 
     ```bash
+
     tar -xf <file-name>.tar.gz
+
     ```
 
 3. Expose `PULSAR_HOME`.
@@ -267,7 +331,9 @@ Then you can proceed with the following steps:
     (2) Expose `PULSAR_HOME` as the environment variable.
 
     ```bash
+
     export PULSAR_HOME=$(pwd)
+
     ```
 
 4. Configure the Pulsar client.
@@ -277,13 +343,17 @@ Then you can proceed with the following steps:
 5. Create a subscription to consume messages from `apache/pulsar/test-topic`.
 
     ```bash
+
     bin/pulsar-client consume -s sub apache/pulsar/test-topic  -n 0
+
     ```
 
 6. Open a new terminal. In the new terminal, create a producer and send 10 messages to the `test-topic` topic.
 
     ```bash
+
     bin/pulsar-client produce apache/pulsar/test-topic  -m "---------hello apache pulsar-------" -n 10
+
     ```
 
 7. Verify the results.
@@ -295,7 +365,9 @@ Then you can proceed with the following steps:
         The messages have been produced successfully.
 
         ```bash
+
         18:15:15.489 [main] INFO  org.apache.pulsar.client.cli.PulsarClientTool - 10 messages successfully produced
+
         ```
 
     - From the consumer side
@@ -305,6 +377,7 @@ Then you can proceed with the following steps:
         At the same time, you can receive the messages as below.
 
         ```bash
+
         ----- got message -----
         ---------hello apache pulsar-------
         ----- got message -----
@@ -325,16 +398,19 @@ Then you can proceed with the following steps:
         ---------hello apache pulsar-------
         ----- got message -----
         ---------hello apache pulsar-------
+
         ```
 
 ## Step 4: Use Pulsar Manager to manage the cluster
 
-[Pulsar Manager](administration-pulsar-manager.md) is a web-based GUI management tool for managing and monitoring Pulsar.
+[Pulsar Manager](administration-pulsar-manager) is a web-based GUI management tool for managing and monitoring Pulsar.
 
 1. By default, the `Pulsar Manager` is exposed as a separate `LoadBalancer`. You can open the Pulsar Manager UI using the following command:
 
     ```bash
+
     minikube service -n pulsar pulsar-mini-pulsar-manager 
+
     ```
 
 2. The Pulsar Manager UI will be open in your browser. You can use the username `pulsar` and password `pulsar` to log into Pulsar Manager.
@@ -355,7 +431,9 @@ Grafana is an open-source visualization tool, which can be used for visualizing
 1. By default, the Grafana is exposed as a separate `LoadBalancer`. You can open the Grafana UI using the following command:
 
     ```bash
+
     minikube service pulsar-mini-grafana -n pulsar
+
     ```
 
 2. The Grafana UI is open in your browser. You can use the username `pulsar` and password `pulsar` to log into the Grafana Dashboard.
diff --git a/site2/website-next/versioned_docs/version-2.8.0/getting-started-pulsar.md b/site2/website-next/versioned_docs/version-2.8.0/getting-started-pulsar.md
index 6f9ce8a..5fbc1e2 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/getting-started-pulsar.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/getting-started-pulsar.md
@@ -5,13 +5,17 @@ sidebar_label: Pulsar 2.0
 original_id: pulsar-2.0
 ---
 
-Pulsar 2.0 is a major new release for Pulsar that brings some bold changes to the platform, including [simplified topic names](#topic-names), the addition of the [Pulsar Functions](functions-overview.md) feature, some terminology changes, and more.
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
+Pulsar 2.0 is a major new release for Pulsar that brings some bold changes to the platform, including [simplified topic names](#topic-names), the addition of the [Pulsar Functions](functions-overview) feature, some terminology changes, and more.
 
 ## New features in Pulsar 2.0
 
 Feature | Description
 :-------|:-----------
-[Pulsar Functions](functions-overview.md) | A lightweight compute option for Pulsar
+[Pulsar Functions](functions-overview) | A lightweight compute option for Pulsar
 
 ## Major changes
 
@@ -26,7 +30,9 @@ Previously, Pulsar had a concept of properties. A property is essentially the ex
 Prior to version 2.0, *all* Pulsar topics had the following form:
 
 ```http
+
 {persistent|non-persistent}://property/cluster/namespace/topic
+
 ```
 Two important changes have been made in Pulsar 2.0:
 
@@ -40,7 +46,9 @@ Two important changes have been made in Pulsar 2.0:
 The cluster component has been removed from topic names. Thus, all topic names now have the following form:
 
 ```http
+
 {persistent|non-persistent}://tenant/namespace/topic
+
 ```
 
 > Existing topics that use the legacy name format will continue to work without any change, and there are no plans to change that.
diff --git a/site2/website-next/versioned_docs/version-2.8.0/getting-started-standalone.md b/site2/website-next/versioned_docs/version-2.8.0/getting-started-standalone.md
index 5402f4c..5e84f37 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/getting-started-standalone.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/getting-started-standalone.md
@@ -1,15 +1,19 @@
 ---
+slug: /
 id: standalone
 title: Set up a standalone Pulsar locally
 sidebar_label: Run Pulsar locally
 original_id: standalone
-slug: /
 ---
 
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+
 For local development and testing, you can run Pulsar in standalone mode on your machine. The standalone mode includes a Pulsar broker, the necessary ZooKeeper and BookKeeper components running inside of a single Java Virtual Machine (JVM) process.
 
 > #### Pulsar in production? 
-> If you're looking to run a full production Pulsar installation, see the [Deploying a Pulsar instance](deploy-bare-metal.md) guide.
+> If you're looking to run a full production Pulsar installation, see the [Deploying a Pulsar instance](deploy-bare-metal) guide.
 
 ## Install Pulsar standalone
 
@@ -19,18 +23,24 @@ This tutorial guides you through every step of the installation process.
 
 Currently, Pulsar is available for 64-bit **macOS**, **Linux**, and **Windows**. To use Pulsar, you need to install 64-bit JRE/JDK 8 or later versions.
 
-> #### Tip
-> By default, Pulsar allocates 2G JVM heap memory to start. It can be changed in `conf/pulsar_env.sh` file under `PULSAR_MEM`. This is extra options passed into JVM. 
+:::tip
 
-> **Note**
-> 
-> Broker is only supported on 64-bit JVM.
+By default, Pulsar allocates 2G JVM heap memory to start. It can be changed in `conf/pulsar_env.sh` file under `PULSAR_MEM`. This is extra options passed into JVM. 
+
+:::
+
+:::note
+
+
+Broker is only supported on 64-bit JVM.
+
+:::
 
 ### Install Pulsar using binary release
 
 To get started with Pulsar, download a binary tarball release in one of the following ways:
 
-* download from the Apache mirror (<a href="pulsar:binary_release_url" download>Pulsar {{pulsar:version}} binary release</a>)
+* download from the Apache mirror (<a href="pulsar:binary_release_url" download>Pulsar @pulsar:version@ binary release</a>)
 
 * download from the Pulsar [downloads page](pulsar:download_page_url)  
   
@@ -39,14 +49,18 @@ To get started with Pulsar, download a binary tarball release in one of the foll
 * use [wget](https://www.gnu.org/software/wget):
 
   ```shell
+
   $ wget pulsar:binary_release_url
+
   ```
 
 After you download the tarball, untar it and use the `cd` command to navigate to the resulting directory:
 
 ```bash
-$ tar xvfz apache-pulsar-{{pulsar:version}}-bin.tar.gz
-$ cd apache-pulsar-{{pulsar:version}}
+
+$ tar xvfz apache-pulsar-@pulsar:version@-bin.tar.gz
+$ cd apache-pulsar-@pulsar:version@
+
 ```
 
 #### What your package contains
@@ -57,7 +71,7 @@ Directory | Contains
 :---------|:--------
 `bin` | Pulsar's command-line tools, such as [`pulsar`](reference-cli-tools.md#pulsar) and [`pulsar-admin`](https://pulsar.apache.org/tools/pulsar-admin/).
 `conf` | Configuration files for Pulsar, including [broker configuration](reference-configuration.md#broker), [ZooKeeper configuration](reference-configuration.md#zookeeper), and more.
-`examples` | A Java JAR file containing [Pulsar Functions](functions-overview.md) example.
+`examples` | A Java JAR file containing [Pulsar Functions](functions-overview) example.
 `lib` | The [JAR](https://en.wikipedia.org/wiki/JAR_(file_format)) files used by Pulsar.
 `licenses` | License files, in the`.txt` form, for various components of the Pulsar [codebase](https://github.com/apache/pulsar).
 
@@ -66,23 +80,26 @@ These directories are created once you begin running Pulsar.
 Directory | Contains
 :---------|:--------
 `data` | The data storage directory used by ZooKeeper and BookKeeper.
-`instances` | Artifacts created for [Pulsar Functions](functions-overview.md).
+`instances` | Artifacts created for [Pulsar Functions](functions-overview).
 `logs` | Logs created by the installation.
 
-> #### Tip
-> If you want to use builtin connectors and tiered storage offloaders, you can install them according to the following instructions:
-> 
-> * [Install builtin connectors (optional)](#install-builtin-connectors-optional)
-> * [Install tiered storage offloaders (optional)](#install-tiered-storage-offloaders-optional)
-> 
-> Otherwise, skip this step and perform the next step [Start Pulsar standalone](#start-pulsar-standalone). Pulsar can be successfully installed without installing bulitin connectors and tiered storage offloaders.
+:::tip
+
+If you want to use builtin connectors and tiered storage offloaders, you can install them according to the following instructions:
+
+* [Install builtin connectors (optional)](#install-builtin-connectors-optional)
+* [Install tiered storage offloaders (optional)](#install-tiered-storage-offloaders-optional)
+
+Otherwise, skip this step and perform the next step [Start Pulsar standalone](#start-pulsar-standalone). Pulsar can be successfully installed without installing bulitin connectors and tiered storage offloaders.
+
+:::
 
 ### Install builtin connectors (optional)
 
 Since `2.1.0-incubating` release, Pulsar releases a separate binary distribution, containing all the `builtin` connectors.
 To enable those `builtin` connectors, you can download the connectors tarball release in one of the following ways:
 
-* download from the Apache mirror <a href="pulsar:connector_release_url" download>Pulsar IO Connectors {{pulsar:version}} release</a>
+* download from the Apache mirror <a href="pulsar:connector_release_url" download>Pulsar IO Connectors @pulsar:version@ release</a>
 
 * download from the Pulsar [downloads page](pulsar:download_page_url)
 
@@ -91,39 +108,49 @@ To enable those `builtin` connectors, you can download the connectors tarball re
 * use [wget](https://www.gnu.org/software/wget):
 
   ```shell
-  $ wget pulsar:connector_release_url/{connector}-{{pulsar:version}}.nar
+
+  $ wget pulsar:connector_release_url/{connector}-@pulsar:version@.nar
+
   ```
 
 After you download the nar file, copy the file to the `connectors` directory in the pulsar directory. 
-For example, if you download the `pulsar-io-aerospike-{{pulsar:version}}.nar` connector file, enter the following commands:
+For example, if you download the `pulsar-io-aerospike-@pulsar:version@.nar` connector file, enter the following commands:
 
 ```bash
+
 $ mkdir connectors
-$ mv pulsar-io-aerospike-{{pulsar:version}}.nar connectors
+$ mv pulsar-io-aerospike-@pulsar:version@.nar connectors
 
 $ ls connectors
-pulsar-io-aerospike-{{pulsar:version}}.nar
+pulsar-io-aerospike-@pulsar:version@.nar
 ...
+
 ```
 
-> #### Note
->
-> * If you are running Pulsar in a bare metal cluster, make sure `connectors` tarball is unzipped in every pulsar directory of the broker
-> (or in every pulsar directory of function-worker if you are running a separate worker cluster for Pulsar Functions).
-> 
-> * If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DCOS](deploy-dcos.md)),
-> you can use the `apachepulsar/pulsar-all` image instead of the `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
+:::note
+
+
+* If you are running Pulsar in a bare metal cluster, make sure `connectors` tarball is unzipped in every pulsar directory of the broker
+(or in every pulsar directory of function-worker if you are running a separate worker cluster for Pulsar Functions).
+
+* If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DCOS](deploy-dcos)),
+you can use the `apachepulsar/pulsar-all` image instead of the `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled [all builtin connectors](io-overview.md#working-with-connectors).
+
+:::
 
 ### Install tiered storage offloaders (optional)
 
-> #### Tip
->
-> Since `2.2.0` release, Pulsar releases a separate binary distribution, containing the tiered storage offloaders.
-> To enable tiered storage feature, follow the instructions below; otherwise skip this section.
+:::tip
+
+
+Since `2.2.0` release, Pulsar releases a separate binary distribution, containing the tiered storage offloaders.
+To enable tiered storage feature, follow the instructions below; otherwise skip this section.
+
+:::
 
-To get started with [tiered storage offloaders](concepts-tiered-storage.md), you need to download the offloaders tarball release on every broker node in one of the following ways:
+To get started with [tiered storage offloaders](concepts-tiered-storage), you need to download the offloaders tarball release on every broker node in one of the following ways:
 
-* download from the Apache mirror <a href="pulsar:offloader_release_url" download>Pulsar Tiered Storage Offloaders {{pulsar:version}} release</a>
+* download from the Apache mirror <a href="pulsar:offloader_release_url" download>Pulsar Tiered Storage Offloaders @pulsar:version@ release</a>
 
 * download from the Pulsar [downloads page](pulsar:download_page_url)
 
@@ -132,55 +159,69 @@ To get started with [tiered storage offloaders](concepts-tiered-storage.md), you
 * use [wget](https://www.gnu.org/software/wget):
 
   ```shell
+
   $ wget pulsar:offloader_release_url
+
   ```
 
 After you download the tarball, untar the offloaders package and copy the offloaders as `offloaders`
 in the pulsar directory:
 
 ```bash
-$ tar xvfz apache-pulsar-offloaders-{{pulsar:version}}-bin.tar.gz
 
-// you will find a directory named `apache-pulsar-offloaders-{{pulsar:version}}` in the pulsar directory
+$ tar xvfz apache-pulsar-offloaders-@pulsar:version@-bin.tar.gz
+
+// you will find a directory named `apache-pulsar-offloaders-@pulsar:version@` in the pulsar directory
 // then copy the offloaders
 
-$ mv apache-pulsar-offloaders-{{pulsar:version}}/offloaders offloaders
+$ mv apache-pulsar-offloaders-@pulsar:version@/offloaders offloaders
 
 $ ls offloaders
-tiered-storage-jcloud-{{pulsar:version}}.nar
+tiered-storage-jcloud-@pulsar:version@.nar
+
 ```
 
-For more information on how to configure tiered storage, see [Tiered storage cookbook](cookbooks-tiered-storage.md).
+For more information on how to configure tiered storage, see [Tiered storage cookbook](cookbooks-tiered-storage).
 
-> #### Note
->
-> * If you are running Pulsar in a bare metal cluster, make sure that `offloaders` tarball is unzipped in every broker's pulsar directory.
-> 
-> * If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DCOS](deploy-dcos.md)),
-> you can use the `apachepulsar/pulsar-all` image instead of the `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled tiered storage offloaders.
+:::note
+
+
+* If you are running Pulsar in a bare metal cluster, make sure that `offloaders` tarball is unzipped in every broker's pulsar directory.
+
+* If you are [running Pulsar in Docker](getting-started-docker.md) or deploying Pulsar using a docker image (e.g. [K8S](deploy-kubernetes.md) or [DCOS](deploy-dcos)),
+you can use the `apachepulsar/pulsar-all` image instead of the `apachepulsar/pulsar` image. `apachepulsar/pulsar-all` image has already bundled tiered storage offloaders.
+
+:::
 
 ## Start Pulsar standalone
 
 Once you have an up-to-date local copy of the release, you can start a local cluster using the [`pulsar`](reference-cli-tools.md#pulsar) command, which is stored in the `bin` directory, and specifying that you want to start Pulsar in standalone mode.
 
 ```bash
+
 $ bin/pulsar standalone
+
 ```
 
 If you have started Pulsar successfully, you will see `INFO`-level log messages like this:
 
 ```bash
+
 2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@95] - Configuration Store cache started
 2017-06-01 14:46:29,192 - INFO  - [main:AuthenticationService@61] - Authentication is disabled
 2017-06-01 14:46:29,192 - INFO  - [main:WebSocketService@108] - Pulsar WebSocket Service started
+
 ```
 
-> #### Tip
-> 
-> * The service is running on your terminal, which is under your direct control. If you need to run other commands, open a new terminal window.  
+:::tip
+
+
+* The service is running on your terminal, which is under your direct control. If you need to run other commands, open a new terminal window.
+
+:::
 You can also run the service as a background process using the `pulsar-daemon start standalone` command. For more information, see [pulsar-daemon](https://pulsar.apache.org/docs/en/reference-cli-tools/#pulsar-daemon).
 > 
-> * By default, there is no encryption, authentication, or authorization configured. Apache Pulsar can be accessed from remote server without any authorization. Please do check [Security Overview](security-overview.md) document to secure your deployment.
+> * By default, there is no encryption, authentication, or authorization configured. Apache Pulsar can be accessed from remote server without any authorization. Please do check [Security Overview](security-overview) document to secure your deployment.
 >
 > * When you start a local standalone cluster, a `public/default` [namespace](concepts-messaging.md#namespaces) is created automatically. The namespace is used for development purposes. All Pulsar topics are managed within namespaces. For more information, see [Topics](concepts-messaging.md#topics).
 
@@ -193,39 +234,51 @@ Pulsar provides a CLI tool called [`pulsar-client`](reference-cli-tools.md#pulsa
 The following command consumes a message with the subscription name `first-subscription` to the `my-topic` topic:
 
 ```bash
+
 $ bin/pulsar-client consume my-topic -s "first-subscription"
+
 ```
 
 If the message has been successfully consumed, you will see a confirmation like the following in the `pulsar-client` logs:
 
 ```
 09:56:55.566 [pulsar-client-io-1-1] INFO  org.apache.pulsar.client.impl.MultiTopicsConsumerImpl - [TopicsConsumerFakeTopicNamee2df9] [first-subscription] Success subscribe new topic my-topic in topics consumer, partitions: 4, allTopicPartitionsNumber: 4
+
 ```
 
-> #### Tip
->  
-> As you have noticed that we do not explicitly create the `my-topic` topic, to which we consume the message. When you consume a message to a topic that does not yet exist, Pulsar creates that topic for you automatically. Producing a message to a topic that does not exist will automatically create that topic for you as well.
+:::tip
+
+
+As you have noticed that we do not explicitly create the `my-topic` topic, to which we consume the message. When you consume a message to a topic that does not yet exist, Pulsar creates that topic for you automatically. Producing a message to a topic that does not exist will automatically create that topic for you as well.
+
+:::
 
 ### Produce a message
 
 The following command produces a message saying `hello-pulsar` to the `my-topic` topic:
 
 ```bash
+
 $ bin/pulsar-client produce my-topic --messages "hello-pulsar"
+
 ```
 
 If the message has been successfully published to the topic, you will see a confirmation like the following in the `pulsar-client` logs:
 
 ```
 13:09:39.356 [main] INFO  org.apache.pulsar.client.cli.PulsarClientTool - 1 messages successfully produced
+
 ```
 
 ## Stop Pulsar standalone
 
 Press `Ctrl+C` to stop a local standalone Pulsar.
 
-> #### Tip
-> 
-> If the service runs as a background process using the `pulsar-daemon start standalone` command, then use the `pulsar-daemon stop standalone`  command to stop the service.
-> 
-> For more information, see [pulsar-daemon](https://pulsar.apache.org/docs/en/reference-cli-tools/#pulsar-daemon).
+:::tip
+
+
+If the service runs as a background process using the `pulsar-daemon start standalone` command, then use the `pulsar-daemon stop standalone`  command to stop the service.
+
+For more information, see [pulsar-daemon](https://pulsar.apache.org/docs/en/reference-cli-tools/#pulsar-daemon).
+
+:::
diff --git a/site2/website-next/versioned_docs/version-2.8.0/helm-deploy.md b/site2/website-next/versioned_docs/version-2.8.0/helm-deploy.md
index 3b0bb67..907affd 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/helm-deploy.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/helm-deploy.md
@@ -21,25 +21,33 @@ In each section, collect the options that are combined to use with the `helm ins
 By default, the Pulsar Helm chart is installed to a namespace called `pulsar`.
 
 ```yaml
+
 namespace: pulsar
+
 ```
 
 To install the Pulsar Helm chart into a different Kubernetes namespace, you can include this option in the `helm install` command.
 
 ```bash
+
 --set namespace=<different-k8s-namespace>
+
 ```
 
 By default, the Pulsar Helm chart doesn't create the namespace.
 
 ```yaml
+
 namespaceCreate: false
+
 ```
 
 To use the Pulsar Helm chart to create the Kubernetes namespace automatically, you can include this option in the `helm install` command.
 
 ```bash
+
 --set namespaceCreate=true
+
 ```
 
 ### Persistence
@@ -47,17 +55,21 @@ To use the Pulsar Helm chart to create the Kubernetes namespace automatically, y
 By default, the Pulsar Helm chart creates Volume Claims with the expectation that a dynamic provisioner creates the underlying Persistent Volumes.
 
 ```yaml
+
 volumes:
   persistence: true
   # configure the components to use local persistent volume
   # the local provisioner should be installed prior to enable local persistent volume
   local_storage: false
+
 ```
 
 To use local persistent volumes as the persistent storage for Helm release, you can install the [local storage provisioner](#install-local-storage-provisioner) and include the following option in the `helm install` command. 
 
 ```bash
+
 --set volumes.local_storage=true
+
 ```
 
 :::note
@@ -70,7 +82,9 @@ Before installing the production instance of Pulsar, ensure to plan the storage
 The Pulsar Helm chart is designed for production use. To use the Pulsar Helm chart in a development environment (such as Minikube), you can disable persistence by including this option in your `helm install` command.
 
 ```bash
+
 --set volumes.persistence=false
+
 ```
 
 ### Affinity 
@@ -78,14 +92,18 @@ The Pulsar Helm chart is designed for production use. To use the Pulsar Helm cha
 By default, `anti-affinity` is enabled to ensure pods of the same component can run on different nodes.
 
 ```yaml
+
 affinity:
   anti_affinity: true
+
 ```
 
 To use the Pulsar Helm chart in a development environment (such as Minikue), you can disable `anti-affinity` by including this option in your `helm install` command.
 
 ```bash
+
 --set affinity.anti_affinity=false
+
 ```
 
 ### Components
@@ -95,6 +113,7 @@ The Pulsar Helm chart is designed for production usage. It deploys a production-
 You can customize the components to be deployed by turning on/off individual components.
 
 ```yaml
+
 ## Components
 ##
 ## Control what components of Apache Pulsar to deploy for the cluster
@@ -124,6 +143,7 @@ monitoring:
   prometheus: true
   # monitoring - grafana
   grafana: true
+
 ```
 
 ### Docker images
@@ -131,6 +151,7 @@ monitoring:
 The Pulsar Helm chart is designed to enable controlled upgrades. So it can configure independent image versions for components. You can customize the images by setting individual component.
 
 ```yaml
+
 ## Images
 ##
 ## Control what images to use for each component
@@ -171,6 +192,7 @@ images:
     tag: v0.1.0
     pullPolicy: IfNotPresent
     hasCommand: false
+
 ```
 
 ### TLS
@@ -182,15 +204,18 @@ The Pulsar Helm chart can be configured to enable TLS (Transport Layer Security)
 To use the `cert-manager` to provision the TLS certificates, you have to install the [cert-manager](#install-cert-manager) before installing the Pulsar Helm chart. After successfully installing the cert-manager, you can set `certs.internal_issuer.enabled` to `true`. Therefore, the Pulsar Helm chart can use the `cert-manager` to generate `selfsigning` TLS certificates for the configured components.
 
 ```yaml
+
 certs:
   internal_issuer:
     enabled: false
     component: internal-cert-issuer
     type: selfsigning
+
 ```
 You can also customize the generated TLS certificates by configuring the fields as the following.
 
 ```yaml
+
 tls:
   # common settings for generating certs
   common:
@@ -203,6 +228,7 @@ tls:
     keySize: 4096
     keyAlgorithm: rsa
     keyEncoding: pkcs8
+
 ```
 
 #### Enable TLS
@@ -210,13 +236,16 @@ tls:
 After installing the `cert-manager`, you can set `tls.enabled` to `true` to enable TLS encryption for the entire cluster.
 
 ```yaml
+
 tls:
   enabled: false
+
 ```
 
 You can also configure whether to enable TLS encryption for individual component.
 
 ```yaml
+
 tls:
   # settings for generating certs for proxy
   proxy:
@@ -240,6 +269,7 @@ tls:
   # settings for generating certs for toolset
   toolset:
     cert_name: tls-toolset
+
 ```
 
 ### Authentication
@@ -248,6 +278,7 @@ By default, authentication is disabled. You can set `auth.authentication.enabled
 Currently, the Pulsar Helm chart only supports JWT authentication provider. You can set `auth.authentication.provider` to `jwt` to use the JWT authentication provider.
 
 ```yaml
+
 # Enable or disable broker authentication and authorization.
 auth:
   authentication:
@@ -265,12 +296,15 @@ auth:
     proxy: "proxy-admin"
     # pulsar-admin client to broker/proxy communication
     client: "admin"
+
 ```
 
 To enable authentication, you can run [prepare helm release](#prepare-the-helm-release) to generate token secret keys and tokens for three super users specified in the `auth.superUsers` field. The generated token keys and super user tokens are uploaded and stored as Kubernetes secrets prefixed with `<pulsar-release-name>-token-`. You can use the following command to find those secrets.
 
 ```bash
+
 kubectl get secrets -n <k8s-namespace>
+
 ```
 
 ### Authorization
@@ -278,15 +312,19 @@ kubectl get secrets -n <k8s-namespace>
 By default, authorization is disabled. Authorization can be enabled only when authentication is enabled.
 
 ```yaml
+
 auth:
   authorization:
     enabled: false
+
 ```
 
 To enable authorization, you can include this option in the `helm install` command.
 
 ```bash
+
 --set auth.authorization.enabled=true
+
 ```
 
 ### CPU and RAM resource requirements
@@ -307,6 +345,7 @@ One of the easiest way to get started is to use the local storage provisioner pr
 helm repo add streamnative https://charts.streamnative.io
 helm repo update
 helm install pulsar-storage-provisioner streamnative/local-storage-provisioner
+
 ```
 
 ### Install cert-manager
@@ -318,9 +357,11 @@ For details about how to install the cert-manager, follow the [official instruct
 Alternatively, we provide a bash script [install-cert-manager.sh](https://github.com/apache/pulsar-helm-chart/blob/master/scripts/cert-manager/install-cert-manager.sh) to install a cert-manager release to the namespace `cert-manager`.
 
 ```bash
+
 git clone https://github.com/apache/pulsar-helm-chart
 cd pulsar-helm-chart
 ./scripts/cert-manager/install-cert-manager.sh
+
 ```
 
 ## Prepare Helm release
@@ -328,9 +369,11 @@ cd pulsar-helm-chart
 Once you have install all the dependent charts and collected all of your configuration options, you can run [prepare_helm_release.sh](https://github.com/apache/pulsar-helm-chart/blob/master/scripts/pulsar/prepare_helm_release.sh) to prepare the Helm release.
 
 ```bash
+
 git clone https://github.com/apache/pulsar-helm-chart
 cd pulsar-helm-chart
 ./scripts/pulsar/prepare_helm_release.sh -n <k8s-namespace> -k <helm-release-name>
+
 ```
 
 The `prepare_helm_release` creates the following resources:
@@ -352,12 +395,14 @@ Once you have finished the following three things, you can install a Helm releas
 In this example, we name our Helm release `pulsar`.
 
 ```bash
+
 helm repo add apache https://pulsar.apache.org/charts
 helm repo update
 helm install pulsar apache/pulsar \
     --timeout 10m \
     --set initialize=true \
     --set [your configuration options]
+
 ```
 
 :::note
@@ -386,5 +431,7 @@ The default values will create a `ClusterIP` for the following resources, which
 To find the IP addresses of those components, run the following command:
 
 ```bash
+
 kubectl get service -n <k8s-namespace>
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/helm-install.md b/site2/website-next/versioned_docs/version-2.8.0/helm-install.md
index addf960..538e198 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/helm-install.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/helm-install.md
@@ -25,7 +25,7 @@ Before deploying Pulsar, you need to prepare your environment.
 
 ### Tools
 
-Install [`helm`](helm-tools.md) and [`kubectl`](helm-tools.md) on your computer.
+Install [`helm`](helm-tools.md) and [`kubectl`](helm-tools) on your computer.
 
 ## Cloud cluster preparation
 
@@ -41,8 +41,8 @@ To create and connect to the Kubernetes cluster, follow the instructions:
 
 ## Pulsar deployment
 
-Once the environment is set up and configuration is generated, you can now proceed to the [deployment of Pulsar](helm-deploy.md).
+Once the environment is set up and configuration is generated, you can now proceed to the [deployment of Pulsar](helm-deploy).
 
 ## Pulsar upgrade
 
-To upgrade an existing Kubernetes installation, follow the [upgrade documentation](helm-upgrade.md).
+To upgrade an existing Kubernetes installation, follow the [upgrade documentation](helm-upgrade).
diff --git a/site2/website-next/versioned_docs/version-2.8.0/helm-overview.md b/site2/website-next/versioned_docs/version-2.8.0/helm-overview.md
index 24c9041..1899700 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/helm-overview.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/helm-overview.md
@@ -56,9 +56,9 @@ It includes support for:
 
 ## Pulsar Helm chart quick start
 
-To get up and run with these charts as fast as possible, in a **non-production** use case, we provide a [quick start guide](getting-started-helm.md) for Proof of Concept (PoC) deployments.
+To get up and run with these charts as fast as possible, in a **non-production** use case, we provide a [quick start guide](getting-started-helm) for Proof of Concept (PoC) deployments.
 
-This guide walks the user through deploying these charts with default values and features, but *does not* meet production ready requirements. To deploy these charts into production under sustained load, follow the complete [Installation Guide](helm-install.md).
+This guide walks the user through deploying these charts with default values and features, but *does not* meet production ready requirements. To deploy these charts into production under sustained load, follow the complete [Installation Guide](helm-install).
 
 ## Troubleshooting
 
@@ -68,30 +68,34 @@ We have done our best to make these charts as seamless as possible. Occasionally
 
 The Apache Pulsar Helm chart contains all required dependencies.
 
-If you deploy a PoC for testing, we strongly suggest you follow our [Quick Start Guide](getting-started-helm.md) for your first iteration.
+If you deploy a PoC for testing, we strongly suggest you follow our [Quick Start Guide](getting-started-helm) for your first iteration.
 
-1. [Preparation](helm-prepare.md)
-2. [Deployment](helm-deploy.md)
+1. [Preparation](helm-prepare)
+2. [Deployment](helm-deploy)
 
 ## Upgrading
 
 Once the Pulsar Helm chart is installed, use the `helm upgrade` to complete configuration changes and chart updates.
 
 ```bash
+
 helm repo add apache https://pulsar.apache.org/charts
 helm repo update
 helm get values <pulsar-release-name> > pulsar.yaml
 helm upgrade <pulsar-release-name> apache/pulsar -f pulsar.yaml
+
 ```
 
-For more detailed information, see [Upgrading](helm-upgrade.md).
+For more detailed information, see [Upgrading](helm-upgrade).
 
 ## Uninstallation
 
 To uninstall the Pulsar Helm chart, run the following command:
 
 ```bash
+
 helm delete <pulsar-release-name>
+
 ```
 
 For the purposes of continuity, these charts have some Kubernetes objects that cannot be removed when performing `helm delete`.
diff --git a/site2/website-next/versioned_docs/version-2.8.0/helm-prepare.md b/site2/website-next/versioned_docs/version-2.8.0/helm-prepare.md
index 7856a23..3584480 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/helm-prepare.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/helm-prepare.md
@@ -68,13 +68,17 @@ The following table describes all variables.
 Run the script, by passing in your desired parameters. It can work with the default parameters except for `PROJECT` which is required:
 
 ```bash
+
 PROJECT=<gcloud project id> scripts/pulsar/gke_bootstrap_script.sh up
+
 ```
 
 The script can also be used to clean up the created GKE resources.
 
 ```bash
+
 PROJECT=<gcloud project id> scripts/pulsar/gke_bootstrap_script.sh down
+
 ```
 
 #### Create cluster with local SSDs
@@ -83,7 +87,8 @@ To install a Pulsar Helm chart using local persistent volumes, you need to creat
 
 ```
 PROJECT=<gcloud project id> USE_LOCAL_SSD=true LOCAL_SSD_COUNT=<local-ssd-count> scripts/pulsar/gke_bootstrap_script.sh up
+
 ```
 ## Next Steps
 
-Continue with the [installation of the chart](helm-deploy.md) once you have the cluster up and running.
+Continue with the [installation of the chart](helm-deploy) once you have the cluster up and running.
diff --git a/site2/website-next/versioned_docs/version-2.8.0/helm-tools.md b/site2/website-next/versioned_docs/version-2.8.0/helm-tools.md
index c3404a7..1a60e4b 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/helm-tools.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/helm-tools.md
@@ -29,7 +29,7 @@ You can get Helm from the project's [releases page](https://github.com/helm/helm
 
 ### Next steps
 
-Once kubectl and Helm are configured, you can configure your [Kubernetes cluster](helm-prepare.md).
+Once kubectl and Helm are configured, you can configure your [Kubernetes cluster](helm-prepare).
 
 ## Additional information
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/helm-upgrade.md b/site2/website-next/versioned_docs/version-2.8.0/helm-upgrade.md
index dc76116..077045e 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/helm-upgrade.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/helm-upgrade.md
@@ -26,16 +26,22 @@ pass this file through `-f`. Thus `helm upgrade <release-name> apache/pulsar -f
 To upgrade Apache Pulsar to a newer version, follow these steps:
 
 1. Check the change log for the specific version you would like to upgrade to.
-2. Go through [deployment documentation](helm-deploy.md) step by step.
+2. Go through [deployment documentation](helm-deploy) step by step.
 3. Extract your previous `--set` arguments with the following command.
+
     ```bash
+
     helm get values <release-name> > pulsar.yaml
+
     ```
 4. Decide all the values you need to set.
 5. Perform the upgrade, with all `--set` arguments extracted in step 4.
+
     ```bash
+
     helm upgrade <release-name> apache/pulsar \
         --version <new version> \
         -f pulsar.yaml \
         --set ...
+
     ```
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-canal-source.md b/site2/website-next/versioned_docs/version-2.8.0/io-canal-source.md
index 3921aab..367dc8e 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-canal-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-canal-source.md
@@ -24,7 +24,7 @@ The configuration of Canal source connector has the following properties.
 |`destination`|true|None|Source destination that Canal source connector connects to.
 | `singleHostname` | false | None | Canal server address.|
 | `singlePort` | false | None | Canal server port.|
-| `cluster` | true | false | Whether to enable cluster mode based on Canal server configuration or not.<br/><br/><li>true: **cluster** mode.<br/>If set to true, it talks to `zkServers` to figure out the actual database host.<br/><br/></li><li>false: **standalone** mode.<br/>If set to false, it connects to the database specified by `singleHostname` and `singlePort`. </li>|
+| `cluster` | true | false | Whether to enable cluster mode based on Canal server configuration or not.<br /><br /><li>true: **cluster** mode.<br />If set to true, it talks to `zkServers` to figure out the actual database host.<br /><br /></li><li>false: **standalone** mode.<br />If set to false, it connects to the database specified by `singleHostname` and `singlePort`. </li>|
 | `zkServers` | true | None | Address and port of the Zookeeper that Canal source connector talks to figure out the actual database host.|
 | `batchSize` | false | 1000 | Batch size to fetch from Canal. |
 
@@ -35,6 +35,7 @@ Before using the Canal connector, you can create a configuration file through on
 * JSON 
 
     ```json
+
     {
         "zkServers": "127.0.0.1:2181",
         "batchSize": "5120",
@@ -45,6 +46,7 @@ Before using the Canal connector, you can create a configuration file through on
         "singleHostname": "127.0.0.1",
         "singlePort": "11111",
     }
+
     ```
 
 * YAML
@@ -52,6 +54,7 @@ Before using the Canal connector, you can create a configuration file through on
     You can create a YAML file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/canal/src/main/resources/canal-mysql-source-config.yaml) below to your YAML file.
 
     ```yaml
+
     configs:
         zkServers: "127.0.0.1:2181"
         batchSize: 5120
@@ -61,6 +64,7 @@ Before using the Canal connector, you can create a configuration file through on
         cluster: false
         singleHostname: "127.0.0.1"
         singlePort: 11111
+
     ```
 
 ## Usage
@@ -70,13 +74,16 @@ Here is an example of storing MySQL data using the configuration file as above.
 1. Start a MySQL server.
 
     ```bash
+
     $ docker pull mysql:5.7
     $ docker run -d -it --rm --name pulsar-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=canal -e MYSQL_USER=mysqluser -e MYSQL_PASSWORD=mysqlpw mysql:5.7
+
     ```
 
 2. Create a configuration file `mysqld.cnf`.
 
     ```bash
+
     [mysqld]
     pid-file    = /var/run/mysqld/mysqld.pid
     socket      = /var/run/mysqld/mysqld.sock
@@ -89,25 +96,35 @@ Here is an example of storing MySQL data using the configuration file as above.
     log-bin=mysql-bin
     binlog-format=ROW
     server_id=1
+
     ```
 
 3. Copy the configuration file `mysqld.cnf` to MySQL server.
    
+
     ```bash
+
     $ docker cp mysqld.cnf pulsar-mysql:/etc/mysql/mysql.conf.d/
+
     ```
 
 4.  Restart the MySQL server.
    
+
     ```bash
+
     $ docker restart pulsar-mysql
+
     ```
 
 5.  Create a test database in MySQL server.
    
+
     ```bash
+
     $ docker exec -it pulsar-mysql /bin/bash
     $ mysql -h 127.0.0.1 -uroot -pcanal -e 'create database test;'
+
     ```
 
 6. Start a Canal server and connect to MySQL server.
@@ -115,18 +132,22 @@ Here is an example of storing MySQL data using the configuration file as above.
     ```
     $ docker pull canal/canal-server:v1.1.2
     $ docker run -d -it --link pulsar-mysql -e canal.auto.scan=false -e canal.destinations=test -e canal.instance.master.address=pulsar-mysql:3306 -e canal.instance.dbUsername=root -e canal.instance.dbPassword=canal -e canal.instance.connectionCharset=UTF-8 -e canal.instance.tsdb.enable=true -e canal.instance.gtidon=false --name=pulsar-canal-server -p 8000:8000 -p 2222:2222 -p 11111:11111 -p 11112:11112 -m 4096m canal/canal-server:v1.1.2
+
     ```
 
 7. Start Pulsar standalone.
 
     ```bash
+
     $ docker pull apachepulsar/pulsar:2.3.0
     $ docker run -d -it --link pulsar-canal-server -p 6650:6650 -p 8080:8080 -v $PWD/data:/pulsar/data --name pulsar-standalone apachepulsar/pulsar:2.3.0 bin/pulsar standalone
+
     ```
 
 8. Modify the configuration file `canal-mysql-source-config.yaml`.
 
     ```yaml
+
     configs:
         zkServers: ""
         batchSize: "5120"
@@ -136,11 +157,13 @@ Here is an example of storing MySQL data using the configuration file as above.
         cluster: false
         singleHostname: "pulsar-canal-server"
         singlePort: "11111"
+
     ```
 
 9. Create a consumer file `pulsar-client.py`.
 
     ```python
+
     import pulsar
 
     client = pulsar.Client('pulsar://localhost:6650')
@@ -153,18 +176,23 @@ Here is an example of storing MySQL data using the configuration file as above.
         consumer.acknowledge(msg)
 
     client.close()
+
     ```
 
 10. Copy the configuration file `canal-mysql-source-config.yaml` and the consumer file  `pulsar-client.py` to Pulsar server.
 
     ```bash
+
     $ docker cp canal-mysql-source-config.yaml pulsar-standalone:/pulsar/conf/
     $ docker cp pulsar-client.py pulsar-standalone:/pulsar/
+
     ```
 
 11. Download a Canal connector and start it.
     
+
     ```bash
+
     $ docker exec -it pulsar-standalone /bin/bash
     $ wget https://archive.apache.org/dist/pulsar/pulsar-2.3.0/connectors/pulsar-io-canal-2.3.0.nar -P connectors
     $ ./bin/pulsar-admin source localrun \
@@ -176,25 +204,32 @@ Here is an example of storing MySQL data using the configuration file as above.
     --destination-topic-name my-topic \
     --source-config-file /pulsar/conf/canal-mysql-source-config.yaml \
     --parallelism 1
+
     ```
 
 12. Consume data from MySQL. 
 
     ```bash
+
     $ docker exec -it pulsar-standalone /bin/bash
     $ python pulsar-client.py
+
     ```
 
 13. Open another window to log in MySQL server.
 
     ```bash
+
     $ docker exec -it pulsar-mysql /bin/bash
     $ mysql -h 127.0.0.1 -uroot -pcanal
+
     ```
 
 14. Create a table, and insert, delete, and update data in MySQL server.
     
+
     ```bash
+
     mysql> use test;
     mysql> show tables;
     mysql> CREATE TABLE IF NOT EXISTS `test_table`(`test_id` INT UNSIGNED AUTO_INCREMENT,`test_title` VARCHAR(100) NOT NULL,
@@ -203,5 +238,6 @@ Here is an example of storing MySQL data using the configuration file as above.
     mysql> INSERT INTO test_table (test_title, test_author, test_date) VALUES("a", "b", NOW());
     mysql> UPDATE test_table SET test_title='c' WHERE test_title='a';
     mysql> DELETE FROM test_table WHERE test_title='c';
+
     ```
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-cassandra-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-cassandra-sink.md
index 5d05c94..699c7f1 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-cassandra-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-cassandra-sink.md
@@ -32,6 +32,7 @@ Before using the Cassandra sink connector, you need to create a configuration fi
 * JSON
 
     ```json
+
     {
         "roots": "localhost:9042",
         "keyspace": "pulsar_test_keyspace",
@@ -39,10 +40,12 @@ Before using the Cassandra sink connector, you need to create a configuration fi
         "keyname": "key",
         "columnName": "col"
     }
+
     ```
 
 * YAML
   
+
     ```
     configs:
         roots: "localhost:9042"
@@ -50,8 +53,8 @@ Before using the Cassandra sink connector, you need to create a configuration fi
         columnFamily: "pulsar_test_table"
         keyname: "key"
         columnName: "col"
-    ```
 
+    ```
 
 ## Usage
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-cdc-debezium.md b/site2/website-next/versioned_docs/version-2.8.0/io-cdc-debezium.md
index 8076b58..53770e1 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-cdc-debezium.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-cdc-debezium.md
@@ -25,11 +25,11 @@ The configuration of Debezium source connector has the following properties.
 | `database.password` | true | null | The password for a database user that has the required privileges. |
 | `database.server.id` | true | null | The connector’s identifier that must be unique within a database cluster and similar to the database’s server-id configuration property. |
 | `database.server.name` | true | null | The logical name of a database server/cluster, which forms a namespace and it is used in all the names of Kafka topics to which the connector writes, the Kafka Connect schema names, and the namespaces of the corresponding Avro schema when the Avro Connector is used. |
-| `database.whitelist` | false | null | A list of all databases hosted by this server which is monitored by the  connector.<br/><br/> This is optional, and there are other properties for listing databases and tables to include or exclude from monitoring. |
+| `database.whitelist` | false | null | A list of all databases hosted by this server which is monitored by the  connector.<br /><br /> This is optional, and there are other properties for listing databases and tables to include or exclude from monitoring. |
 | `key.converter` | true | null | The converter provided by Kafka Connect to convert record key. |
 | `value.converter` | true | null | The converter provided by Kafka Connect to convert record value.  |
 | `database.history` | true | null | The name of the database history class. |
-| `database.history.pulsar.topic` | true | null | The name of the database history topic where the connector writes and recovers DDL statements. <br/><br/>**Note: this topic is for internal use only and should not be used by consumers.** |
+| `database.history.pulsar.topic` | true | null | The name of the database history topic where the connector writes and recovers DDL statements. <br /><br />**Note: this topic is for internal use only and should not be used by consumers.** |
 | `database.history.pulsar.service.url` | true | null | Pulsar cluster service URL for history topic. |
 | `pulsar.service.url` | true | null | Pulsar cluster service URL for the offset topic used in Debezium. You can use the `bin/pulsar-admin --admin-url http://pulsar:8080 sources localrun --source-config-file configs/pg-pulsar-config.yaml` command to point to the target Pulsar cluster.|
 | `offset.storage.topic` | true | null | Record the last committed offsets that the connector successfully completes. |
@@ -52,6 +52,7 @@ You can use one of the following methods to create a configuration file.
 * JSON 
 
     ```json
+
     {
         "database.hostname": "localhost",
         "database.port": "3306",
@@ -68,6 +69,7 @@ You can use one of the following methods to create a configuration file.
         "pulsar.service.url": "pulsar://127.0.0.1:6650",
         "offset.storage.topic": "offset-topic"
     }
+
     ```
 
 * YAML 
@@ -75,11 +77,12 @@ You can use one of the following methods to create a configuration file.
     You can create a `debezium-mysql-source-config.yaml` file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mysql/src/main/resources/debezium-mysql-source-config.yaml) below to the `debezium-mysql-source-config.yaml` file.
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "debezium-mysql-source"
     topicName: "debezium-mysql-topic"
-    archive: "connectors/pulsar-io-debezium-mysql-{{pulsar:version}}.nar"
+    archive: "connectors/pulsar-io-debezium-mysql-@pulsar:version@.nar"
     parallelism: 1
 
     configs:
@@ -105,6 +108,7 @@ You can use one of the following methods to create a configuration file.
 
         ## OFFSET_STORAGE_TOPIC_CONFIG
         offset.storage.topic: "offset-topic"
+
     ```
 
 ### Usage
@@ -114,56 +118,69 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
 1. Start a MySQL server with a database from which Debezium can capture changes.
 
     ```bash
+
     $ docker run -it --rm \
     --name mysql \
     -p 3306:3306 \
     -e MYSQL_ROOT_PASSWORD=debezium \
     -e MYSQL_USER=mysqluser \
     -e MYSQL_PASSWORD=mysqlpw debezium/example-mysql:0.8
+
     ```
 
 2. Start a Pulsar service locally in standalone mode.
 
     ```bash
+
     $ bin/pulsar standalone
+
     ```
 
 3. Start the Pulsar Debezium connector in local run mode using one of the following methods.
 
      * Use the **JSON** configuration file as shown previously. 
    
-        Make sure the nar file is available at `connectors/pulsar-io-debezium-mysql-{{pulsar:version}}.nar`.
+        Make sure the nar file is available at `connectors/pulsar-io-debezium-mysql-@pulsar:version@.nar`.
 
         ```bash
+
         $ bin/pulsar-admin source localrun \
-        --archive connectors/pulsar-io-debezium-mysql-{{pulsar:version}}.nar \
+        --archive connectors/pulsar-io-debezium-mysql-@pulsar:version@.nar \
         --name debezium-mysql-source --destination-topic-name debezium-mysql-topic \
         --tenant public \
         --namespace default \
         --source-config '{"database.hostname": "localhost","database.port": "3306","database.user": "debezium","database.password": "dbz","database.server.id": "184054","database.server.name": "dbserver1","database.whitelist": "inventory","database.history": "org.apache.pulsar.io.debezium.PulsarDatabaseHistory","database.history.pulsar.topic": "history-topic","database.history.pulsar.service.url": "pulsar://127.0.0.1:6650","key.converter": "org.apache.kafka.connect.json.JsonConverter","v [...]
+
         ```
 
     * Use the **YAML** configuration file as shown previously.
   
+
         ```bash
+
         $ bin/pulsar-admin source localrun \
         --source-config-file debezium-mysql-source-config.yaml
+
         ```
 
 4. Subscribe the topic _sub-products_ for the table _inventory.products_.
 
     ```bash
+
     $ bin/pulsar-client consume -s "sub-products" public/default/dbserver1.inventory.products -n 0
+
     ```
 
 5. Start a MySQL client in docker.
 
     ```bash
+
     $ docker run -it --rm \
     --name mysqlterm \
     --link mysql \
     --rm mysql:5.7 sh \
     -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD"'
+
     ```
 
 6. A MySQL client pops out. 
@@ -176,6 +193,7 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
     mysql> SELECT * FROM  products;
     mysql> UPDATE products SET name='1111111111' WHERE id=101;
     mysql> UPDATE products SET name='1111111111' WHERE id=107;
+
     ```
 
     In the terminal window of subscribing topic, you can find the data changes have been kept in the _sub-products_ topic.
@@ -191,6 +209,7 @@ You can use one of the following methods to create a configuration file.
 * JSON 
 
     ```json
+
     {
         "database.hostname": "localhost",
         "database.port": "5432",
@@ -201,6 +220,7 @@ You can use one of the following methods to create a configuration file.
         "schema.whitelist": "inventory",
         "pulsar.service.url": "pulsar://127.0.0.1:6650"
     }
+
     ```
 
 * YAML 
@@ -208,11 +228,12 @@ You can use one of the following methods to create a configuration file.
     You can create a `debezium-postgres-source-config.yaml` file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/postgres/src/main/resources/debezium-postgres-source-config.yaml) below to the `debezium-postgres-source-config.yaml` file.
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "debezium-postgres-source"
     topicName: "debezium-postgres-topic"
-    archive: "connectors/pulsar-io-debezium-postgres-{{pulsar:version}}.nar"
+    archive: "connectors/pulsar-io-debezium-postgres-@pulsar:version@.nar"
     parallelism: 1
 
     configs:
@@ -228,6 +249,7 @@ You can use one of the following methods to create a configuration file.
 
         ## PULSAR_SERVICE_URL_CONFIG
         pulsar.service.url: "pulsar://127.0.0.1:6650"
+
     ```
 
 ### Usage
@@ -238,49 +260,62 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 1. Start a PostgreSQL server with a database from which Debezium can capture changes.
 
     ```bash
+
     $ docker pull debezium/example-postgres:0.8
     $ docker run -d -it --rm --name pulsar-postgresql -p 5432:5432  debezium/example-postgres:0.8
+
     ```
 
 2. Start a Pulsar service locally in standalone mode.
 
     ```bash
+
     $ bin/pulsar standalone
+
     ```
 
 3. Start the Pulsar Debezium connector in local run mode using one of the following methods.
 
    * Use the **JSON** configuration file as shown previously. 
      
-     Make sure the nar file is available at `connectors/pulsar-io-debezium-postgres-{{pulsar:version}}.nar`.
+     Make sure the nar file is available at `connectors/pulsar-io-debezium-postgres-@pulsar:version@.nar`.
 
         ```bash
+
         $ bin/pulsar-admin source localrun \
-        --archive connectors/pulsar-io-debezium-postgres-{{pulsar:version}}.nar \
+        --archive connectors/pulsar-io-debezium-postgres-@pulsar:version@.nar \
         --name debezium-postgres-source \
         --destination-topic-name debezium-postgres-topic \
         --tenant public \
         --namespace default \
         --source-config '{"database.hostname": "localhost","database.port": "5432","database.user": "postgres","database.password": "postgres","database.dbname": "postgres","database.server.name": "dbserver1","schema.whitelist": "inventory","pulsar.service.url": "pulsar://127.0.0.1:6650"}'
+
         ```
    
    * Use the **YAML** configuration file as shown previously.
       
+
         ```bash
+
         $ bin/pulsar-admin source localrun  \
         --source-config-file debezium-postgres-source-config.yaml
+
         ```
 
 4. Subscribe the topic _sub-products_ for the _inventory.products_ table.
 
     ```
     $ bin/pulsar-client consume -s "sub-products" public/default/dbserver1.inventory.products -n 0
+
     ```
 
 5. Start a PostgreSQL client in docker.
    
+
     ```bash
+
     $ docker exec -it pulsar-postgresql /bin/bash
+
     ```
 
 6. A PostgreSQL client pops out. 
@@ -309,13 +344,17 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
     
     postgres=# UPDATE products SET name='1111111111' WHERE id=107;
     UPDATE 1
+
     ```
 
     In the terminal window of subscribing topic, you can receive the following messages.
         
+
     ```bash
+
     ----- got message -----
     {"schema":{"type":"struct","fields":[{"type":"int32","optional":false,"field":"id"}],"optional":false,"name":"dbserver1.inventory.products.Key"},"payload":{"id":107}}�{"schema":{"type":"struct","fields":[{"type":"struct","fields":[{"type":"int32","optional":false,"field":"id"},{"type":"string","optional":false,"field":"name"},{"type":"string","optional":true,"field":"description"},{"type":"double","optional":true,"field":"weight"}],"optional":true,"name":"dbserver1.inventory.products [...]
+
     ```
 ## Example of MongoDB
 
@@ -324,6 +363,7 @@ You need to create a configuration file before using the Pulsar Debezium connect
 * JSON 
 
     ```json
+
     {
         "mongodb.hosts": "rs0/mongodb:27017",
         "mongodb.name": "dbserver1",
@@ -333,6 +373,7 @@ You need to create a configuration file before using the Pulsar Debezium connect
         "database.whitelist": "inventory",
         "pulsar.service.url": "pulsar://127.0.0.1:6650"
     }
+
     ```
 
 * YAML 
@@ -340,11 +381,12 @@ You need to create a configuration file before using the Pulsar Debezium connect
     You can create a `debezium-mongodb-source-config.yaml` file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mongodb/src/main/resources/debezium-mongodb-source-config.yaml) below to the `debezium-mongodb-source-config.yaml` file.
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "debezium-mongodb-source"
     topicName: "debezium-mongodb-topic"
-    archive: "connectors/pulsar-io-debezium-mongodb-{{pulsar:version}}.nar"
+    archive: "connectors/pulsar-io-debezium-mongodb-@pulsar:version@.nar"
     parallelism: 1
 
     configs:
@@ -359,6 +401,7 @@ You need to create a configuration file before using the Pulsar Debezium connect
 
         ## PULSAR_SERVICE_URL_CONFIG
         pulsar.service.url: "pulsar://127.0.0.1:6650"
+
     ```
 
 ### Usage
@@ -369,70 +412,90 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
 1. Start a MongoDB server with a database from which Debezium can capture changes.
 
     ```bash
+
     $ docker pull debezium/example-mongodb:0.10
     $ docker run -d -it --rm --name pulsar-mongodb -e MONGODB_USER=mongodb -e MONGODB_PASSWORD=mongodb -p 27017:27017  debezium/example-mongodb:0.10
+
     ```
      Use the following commands to initialize the data.
     
+
      ``` bash
      ./usr/local/bin/init-inventory.sh
+
      ```
      If the local host cannot access the container network, you can update the file ```/etc/hosts``` and add a rule ```127.0.0.1 6 f114527a95f```. f114527a95f is container id, you can try to get by ```docker ps -a```
 
-
 2. Start a Pulsar service locally in standalone mode.
 
     ```bash
+
     $ bin/pulsar standalone
+
     ```
 
 3. Start the Pulsar Debezium connector in local run mode using one of the following methods.
 
    * Use the **JSON** configuration file as shown previously. 
      
-     Make sure the nar file is available at `connectors/pulsar-io-mongodb-{{pulsar:version}}.nar`.
+     Make sure the nar file is available at `connectors/pulsar-io-mongodb-@pulsar:version@.nar`.
 
         ```bash
+
         $ bin/pulsar-admin source localrun \
-        --archive connectors/pulsar-io-debezium-mongodb-{{pulsar:version}}.nar \
+        --archive connectors/pulsar-io-debezium-mongodb-@pulsar:version@.nar \
         --name debezium-mongodb-source \
         --destination-topic-name debezium-mongodb-topic \
         --tenant public \
         --namespace default \
         --source-config '{"mongodb.hosts": "rs0/mongodb:27017","mongodb.name": "dbserver1","mongodb.user": "debezium","mongodb.password": "dbz","mongodb.task.id": "1","database.whitelist": "inventory","pulsar.service.url": "pulsar://127.0.0.1:6650"}'
+
         ```
    
    * Use the **YAML** configuration file as shown previously.
       
+
         ```bash
+
         $ bin/pulsar-admin source localrun  \
         --source-config-file debezium-mongodb-source-config.yaml
+
         ```
 
 4. Subscribe the topic _sub-products_ for the _inventory.products_ table.
 
     ```
     $ bin/pulsar-client consume -s "sub-products" public/default/dbserver1.inventory.products -n 0
+
     ```
 
 5. Start a MongoDB client in docker.
    
+
     ```bash
+
     $ docker exec -it pulsar-mongodb /bin/bash
+
     ```
 
 6. A MongoDB client pops out. 
    
+
     ```bash
+
     mongo -u debezium -p dbz --authenticationDatabase admin localhost:27017/inventory
     db.products.update({"_id":NumberLong(104)},{$set:{weight:1.25}})
+
     ```
 
     In the terminal window of subscribing topic, you can receive the following messages.
         
+
     ```bash
+
     ----- got message -----
     {"schema":{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"}],"optional":false,"name":"dbserver1.inventory.products.Key"},"payload":{"id":"104"}}, value = {"schema":{"type":"struct","fields":[{"type":"string","optional":true,"name":"io.debezium.data.Json","version":1,"field":"after"},{"type":"string","optional":true,"name":"io.debezium.data.Json","version":1,"field":"patch"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type [...]
+
     ```
    
 ## FAQ
@@ -470,10 +533,12 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
      at org.apache.pulsar.functions.instance.JavaInstanceRunnable.setupJavaInstance(JavaInstanceRunnable.java:200)
      at org.apache.pulsar.functions.instance.JavaInstanceRunnable.run(JavaInstanceRunnable.java:230)
      at java.lang.Thread.run(Thread.java:748)
+
 ``` 
 
 If you encounter the above problems in synchronizing data, please refer to [this](https://github.com/apache/pulsar/issues/4075) and add the following configuration to the configuration file:
 
 ```$xslt
 max.queue.size=
+
 ```
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-cdc.md b/site2/website-next/versioned_docs/version-2.8.0/io-cdc.md
index cbce7fc..f786860 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-cdc.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-cdc.md
@@ -11,19 +11,14 @@ import TabItem from '@theme/TabItem';
 
 CDC source connectors capture log changes of databases (such as MySQL, MongoDB, and PostgreSQL) into Pulsar.
 
-:::note
-
-CDC source connectors are built on top of [Canal](https://github.com/alibaba/canal) and [Debezium](https://debezium.io/) and store all data into Pulsar cluster in a persistent, replicated, and partitioned way.
-
-:::
-
+> CDC source connectors are built on top of [Canal](https://github.com/alibaba/canal) and [Debezium](https://debezium.io/) and store all data into Pulsar cluster in a persistent, replicated, and partitioned way.
 
 Currently, Pulsar has the following CDC connectors.
 
 Name|Java Class
 |---|---
-[Canal source connector](io-canal-source.md)|[org.apache.pulsar.io.canal.CanalStringSource.java](https://github.com/apache/pulsar/blob/master/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalStringSource.java)
-[Debezium source connector](io-cdc-debezium.md)|<li>[org.apache.pulsar.io.debezium.DebeziumSource.java](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/DebeziumSource.java)<br/></li><li>[org.apache.pulsar.io.debezium.mysql.DebeziumMysqlSource.java](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/DebeziumMysqlSource.java)<br/></li><li>[org.apache.pulsar. [...]
+[Canal source connector](io-canal-source)|[org.apache.pulsar.io.canal.CanalStringSource.java](https://github.com/apache/pulsar/blob/master/pulsar-io/canal/src/main/java/org/apache/pulsar/io/canal/CanalStringSource.java)
+[Debezium source connector](io-cdc-debezium)|<li>[org.apache.pulsar.io.debezium.DebeziumSource.java](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/core/src/main/java/org/apache/pulsar/io/debezium/DebeziumSource.java)<br /></li><li>[org.apache.pulsar.io.debezium.mysql.DebeziumMysqlSource.java](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mysql/src/main/java/org/apache/pulsar/io/debezium/mysql/DebeziumMysqlSource.java)<br /></li><li>[org.apache.pulsar.i [...]
 
 For more information about Canal and Debezium, see the information below.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-cli.md b/site2/website-next/versioned_docs/version-2.8.0/io-cli.md
index 7c66aa3..9657669 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-cli.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-cli.md
@@ -16,7 +16,9 @@ The `pulsar-admin` tool helps you manage Pulsar connectors.
 An interface for managing Pulsar IO sources (ingress data into Pulsar).
 
 ```bash
+
 $ pulsar-admin sources subcommands
+
 ```
 
 Subcommands are:
@@ -53,7 +55,9 @@ Submit a Pulsar IO source connector to run in a Pulsar cluster.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources create options
+
 ```
 
 #### Options
@@ -85,7 +89,9 @@ Update a already submitted Pulsar IO source connector.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources update options
+
 ```
 
 #### Options
@@ -118,7 +124,9 @@ Delete a Pulsar IO source connector.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources delete options
+
 ```
 
 #### Option
@@ -136,7 +144,9 @@ Get the information about a Pulsar IO source connector.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources get options
+
 ```
 
 #### Options
@@ -154,7 +164,9 @@ Check the current status of a Pulsar Source.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources status options
+
 ```
 
 #### Options
@@ -173,7 +185,9 @@ List all running Pulsar IO source connectors.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources list options
+
 ```
 
 #### Options
@@ -191,7 +205,9 @@ Stop a source instance.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources stop options
+
 ```
 
 #### Options
@@ -210,7 +226,9 @@ Start a source instance.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources start options
+
 ```
 
 #### Options
@@ -230,7 +248,9 @@ Restart a source instance.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources restart options
+
 ```
 
 #### Options
@@ -249,7 +269,9 @@ Run a Pulsar IO source connector locally rather than deploying it to the Pulsar
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources localrun options
+
 ```
 
 #### Options
@@ -288,7 +310,9 @@ Get the list of Pulsar IO connector sources supported by Pulsar cluster.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources available-sources
+
 ```
 
 ### `reload`
@@ -298,7 +322,9 @@ Reload the available built-in connectors.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sources reload
+
 ```
 
 ## `sinks`
@@ -306,7 +332,9 @@ $ pulsar-admin sources reload
 An interface for managing Pulsar IO sinks (egress data from Pulsar).
 
 ```bash
+
 $ pulsar-admin sinks subcommands
+
 ```
 
 Subcommands are:
@@ -343,7 +371,9 @@ Submit a Pulsar IO sink connector to run in a Pulsar cluster.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks create options
+
 ```
 
 #### Options
@@ -379,7 +409,9 @@ Update a Pulsar IO sink connector.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks update options
+
 ```
 
 #### Options
@@ -416,7 +448,9 @@ Delete a Pulsar IO sink connector.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks delete options
+
 ```
 
 #### Option
@@ -434,7 +468,9 @@ Get the information about a Pulsar IO sink connector.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks get options
+
 ```
 
 #### Options
@@ -452,7 +488,9 @@ Check the current status of a Pulsar sink.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks status options
+
 ```
 
 #### Options
@@ -472,7 +510,9 @@ List all running Pulsar IO sink connectors.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks list options
+
 ```
 
 #### Options
@@ -490,7 +530,9 @@ Stop a sink instance.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks stop options
+
 ```
 
 #### Options
@@ -509,7 +551,9 @@ Start a sink instance.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks start options
+
 ```
 
 #### Options
@@ -529,7 +573,9 @@ Restart a sink instance.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks restart options
+
 ```
 
 #### Options
@@ -549,7 +595,9 @@ Run a Pulsar IO sink connector locally rather than deploying it to the Pulsar cl
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks localrun options
+
 ```
 
 #### Options
@@ -595,7 +643,9 @@ Get the list of Pulsar IO connector sinks supported by Pulsar cluster.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks available-sinks
+
 ```
 
 ### `reload`
@@ -605,6 +655,8 @@ Reload the available built-in connectors.
 #### Usage
 
 ```bash
+
 $ pulsar-admin sinks reload
+
 ```
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.8.0/io-debezium-source.md
index 29ca3ef..ac069fe 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-debezium-source.md
@@ -25,11 +25,11 @@ The configuration of Debezium source connector has the following properties.
 | `database.password` | true | null | The password for a database user that has the required privileges. |
 | `database.server.id` | true | null | The connector’s identifier that must be unique within a database cluster and similar to the database’s server-id configuration property. |
 | `database.server.name` | true | null | The logical name of a database server/cluster, which forms a namespace and it is used in all the names of Kafka topics to which the connector writes, the Kafka Connect schema names, and the namespaces of the corresponding Avro schema when the Avro Connector is used. |
-| `database.whitelist` | false | null | A list of all databases hosted by this server which is monitored by the  connector.<br/><br/> This is optional, and there are other properties for listing databases and tables to include or exclude from monitoring. |
+| `database.whitelist` | false | null | A list of all databases hosted by this server which is monitored by the  connector.<br /><br /> This is optional, and there are other properties for listing databases and tables to include or exclude from monitoring. |
 | `key.converter` | true | null | The converter provided by Kafka Connect to convert record key. |
 | `value.converter` | true | null | The converter provided by Kafka Connect to convert record value.  |
 | `database.history` | true | null | The name of the database history class. |
-| `database.history.pulsar.topic` | true | null | The name of the database history topic where the connector writes and recovers DDL statements. <br/><br/>**Note: this topic is for internal use only and should not be used by consumers.** |
+| `database.history.pulsar.topic` | true | null | The name of the database history topic where the connector writes and recovers DDL statements. <br /><br />**Note: this topic is for internal use only and should not be used by consumers.** |
 | `database.history.pulsar.service.url` | true | null | Pulsar cluster service URL for history topic. |
 | `pulsar.service.url` | true | null | Pulsar cluster service URL. |
 | `offset.storage.topic` | true | null | Record the last committed offsets that the connector successfully completes. |
@@ -73,6 +73,7 @@ You can use one of the following methods to create a configuration file.
 * JSON 
 
     ```json
+
     {
         "database.hostname": "localhost",
         "database.port": "3306",
@@ -89,6 +90,7 @@ You can use one of the following methods to create a configuration file.
         "pulsar.service.url": "pulsar://127.0.0.1:6650",
         "offset.storage.topic": "offset-topic"
     }
+
     ```
 
 * YAML 
@@ -96,11 +98,12 @@ You can use one of the following methods to create a configuration file.
     You can create a `debezium-mysql-source-config.yaml` file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mysql/src/main/resources/debezium-mysql-source-config.yaml) below to the `debezium-mysql-source-config.yaml` file.
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "debezium-mysql-source"
     topicName: "debezium-mysql-topic"
-    archive: "connectors/pulsar-io-debezium-mysql-{{pulsar:version}}.nar"
+    archive: "connectors/pulsar-io-debezium-mysql-@pulsar:version@.nar"
     parallelism: 1
 
     configs:
@@ -126,6 +129,7 @@ You can use one of the following methods to create a configuration file.
 
         ## OFFSET_STORAGE_TOPIC_CONFIG
         offset.storage.topic: "offset-topic"
+
     ```
 
 ### Usage
@@ -135,56 +139,69 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
 1. Start a MySQL server with a database from which Debezium can capture changes.
 
     ```bash
+
     $ docker run -it --rm \
     --name mysql \
     -p 3306:3306 \
     -e MYSQL_ROOT_PASSWORD=debezium \
     -e MYSQL_USER=mysqluser \
     -e MYSQL_PASSWORD=mysqlpw debezium/example-mysql:0.8
+
     ```
 
 2. Start a Pulsar service locally in standalone mode.
 
     ```bash
+
     $ bin/pulsar standalone
+
     ```
 
 3. Start the Pulsar Debezium connector in local run mode using one of the following methods.
 
      * Use the **JSON** configuration file as shown previously. 
    
-        Make sure the nar file is available at `connectors/pulsar-io-debezium-mysql-{{pulsar:version}}.nar`.
+        Make sure the nar file is available at `connectors/pulsar-io-debezium-mysql-@pulsar:version@.nar`.
 
         ```bash
+
         $ bin/pulsar-admin source localrun \
-        --archive connectors/pulsar-io-debezium-mysql-{{pulsar:version}}.nar \
+        --archive connectors/pulsar-io-debezium-mysql-@pulsar:version@.nar \
         --name debezium-mysql-source --destination-topic-name debezium-mysql-topic \
         --tenant public \
         --namespace default \
         --source-config '{"database.hostname": "localhost","database.port": "3306","database.user": "debezium","database.password": "dbz","database.server.id": "184054","database.server.name": "dbserver1","database.whitelist": "inventory","database.history": "org.apache.pulsar.io.debezium.PulsarDatabaseHistory","database.history.pulsar.topic": "history-topic","database.history.pulsar.service.url": "pulsar://127.0.0.1:6650","key.converter": "org.apache.kafka.connect.json.JsonConverter","v [...]
+
         ```
 
     * Use the **YAML** configuration file as shown previously.
   
+
         ```bash
+
         $ bin/pulsar-admin source localrun \
         --source-config-file debezium-mysql-source-config.yaml
+
         ```
 
 4. Subscribe the topic _sub-products_ for the table _inventory.products_.
 
     ```bash
+
     $ bin/pulsar-client consume -s "sub-products" public/default/dbserver1.inventory.products -n 0
+
     ```
 
 5. Start a MySQL client in docker.
 
     ```bash
+
     $ docker run -it --rm \
     --name mysqlterm \
     --link mysql \
     --rm mysql:5.7 sh \
     -c 'exec mysql -h"$MYSQL_PORT_3306_TCP_ADDR" -P"$MYSQL_PORT_3306_TCP_PORT" -uroot -p"$MYSQL_ENV_MYSQL_ROOT_PASSWORD"'
+
     ```
 
 6. A MySQL client pops out. 
@@ -197,6 +214,7 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
     mysql> SELECT * FROM  products;
     mysql> UPDATE products SET name='1111111111' WHERE id=101;
     mysql> UPDATE products SET name='1111111111' WHERE id=107;
+
     ```
 
     In the terminal window of subscribing topic, you can find the data changes have been kept in the _sub-products_ topic.
@@ -212,6 +230,7 @@ You can use one of the following methods to create a configuration file.
 * JSON 
 
     ```json
+
     {
         "database.hostname": "localhost",
         "database.port": "5432",
@@ -224,6 +243,7 @@ You can use one of the following methods to create a configuration file.
         "table.whitelist": "public.users",
         "pulsar.service.url": "pulsar://127.0.0.1:6650"
     }
+
     ```
 
 * YAML 
@@ -231,11 +251,12 @@ You can use one of the following methods to create a configuration file.
     You can create a `debezium-postgres-source-config.yaml` file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/postgres/src/main/resources/debezium-postgres-source-config.yaml) below to the `debezium-postgres-source-config.yaml` file.
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "debezium-postgres-source"
     topicName: "debezium-postgres-topic"
-    archive: "connectors/pulsar-io-debezium-postgres-{{pulsar:version}}.nar"
+    archive: "connectors/pulsar-io-debezium-postgres-@pulsar:version@.nar"
     parallelism: 1
 
     configs:
@@ -253,6 +274,7 @@ You can use one of the following methods to create a configuration file.
 
         ## PULSAR_SERVICE_URL_CONFIG
         pulsar.service.url: "pulsar://127.0.0.1:6650"
+
     ```
     
 Notice that `pgoutput` is a standard plugin of Postgres introduced in version 10 - [see Postgres architecture docu](https://www.postgresql.org/docs/10/logical-replication-architecture.html). You don't need to install anything, just make sure the WAL level is set to `logical` (see docker command below and [Postgres docu](https://www.postgresql.org/docs/current/runtime-config-wal.html)).
@@ -265,52 +287,65 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 1. Start a PostgreSQL server with a database from which Debezium can capture changes.
 
     ```bash
+
     $ docker run -d -it --rm \
     --name pulsar-postgres \
     -p 5432:5432 \
     -e POSTGRES_PASSWORD=changeme \
     postgres:13.3 -c wal_level=logical
+
     ```
 
 2. Start a Pulsar service locally in standalone mode.
 
     ```bash
+
     $ bin/pulsar standalone
+
     ```
 
 3. Start the Pulsar Debezium connector in local run mode using one of the following methods.
 
    * Use the **JSON** configuration file as shown previously. 
      
-     Make sure the nar file is available at `connectors/pulsar-io-debezium-postgres-{{pulsar:version}}.nar`.
+     Make sure the nar file is available at `connectors/pulsar-io-debezium-postgres-@pulsar:version@.nar`.
 
         ```bash
+
         $ bin/pulsar-admin source localrun \
-        --archive connectors/pulsar-io-debezium-postgres-{{pulsar:version}}.nar \
+        --archive connectors/pulsar-io-debezium-postgres-@pulsar:version@.nar \
         --name debezium-postgres-source \
         --destination-topic-name debezium-postgres-topic \
         --tenant public \
         --namespace default \
         --source-config '{"database.hostname": "localhost","database.port": "5432","database.user": "postgres","database.password": "changeme","database.dbname": "postgres","database.server.name": "dbserver1","schema.whitelist": "public","table.whitelist": "public.users","pulsar.service.url": "pulsar://127.0.0.1:6650"}'
+
         ```
    
    * Use the **YAML** configuration file as shown previously.
       
+
         ```bash
+
         $ bin/pulsar-admin source localrun  \
         --source-config-file debezium-postgres-source-config.yaml
+
         ```
 
 4. Subscribe the topic _sub-users_ for the _public.users_ table.
 
     ```
     $ bin/pulsar-client consume -s "sub-users" public/default/dbserver1.public.users -n 0
+
     ```
 
 5. Start a PostgreSQL client in docker.
    
+
     ```bash
+
     $ docker exec -it pulsar-postgresql /bin/bash
+
     ```
 
 6. A PostgreSQL client pops out. 
@@ -343,14 +378,18 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
     
     postgres=# UPDATE users SET hash_firstname='maxim' WHERE id=1;
     UPDATE 1
+
     ```
 
     In the terminal window of subscribing topic, you can receive the following messages.
         
+
     ```bash
+
     ----- got message -----
     {"before":null,"after":{"id":1,"hash_firstname":"maxim","hash_lastname":"292113d30a3ccee0e19733dd7f88b258","gender":"male"},"source:{"version":"1.0.0.Final","connector":"postgresql","name":"foobar","ts_ms":1624045862644,"snapshot":"false","db":"postgres","schema":"public","table":"users","txId":595,"lsn":24419784,"xmin":null},"op":"u","ts_ms":1624045862648}
     ...many more
+
     ```
 ## Example of MongoDB
 
@@ -359,6 +398,7 @@ You need to create a configuration file before using the Pulsar Debezium connect
 * JSON 
 
     ```json
+
     {
         "mongodb.hosts": "rs0/mongodb:27017",
         "mongodb.name": "dbserver1",
@@ -368,6 +408,7 @@ You need to create a configuration file before using the Pulsar Debezium connect
         "database.whitelist": "inventory",
         "pulsar.service.url": "pulsar://127.0.0.1:6650"
     }
+
     ```
 
 * YAML 
@@ -375,11 +416,12 @@ You need to create a configuration file before using the Pulsar Debezium connect
     You can create a `debezium-mongodb-source-config.yaml` file and copy the [contents](https://github.com/apache/pulsar/blob/master/pulsar-io/debezium/mongodb/src/main/resources/debezium-mongodb-source-config.yaml) below to the `debezium-mongodb-source-config.yaml` file.
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "debezium-mongodb-source"
     topicName: "debezium-mongodb-topic"
-    archive: "connectors/pulsar-io-debezium-mongodb-{{pulsar:version}}.nar"
+    archive: "connectors/pulsar-io-debezium-mongodb-@pulsar:version@.nar"
     parallelism: 1
 
     configs:
@@ -394,6 +436,7 @@ You need to create a configuration file before using the Pulsar Debezium connect
 
         ## PULSAR_SERVICE_URL_CONFIG
         pulsar.service.url: "pulsar://127.0.0.1:6650"
+
     ```
 
 ### Usage
@@ -404,70 +447,90 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
 1. Start a MongoDB server with a database from which Debezium can capture changes.
 
     ```bash
+
     $ docker pull debezium/example-mongodb:0.10
     $ docker run -d -it --rm --name pulsar-mongodb -e MONGODB_USER=mongodb -e MONGODB_PASSWORD=mongodb -p 27017:27017  debezium/example-mongodb:0.10
+
     ```
      Use the following commands to initialize the data.
     
+
      ``` bash
      ./usr/local/bin/init-inventory.sh
+
      ```
      If the local host cannot access the container network, you can update the file ```/etc/hosts``` and add a rule ```127.0.0.1 6 f114527a95f```. f114527a95f is container id, you can try to get by ```docker ps -a```
 
-
 2. Start a Pulsar service locally in standalone mode.
 
     ```bash
+
     $ bin/pulsar standalone
+
     ```
 
 3. Start the Pulsar Debezium connector in local run mode using one of the following methods.
 
    * Use the **JSON** configuration file as shown previously. 
      
-     Make sure the nar file is available at `connectors/pulsar-io-mongodb-{{pulsar:version}}.nar`.
+     Make sure the nar file is available at `connectors/pulsar-io-mongodb-@pulsar:version@.nar`.
 
         ```bash
+
         $ bin/pulsar-admin source localrun \
-        --archive connectors/pulsar-io-debezium-mongodb-{{pulsar:version}}.nar \
+        --archive connectors/pulsar-io-debezium-mongodb-@pulsar:version@.nar \
         --name debezium-mongodb-source \
         --destination-topic-name debezium-mongodb-topic \
         --tenant public \
         --namespace default \
         --source-config '{"mongodb.hosts": "rs0/mongodb:27017","mongodb.name": "dbserver1","mongodb.user": "debezium","mongodb.password": "dbz","mongodb.task.id": "1","database.whitelist": "inventory","pulsar.service.url": "pulsar://127.0.0.1:6650"}'
+
         ```
    
    * Use the **YAML** configuration file as shown previously.
       
+
         ```bash
+
         $ bin/pulsar-admin source localrun  \
         --source-config-file debezium-mongodb-source-config.yaml
+
         ```
 
 4. Subscribe the topic _sub-products_ for the _inventory.products_ table.
 
     ```
     $ bin/pulsar-client consume -s "sub-products" public/default/dbserver1.inventory.products -n 0
+
     ```
 
 5. Start a MongoDB client in docker.
    
+
     ```bash
+
     $ docker exec -it pulsar-mongodb /bin/bash
+
     ```
 
 6. A MongoDB client pops out. 
    
+
     ```bash
+
     mongo -u debezium -p dbz --authenticationDatabase admin localhost:27017/inventory
     db.products.update({"_id":NumberLong(104)},{$set:{weight:1.25}})
+
     ```
 
     In the terminal window of subscribing topic, you can receive the following messages.
         
+
     ```bash
+
     ----- got message -----
     {"schema":{"type":"struct","fields":[{"type":"string","optional":false,"field":"id"}],"optional":false,"name":"dbserver1.inventory.products.Key"},"payload":{"id":"104"}}, value = {"schema":{"type":"struct","fields":[{"type":"string","optional":true,"name":"io.debezium.data.Json","version":1,"field":"after"},{"type":"string","optional":true,"name":"io.debezium.data.Json","version":1,"field":"patch"},{"type":"struct","fields":[{"type":"string","optional":false,"field":"version"},{"type [...]
+
     ```
    
 ## FAQ
@@ -505,10 +568,12 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
      at org.apache.pulsar.functions.instance.JavaInstanceRunnable.setupJavaInstance(JavaInstanceRunnable.java:200)
      at org.apache.pulsar.functions.instance.JavaInstanceRunnable.run(JavaInstanceRunnable.java:230)
      at java.lang.Thread.run(Thread.java:748)
+
 ``` 
 
 If you encounter the above problems in synchronizing data, please refer to [this](https://github.com/apache/pulsar/issues/4075) and add the following configuration to the configuration file:
 
 ```$xslt
 max.queue.size=
+
 ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-debug.md b/site2/website-next/versioned_docs/version-2.8.0/io-debug.md
index fb4b95b..fada255 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-debug.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-debug.md
@@ -13,54 +13,68 @@ To better demonstrate how to debug Pulsar connectors, here takes a Mongo sink co
 
 **Deploy a Mongo sink environment**
 1. Start a Mongo service.
+
     ```bash
+
     docker pull mongo:4
     docker run -d -p 27017:27017 --name pulsar-mongo -v $PWD/data:/data/db mongo:4
+
     ```
 2. Create a DB and a collection.
+
     ```bash
+
     docker exec -it pulsar-mongo /bin/bash
     mongo
-    :::note
-
-    use pulsar
-    db.createCollection('messages')
-    exit
-
-    :::
+    > use pulsar
+    > db.createCollection('messages')
+    > exit
 
     ```
 3. Start Pulsar standalone.
+
     ```bash
+
     docker pull apachepulsar/pulsar:2.4.0
     docker run -d -it -p 6650:6650 -p 8080:8080 -v $PWD/data:/pulsar/data --link pulsar-mongo --name pulsar-mongo-standalone apachepulsar/pulsar:2.4.0 bin/pulsar standalone
+
     ```
 4. Configure the Mongo sink with the `mongo-sink-config.yaml` file.
+
     ```bash
+
     configs:
     mongoUri: "mongodb://pulsar-mongo:27017"
     database: "pulsar"
     collection: "messages"
     batchSize: 2
     batchTimeMs: 500
+
     ```
     ```bash
+
     docker cp mongo-sink-config.yaml pulsar-mongo-standalone:/pulsar/
+
     ```
 5. Download the Mongo sink nar package.
+
     ```bash
+
     docker exec -it pulsar-mongo-standalone /bin/bash
     curl -O http://apache.01link.hk/pulsar/pulsar-2.4.0/connectors/pulsar-io-mongo-2.4.0.nar
+
     ```
 ## Debug in localrun mode
 Start the Mongo sink in localrun mode using the `localrun` command.
 :::tip
 
+
 For more information about the `localrun` command, see [`localrun`](reference-connector-admin.md/#localrun-1).
 
 :::
 
 ```bash
+
 ./bin/pulsar-admin sinks localrun \
 --archive pulsar-io-mongo-2.4.0.nar \ 
 --tenant public --namespace default \
@@ -68,35 +82,46 @@ For more information about the `localrun` command, see [`localrun`](reference-co
 --name pulsar-mongo-sink \
 --sink-config-file mongo-sink-config.yaml \
 --parallelism 1
+
 ```
 ### Use connector log
 Use one of the following methods to get a connector log in localrun mode:
 * After executing the `localrun` command, the **log is automatically printed on the console**.
 * The log is located at:
   
+
     ```bash
+
     logs/functions/tenant/namespace/function-name/function-name-instance-id.log
+
     ```
     
     **Example**
     
     The path of the Mongo sink connector is:
+
     ```bash
+
     logs/functions/public/default/pulsar-mongo-sink/pulsar-mongo-sink-0.log
+
     ```
 To clearly explain the log information, here breaks down the large block of information into small blocks and add descriptions for each block.
 * This piece of log information shows the storage path of the nar package after decompression.
+
     ```
     08:21:54.132 [main] INFO  org.apache.pulsar.common.nar.NarClassLoader - Created class loader with paths: [file:/tmp/pulsar-nar/pulsar-io-mongo-2.4.0.nar-unpacked/, file:/tmp/pulsar-nar/pulsar-io-mongo-2.4.0.nar-unpacked/META-INF/bundled-dependencies/,
-    ```
-    :::tip
 
-    If `class cannot be found` exception is thrown, check whether the nar file is decompressed in the folder `file:/tmp/pulsar-nar/pulsar-io-mongo-2.4.0.nar-unpacked/META-INF/bundled-dependencies/` or not.
+    ```
+   
+:::tip
 
-    :::
+If `class cannot be found` exception is thrown, check whether the nar file is decompressed in the folder `file:/tmp/pulsar-nar/pulsar-io-mongo-2.4.0.nar-unpacked/META-INF/bundled-dependencies/` or not.
 
+:::
 * This piece of log information illustrates the basic information about the Mongo sink connector, such as tenant, namespace, name, parallelism, resources, and so on, which can be used to **check whether the Mongo sink connector is configured correctly or not**.
+
     ```bash
+
     08:21:55.390 [main] INFO  org.apache.pulsar.functions.runtime.ThreadRuntime - ThreadContainer starting function with instance config InstanceConfig(instanceId=0, functionId=853d60a1-0c48-44d5-9a5c-6917386476b2, functionVersion=c2ce1458-b69e-4175-88c0-a0a856a2be8c, functionDetails=tenant: "public"
     namespace: "default"
     name: "pulsar-mongo-sink"
@@ -124,14 +149,20 @@ To clearly explain the log information, here breaks down the large block of info
     }
     componentType: SINK
     , maxBufferedTuples=1024, functionAuthenticationSpec=null, port=38459, clusterName=local)
+
     ```
 * This piece of log information demonstrates the status of the connections to Mongo and configuration information.
+
     ```bash
+
     08:21:56.231 [cluster-ClusterId{value='5d6396a3c9e77c0569ff00eb', description='null'}-pulsar-mongo:27017] INFO  org.mongodb.driver.connection - Opened connection [connectionId{localValue:1, serverValue:8}] to pulsar-mongo:27017
     08:21:56.326 [cluster-ClusterId{value='5d6396a3c9e77c0569ff00eb', description='null'}-pulsar-mongo:27017] INFO  org.mongodb.driver.cluster - Monitor thread successfully connected to server with description ServerDescription{address=pulsar-mongo:27017, type=STANDALONE, state=CONNECTED, ok=true, version=ServerVersion{versionList=[4, 2, 0]}, minWireVersion=0, maxWireVersion=8, maxDocumentSize=16777216, logicalSessionTimeoutMinutes=30, roundTripTimeNanos=89058800}
+
     ```
 * This piece of log information explains the configuration of consumers and clients, including the topic name, subscription name, subscription type, and so on.
+
     ```bash
+
     08:21:56.719 [pulsar-client-io-1-1] INFO  org.apache.pulsar.client.impl.ConsumerStatsRecorderImpl - Starting Pulsar consumer status recorder with config: {
     "topicNames" : [ "test-mongo" ],
     "topicsPattern" : null,
@@ -183,6 +214,7 @@ To clearly explain the log information, here breaks down the large block of info
     "defaultBackoffIntervalNanos" : 100000000,
     "maxBackoffIntervalNanos" : 30000000000
     }
+
     ```
 ## Debug in cluster mode
 You can use the following methods to debug a connector in cluster mode:
@@ -198,7 +230,9 @@ Pulsar admin CLI helps you debug Pulsar connectors with the following subcommand
 * [`topics stats`](#topics-stats)  
 
 **Create a Mongo sink**
+
 ```bash
+
 ./bin/pulsar-admin sinks create \
 --archive pulsar-io-mongo-2.4.0.nar \
 --tenant public \
@@ -207,10 +241,13 @@ Pulsar admin CLI helps you debug Pulsar connectors with the following subcommand
 --name pulsar-mongo-sink \
 --sink-config-file mongo-sink-config.yaml \
 --parallelism 1
+
 ```
 ### `get`
 Use the `get` command to get the basic information about the Mongo sink connector, such as tenant, namespace, name, parallelism, and so on.
+
 ```bash
+
 ./bin/pulsar-admin sinks get --tenant public --namespace default  --name pulsar-mongo-sink
 {
   "tenant": "public",
@@ -234,16 +271,20 @@ Use the `get` command to get the basic information about the Mongo sink connecto
   "retainOrdering": false,
   "autoAck": true
 }
+
 ```
+
 :::tip
 
+
 For more information about the `get` command, see [`get`](reference-connector-admin.md/#get-1).
 
 :::
-
 ### `status`
 Use the `status` command to get the current status about the Mongo sink connector, such as the number of instance, the number of running instance, instanceId, workerId and so on.
+
 ```bash
+
 ./bin/pulsar-admin sinks status 
 --tenant public \
 --namespace default  \
@@ -268,18 +309,21 @@ Use the `status` command to get the current status about the Mongo sink connecto
     }
 } ]
 }
+
 ```
 :::tip
 
+
 For more information about the `status` command, see [`status`](reference-connector-admin.md/#stauts-1).
 
 If there are multiple connectors running on a worker, `workerId` can locate the worker on which the specified connector is running.
 
 :::
-
 ### `topics stats`
 Use the `topics stats` command to get the stats for a topic and its connected producer and consumer, such as whether the topic has received messages or not, whether there is a backlog of messages or not, the available permits and other key information. All rates are computed over a 1-minute window and are relative to the last completed 1-minute period.
+
 ```bash
+
 ./bin/pulsar-admin topics stats test-mongo
 {
   "msgRateIn" : 0.0,
@@ -323,13 +367,14 @@ Use the `topics stats` command to get the stats for a topic and its connected pr
   "replication" : { },
   "deduplicationStatus" : "Disabled"
 }
+
 ```
 :::tip
 
+
 For more information about the `topic stats` command, see [`topic stats`](http://pulsar.apache.org/docs/en/pulsar-admin/#stats-1).
 
 :::
-
 ## Checklist
 This checklist indicates the major areas to check when you debug connectors. It is a reminder of what to look for to ensure a thorough review and an evaluation tool to get the status of connectors. 
 * Does Pulsar start successfully?
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-develop.md b/site2/website-next/versioned_docs/version-2.8.0/io-develop.md
index 311c742..8bb7667 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-develop.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-develop.md
@@ -12,15 +12,15 @@ import TabItem from '@theme/TabItem';
 This guide describes how to develop Pulsar connectors to move data
 between Pulsar and other systems. 
 
-Pulsar connectors are special [Pulsar Functions](functions-overview.md), so creating
+Pulsar connectors are special [Pulsar Functions](functions-overview), so creating
 a Pulsar connector is similar to creating a Pulsar function. 
 
 Pulsar connectors come in two types: 
 
 | Type | Description | Example
 |---|---|---
-{@inject: github:Source:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java}|Import data from another system to Pulsar.|[RabbitMQ source connector](io-rabbitmq.md) imports the messages of a RabbitMQ queue to a Pulsar topic.
-{@inject: github:Sink:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java}|Export data from Pulsar to another system.|[Kinesis sink connector](io-kinesis.md) exports the messages of a Pulsar topic to a Kinesis stream.
+{@inject: github:Source:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java}|Import data from another system to Pulsar.|[RabbitMQ source connector](io-rabbitmq) imports the messages of a RabbitMQ queue to a Pulsar topic.
+{@inject: github:Sink:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java}|Export data from Pulsar to another system.|[Kinesis sink connector](io-kinesis) exports the messages of a Pulsar topic to a Kinesis stream.
 
 ## Develop
 
@@ -34,6 +34,7 @@ interface, which means you need to implement the {@inject: github:open:/pulsar-i
 1. Implement the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method. 
 
     ```java
+
     /**
     * Open connector with configuration
     *
@@ -42,6 +43,7 @@ interface, which means you need to implement the {@inject: github:open:/pulsar-i
     * @throws Exception IO type exceptions when opening a connector
     */
     void open(final Map<String, Object> config, SourceContext sourceContext) throws Exception;
+
     ```
 
     This method is called when the source connector is initialized. 
@@ -56,6 +58,7 @@ interface, which means you need to implement the {@inject: github:open:/pulsar-i
 2. Implement the {@inject: github:read:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Source.java} method.
 
     ```java
+
         /**
         * Reads the next message from source.
         * If source does not have any new messages, this call should block.
@@ -63,6 +66,7 @@ interface, which means you need to implement the {@inject: github:open:/pulsar-i
         * @throws Exception
         */
         Record<T> read() throws Exception;
+
     ```
 
     If nothing to return, the implementation should be blocking rather than returning `null`. 
@@ -74,14 +78,14 @@ interface, which means you need to implement the {@inject: github:open:/pulsar-i
       |Variable|Required|Description
       |---|---|---
       `TopicName`|No|Pulsar topic name from which the record is originated from.
-      `Key`|No| Messages can optionally be tagged with keys.<br/><br/>For more information, see [Routing modes](concepts-messaging.md#routing-modes).|
+      `Key`|No| Messages can optionally be tagged with keys.<br /><br />For more information, see [Routing modes](concepts-messaging.md#routing-modes).|
       `Value`|Yes|Actual data of the record.
       `EventTime`|No|Event time of the record from the source.
-      `PartitionId`|No| If the record is originated from a partitioned source, it returns its `PartitionId`. <br/><br/>`PartitionId` is used as a part of the unique identifier by Pulsar IO runtime to deduplicate messages and achieve exactly-once processing guarantee.
-      `RecordSequence`|No|If the record is originated from a sequential source, it returns its `RecordSequence`.<br/><br/>`RecordSequence` is used as a part of the unique identifier by Pulsar IO runtime to deduplicate messages and achieve exactly-once processing guarantee.
+      `PartitionId`|No| If the record is originated from a partitioned source, it returns its `PartitionId`. <br /><br />`PartitionId` is used as a part of the unique identifier by Pulsar IO runtime to deduplicate messages and achieve exactly-once processing guarantee.
+      `RecordSequence`|No|If the record is originated from a sequential source, it returns its `RecordSequence`.<br /><br />`RecordSequence` is used as a part of the unique identifier by Pulsar IO runtime to deduplicate messages and achieve exactly-once processing guarantee.
       `Properties` |No| If the record carries user-defined properties, it returns those properties.
       `DestinationTopic`|No|Topic to which message should be written.
-      `Message`|No|A class which carries data sent by users.<br/><br/>For more information, see [Message.java](https://github.com/apache/pulsar/blob/master/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java).|
+      `Message`|No|A class which carries data sent by users.<br /><br />For more information, see [Message.java](https://github.com/apache/pulsar/blob/master/pulsar-client-api/src/main/java/org/apache/pulsar/client/api/Message.java).|
 
      * {@inject: github:Record:/pulsar-functions/api-java/src/main/java/org/apache/pulsar/functions/api/Record.java} should provide the following methods:
 
@@ -99,6 +103,7 @@ If you know the schema type that you are producing, you can declare the Java cla
 public class MySource implements Source<String> {
     public Record<String> read() {}
 }
+
 ```
 If you want to implement a source that works with any schema, you can go with `byte[]` (of `ByteBuffer`) and use Schema.AUTO_PRODUCE_BYTES().
 
@@ -119,6 +124,7 @@ public class MySource implements Source<byte[]> {
          }
     }
 }
+
 ```
 
 To handle the `KeyValue` type properly, follow the guidelines for your record implementation:
@@ -132,11 +138,11 @@ When Pulsar IO runtime encounters a `KVRecord`, it brings the following changes
 
 :::tip
 
+
 For more information about **how to create a source connector**, see {@inject: github:KafkaSource:/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java}.
 
 :::
 
-
 ### Sink
 
 Developing a sink connector **is similar to** developing a source connector, that is, you need to implement the {@inject: github:Sink:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} interface, which means implementing the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method and the {@inject: github:write:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
@@ -144,6 +150,7 @@ Developing a sink connector **is similar to** developing a source connector, tha
 1. Implement the {@inject: github:open:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
 
     ```java
+
         /**
         * Open connector with configuration
         *
@@ -152,17 +159,20 @@ Developing a sink connector **is similar to** developing a source connector, tha
         * @throws Exception IO type exceptions when opening a connector
         */
         void open(final Map<String, Object> config, SinkContext sinkContext) throws Exception;
+
     ```
 
 2. Implement the {@inject: github:write:/pulsar-io/core/src/main/java/org/apache/pulsar/io/core/Sink.java} method.
 
     ```java
+
         /**
         * Write a message to Sink
         * @param record record to write to sink
         * @throws Exception
         */
         void write(Record<T> record) throws Exception;
+
     ```
 
     During the implementation, you can decide how to write the `Value` and
@@ -180,6 +190,7 @@ If you know the Schema type that you are consuming from you can declare the Java
 public class MySink implements Sink<String> {
     public void write(Record<String> record) {}
 }
+
 ```
 
 If you want to implement a sink that works with any schema, you can you go with the special GenericObject interface.
@@ -197,6 +208,7 @@ public class MySink implements Sink<GenericObject> {
         ....
     }
 }
+
 ```
 
 In the case of AVRO, JSON, and Protobuf records (schemaType=AVRO,JSON,PROTOBUF_NATIVE), you can cast the
@@ -224,8 +236,8 @@ public class MySink implements Sink<GenericObject> {
         ....
     }
 }
-```
 
+```
 
 ## Test
 
@@ -245,38 +257,33 @@ You can create unit tests for your connector.
 Once you have written sufficient unit tests, you can add
 separate integration tests to verify end-to-end functionality. 
 
-Pulsar uses
-[testcontainers](https://www.testcontainers.org/) **for all integration tests**. 
+Pulsar uses [testcontainers](https://www.testcontainers.org/) **for all integration tests**. 
 
 :::tip
 
+
 For more information about **how to create integration tests for Pulsar connectors**, see {@inject: github:IntegrationTests:/tests/integration/src/test/java/org/apache/pulsar/tests/integration/io}.
 
 :::
 
-
 ## Package
 
 Once you've developed and tested your connector, you need to package it so that it can be submitted
-to a [Pulsar Functions](functions-overview.md) cluster. 
+to a [Pulsar Functions](functions-overview) cluster. 
 
 There are two methods to
 work with Pulsar Functions' runtime, that is, [NAR](#nar) and [uber JAR](#uber-jar).
 
 :::note
 
+
 If you plan to package and distribute your connector for others to use, you are obligated to
 
 :::
-
 license and copyright your own code properly. Remember to add the license and copyright to
 all libraries your code uses and to your distribution. 
-:::note
-
-If you use the [NAR](#nar) method, the NAR plugin 
-
-:::
-
+>
+> If you use the [NAR](#nar) method, the NAR plugin 
 automatically creates a `DEPENDENCIES` file in the generated NAR package, including the proper
 licensing and copyrights of all libraries of your connector.
 
@@ -287,20 +294,19 @@ a bit of Java ClassLoader isolation.
 
 :::tip
 
-For more information about **how NAR works**, see
-[here](https://medium.com/hashmapinc/nifi-nar-files-explained-14113f7796fd). 
 
-:::
+For more information about **how NAR works**, see [here](https://medium.com/hashmapinc/nifi-nar-files-explained-14113f7796fd). 
 
+:::
 
 Pulsar uses the same mechanism for packaging **all** [built-in connectors](io-connectors). 
 
-The easiest approach to package a Pulsar connector is to create a NAR package using
-[nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apache.nifi/nifi-nar-maven-plugin).
+The easiest approach to package a Pulsar connector is to create a NAR package using [nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apache.nifi/nifi-nar-maven-plugin).
 
 Include this [nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apache.nifi/nifi-nar-maven-plugin) in your maven project for your connector as below. 
 
 ```xml
+
 <plugins>
   <plugin>
     <groupId>org.apache.nifi</groupId>
@@ -308,26 +314,29 @@ Include this [nifi-nar-maven-plugin](https://mvnrepository.com/artifact/org.apac
     <version>1.2.0</version>
   </plugin>
 </plugins>
+
 ```
 
 You must also create a `resources/META-INF/services/pulsar-io.yaml` file with the following contents:
 
 ```yaml
+
 name: connector name
 description: connector description
 sourceClass: fully qualified class name (only if source connector)
 sinkClass: fully qualified class name (only if sink connector)
+
 ```
 
 For Gradle users, there is a [Gradle Nar plugin available on the Gradle Plugin Portal](https://plugins.gradle.org/plugin/io.github.lhotari.gradle-nar-plugin).
 
 :::tip
 
+
 For more information about an **how to use NAR for Pulsar connectors**, see {@inject: github:TwitterFirehose:/pulsar-io/twitter/pom.xml}.
 
 :::
 
-
 ### Uber JAR
 
 An alternative approach is to create an **uber JAR** that contains all of the connector's JAR files
@@ -336,6 +345,7 @@ and other resource files. No directory internal structure is necessary.
 You can use [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-plugin/examples/includes-excludes.html) to create a uber JAR as below:
 
 ```xml
+
 <plugin>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-shade-plugin</artifactId>
@@ -356,6 +366,7 @@ You can use [maven-shade-plugin](https://maven.apache.org/plugins/maven-shade-pl
     </execution>
   </executions>
 </plugin>
+
 ```
 
 ## Monitor
@@ -364,7 +375,7 @@ Pulsar connectors enable you to move data in and out of Pulsar easily. It is imp
 
 - Check the metrics provided by Pulsar.
 
-  Pulsar connectors expose the metrics that can be collected and used for monitoring the health of **Java** connectors. You can check the metrics by following the [monitoring](deploy-monitoring.md) guide.
+  Pulsar connectors expose the metrics that can be collected and used for monitoring the health of **Java** connectors. You can check the metrics by following the [monitoring](deploy-monitoring) guide.
 
 - Set and check your customized metrics.
 
@@ -400,6 +411,7 @@ public class TestMetricSink implements Sink<String> {
 
         }
     }
+
 ```
 
 </TabItem>
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-dynamodb-source.md b/site2/website-next/versioned_docs/version-2.8.0/io-dynamodb-source.md
index 5c9aa2c..cc071c8 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-dynamodb-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-dynamodb-source.md
@@ -24,19 +24,19 @@ The configuration of the DynamoDB source connector has the following properties.
 
 | Name | Type|Required | Default | Description 
 |------|----------|----------|---------|-------------|
-`initialPositionInStream`|InitialPositionInStream|false|LATEST|The position where the connector starts from.<br/><br/>Below are the available options:<br/><br/><li>`AT_TIMESTAMP`: start from the record at or after the specified timestamp.<br/><br/></li><li>`LATEST`: start after the most recent data record.<br/><br/></li><li>`TRIM_HORIZON`: start from the oldest available data record.</li>
+`initialPositionInStream`|InitialPositionInStream|false|LATEST|The position where the connector starts from.<br /><br />Below are the available options:<br /><br /><li>`AT_TIMESTAMP`: start from the record at or after the specified timestamp.<br /><br /></li><li>`LATEST`: start after the most recent data record.<br /><br /></li><li>`TRIM_HORIZON`: start from the oldest available data record.</li>
 `startAtTime`|Date|false|" " (empty string)|If set to `AT_TIMESTAMP`, it specifies the point in time to start consumption.
-`applicationName`|String|false|Pulsar IO connector|The name of the KCL application.  Must be unique, as it is used to define the table name for the dynamo table used for state tracking. <br/><br/>By default, the application name is included in the user agent string used to make AWS requests. This can assist with troubleshooting, for example, distinguish requests made by separate connector instances.
+`applicationName`|String|false|Pulsar IO connector|The name of the KCL application.  Must be unique, as it is used to define the table name for the dynamo table used for state tracking. <br /><br />By default, the application name is included in the user agent string used to make AWS requests. This can assist with troubleshooting, for example, distinguish requests made by separate connector instances.
 `checkpointInterval`|long|false|60000|The frequency of the KCL checkpoint in milliseconds.
 `backoffTime`|long|false|3000|The amount of time to delay between requests when the connector encounters a throttling exception from AWS Kinesis in milliseconds.
 `numRetries`|int|false|3|The number of re-attempts when the connector encounters an exception while trying to set a checkpoint.
-`receiveQueueSize`|int|false|1000|The maximum number of AWS records that can be buffered inside the connector. <br/><br/>Once the `receiveQueueSize` is reached, the connector does not consume any messages from Kinesis until some messages in the queue are successfully consumed.
+`receiveQueueSize`|int|false|1000|The maximum number of AWS records that can be buffered inside the connector. <br /><br />Once the `receiveQueueSize` is reached, the connector does not consume any messages from Kinesis until some messages in the queue are successfully consumed.
 `dynamoEndpoint`|String|false|" " (empty string)|The Dynamo end-point URL, which can be found at [here](https://docs.aws.amazon.com/general/latest/gr/rande.html).
 `cloudwatchEndpoint`|String|false|" " (empty string)|The Cloudwatch end-point URL, which can be found at [here](https://docs.aws.amazon.com/general/latest/gr/rande.html).
 `awsEndpoint`|String|false|" " (empty string)|The DynamoDB Streams end-point URL, which can be found at [here](https://docs.aws.amazon.com/general/latest/gr/rande.html).
-`awsRegion`|String|false|" " (empty string)|The AWS region. <br/><br/>**Example**<br/> us-west-1, us-west-2
+`awsRegion`|String|false|" " (empty string)|The AWS region. <br /><br />**Example**<br /> us-west-1, us-west-2
 `awsDynamodbStreamArn`|String|true|" " (empty string)|The DynamoDB stream arn.
-`awsCredentialPluginName`|String|false|" " (empty string)|The fully-qualified class name of implementation of {@inject: github:AwsCredentialProviderPlugin:/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsCredentialProviderPlugin.java}.<br /><br />`awsCredentialProviderPlugin` has the following built-in plugs:<br /><br /><li>`org.apache.pulsar.io.kinesis.AwsDefaultProviderChainPlugin`:<br /> this plugin uses the default AWS provider chain.<br />For more information, see [using the [...]
+`awsCredentialPluginName`|String|false|" " (empty string)|The fully-qualified class name of implementation of {@inject: github:AwsCredentialProviderPlugin:/pulsar-io/aws/src/main/java/org/apache/pulsar/io/aws/AwsCredentialProviderPlugin.java}.<br /><br />`awsCredentialProviderPlugin` has the following built-in plugs:<br /><br /><li>`org.apache.pulsar.io.kinesis.AwsDefaultProviderChainPlugin`:<br /> this plugin uses the default AWS provider chain.<br />For more information, see [using the [...]
 `awsCredentialPluginParam`|String |false|" " (empty string)|The JSON parameter to initialize `awsCredentialsProviderPlugin`.
 
 ### Example
@@ -46,6 +46,7 @@ Before using the DynamoDB source connector, you need to create a configuration f
 * JSON 
 
     ```json
+
     {
         "awsEndpoint": "https://some.endpoint.aws",
         "awsRegion": "us-east-1",
@@ -59,11 +60,13 @@ Before using the DynamoDB source connector, you need to create a configuration f
         "initialPositionInStream": "TRIM_HORIZON",
         "startAtTime": "2019-03-05T19:28:58.000Z"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         awsEndpoint: "https://some.endpoint.aws"
         awsRegion: "us-east-1"
@@ -76,5 +79,6 @@ Before using the DynamoDB source connector, you need to create a configuration f
         receiveQueueSize: 2000
         initialPositionInStream: "TRIM_HORIZON"
         startAtTime: "2019-03-05T19:28:58.000Z"
+
     ```
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-elasticsearch-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-elasticsearch-sink.md
index 53dd0bc..fe055fa 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-elasticsearch-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-elasticsearch-sink.md
@@ -38,22 +38,26 @@ Before using the ElasticSearch sink connector, you need to create a configuratio
 * JSON 
 
     ```json
+
     {
         "elasticSearchUrl": "http://localhost:9200",
         "indexName": "my_index",
         "username": "scooby",
         "password": "doobie"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         elasticSearchUrl: "http://localhost:9200"
         indexName: "my_index"
         username: "scooby"
         password: "doobie"
+
     ```
 
 #### For Elasticsearch Before 6.2
@@ -61,6 +65,7 @@ Before using the ElasticSearch sink connector, you need to create a configuratio
 * JSON 
 
     ```json
+
     {
         "elasticSearchUrl": "http://localhost:9200",
         "indexName": "my_index",
@@ -68,17 +73,20 @@ Before using the ElasticSearch sink connector, you need to create a configuratio
         "username": "scooby",
         "password": "doobie"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         elasticSearchUrl: "http://localhost:9200"
         indexName: "my_index"
         typeName: "doc"
         username: "scooby"
         password: "doobie"
+
     ```
 
 ### Usage
@@ -86,57 +94,79 @@ Before using the ElasticSearch sink connector, you need to create a configuratio
 1. Start a single node Elasticsearch cluster.
 
     ```bash
+
     $ docker run -p 9200:9200 -p 9300:9300 \
         -e "discovery.type=single-node" \
         docker.elastic.co/elasticsearch/elasticsearch:7.5.1
+
     ```
 
 2. Start a Pulsar service locally in standalone mode.
+
     ```bash
+
     $ bin/pulsar standalone
+
     ```
-    Make sure the NAR file is available at `connectors/pulsar-io-elastic-search-{{pulsar:version}}.nar`.
+    Make sure the NAR file is available at `connectors/pulsar-io-elastic-search-@pulsar:version@.nar`.
 
 3. Start the Pulsar Elasticsearch connector in local run mode using one of the following methods.
     * Use the **JSON** configuration as shown previously. 
+
         ```bash
+
         $ bin/pulsar-admin sinks localrun \
-            --archive connectors/pulsar-io-elastic-search-{{pulsar:version}}.nar \
+            --archive connectors/pulsar-io-elastic-search-@pulsar:version@.nar \
             --tenant public \
             --namespace default \
             --name elasticsearch-test-sink \
             --sink-config '{"elasticSearchUrl":"http://localhost:9200","indexName": "my_index","username": "scooby","password": "doobie"}' \
             --inputs elasticsearch_test
+
         ```
     * Use the **YAML** configuration file as shown previously.
     
+
         ```bash
+
         $ bin/pulsar-admin sinks localrun \
-            --archive connectors/pulsar-io-elastic-search-{{pulsar:version}}.nar \
+            --archive connectors/pulsar-io-elastic-search-@pulsar:version@.nar \
             --tenant public \
             --namespace default \
             --name elasticsearch-test-sink \
             --sink-config-file elasticsearch-sink.yml \
             --inputs elasticsearch_test
+
         ```
 
 4. Publish records to the topic.
 
     ```bash
+
     $ bin/pulsar-client produce elasticsearch_test --messages "{\"a\":1}"
+
     ```
 
 5. Check documents in Elasticsearch.
     
     * refresh the index
+
         ```bash
+
             $ curl -s http://localhost:9200/my_index/_refresh
+
         ``` 
     * search documents
+
         ```bash
+
             $ curl -s http://localhost:9200/my_index/_search
+
         ```
         You can see the record that published earlier has been successfully written into Elasticsearch.
+
         ```json
+
         {"took":2,"timed_out":false,"_shards":{"total":1,"successful":1,"skipped":0,"failed":0},"hits":{"total":{"value":1,"relation":"eq"},"max_score":1.0,"hits":[{"_index":"my_index","_type":"_doc","_id":"FSxemm8BLjG_iC0EeTYJ","_score":1.0,"_source":{"a":1}}]}}
+
         ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-file-source.md b/site2/website-next/versioned_docs/version-2.8.0/io-file-source.md
index 4be4f22..e4b427c 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-file-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-file-source.md
@@ -39,6 +39,7 @@ Before using the File source connector, you need to create a configuration file
 * JSON 
 
     ```json
+
     {
         "inputDirectory": "/Users/david",
         "recurse": true,
@@ -53,11 +54,13 @@ Before using the File source connector, you need to create a configuration file
         "pollingInterval": 5000,
         "numWorkers": 1
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         inputDirectory: "/Users/david"
         recurse: true
@@ -71,6 +74,7 @@ Before using the File source connector, you need to create a configuration file
         ignoreHiddenFiles: true
         pollingInterval: 5000
         numWorkers: 1
+
     ```
 
 ## Usage
@@ -80,37 +84,49 @@ Here is an example of using the File source connecter.
 1. Pull a Pulsar image.
 
     ```bash
+
     $ docker pull apachepulsar/pulsar:{version}
+
     ```
 
 2. Start Pulsar standalone.
    
+
     ```bash
+
     $ docker run -d -it -p 6650:6650 -p 8080:8080 -v $PWD/data:/pulsar/data --name pulsar-standalone apachepulsar/pulsar:{version} bin/pulsar standalone
+
     ```
 
 3. Create a configuration file _file-connector.yaml_.
 
     ```yaml
+
     configs:
         inputDirectory: "/opt"
+
     ```
 
 4. Copy the configuration file _file-connector.yaml_ to the container.
 
     ```bash
+
     $ docker cp connectors/file-connector.yaml pulsar-standalone:/pulsar/
+
     ```
 
 5. Download the File source connector.
 
     ```bash
+
     $ curl -O https://mirrors.tuna.tsinghua.edu.cn/apache/pulsar/pulsar-{version}/connectors/pulsar-io-file-{version}.nar
+
     ```
 
 6. Start the File source connector.
 
     ```bash
+
     $ docker exec -it pulsar-standalone /bin/bash
 
     $ ./bin/pulsar-admin sources localrun \
@@ -118,25 +134,33 @@ Here is an example of using the File source connecter.
     --name file-test \
     --destination-topic-name  pulsar-file-test \
     --source-config-file /pulsar/file-connector.yaml
+
     ```
 
 7. Start a consumer.
 
     ```bash
+
     ./bin/pulsar-client consume -s file-test -n 0 pulsar-file-test
+
     ```
 
 8. Write the message to the file _test.txt_.
    
+
     ```bash
+
     echo "hello world!" > /opt/test.txt
+
     ```
 
     The following information appears on the consumer terminal window.
 
     ```bash
+
     ----- got message -----
     hello world!
+
     ```
 
     
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-flume-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-flume-sink.md
index 086dfd4..b6b7e39 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-flume-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-flume-sink.md
@@ -29,16 +29,12 @@ The configuration of the Flume sink connector has the following properties.
 
 Before using the Flume sink connector, you need to create a configuration file through one of the following methods.
 
-:::note
-
-For more information about the `sink.conf` in the example below, see [here](https://github.com/apache/pulsar/blob/master/pulsar-io/flume/src/main/resources/flume/sink.conf).
-
-:::
-
+> For more information about the `sink.conf` in the example below, see [here](https://github.com/apache/pulsar/blob/master/pulsar-io/flume/src/main/resources/flume/sink.conf).
 
 * JSON 
 
     ```json
+
     {
         "name": "a1",
         "confFile": "sink.conf",
@@ -46,16 +42,19 @@ For more information about the `sink.conf` in the example below, see [here](http
         "zkConnString": "",
         "zkBasePath": ""
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         name: a1
         confFile: sink.conf
         noReloadConf: false
         zkConnString: ""
         zkBasePath: ""
+
     ```
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-flume-source.md b/site2/website-next/versioned_docs/version-2.8.0/io-flume-source.md
index 888d0ba..a046aaf 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-flume-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-flume-source.md
@@ -29,16 +29,12 @@ The configuration of the Flume source connector has the following properties.
 
 Before using the Flume source connector, you need to create a configuration file through one of the following methods.
 
-:::note
-
-For more information about the `source.conf` in the example below, see [here](https://github.com/apache/pulsar/blob/master/pulsar-io/flume/src/main/resources/flume/source.conf).
-
-:::
-
+> For more information about the `source.conf` in the example below, see [here](https://github.com/apache/pulsar/blob/master/pulsar-io/flume/src/main/resources/flume/source.conf).
 
 * JSON 
 
     ```json
+
     {
         "name": "a1",
         "confFile": "source.conf",
@@ -46,16 +42,19 @@ For more information about the `source.conf` in the example below, see [here](ht
         "zkConnString": "",
         "zkBasePath": ""
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         name: a1
         confFile: source.conf
         noReloadConf: false
         zkConnString: ""
         zkBasePath: ""
+
     ```
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-hbase-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-hbase-sink.md
index 1dcdfe8..9f5b36c 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-hbase-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-hbase-sink.md
@@ -38,6 +38,7 @@ Before using the HBase sink connector, you need to create a configuration file t
 * JSON 
 
     ```json
+
     {
         "hbaseConfigResources": "hbase-site.xml",
         "zookeeperQuorum": "localhost",
@@ -48,12 +49,13 @@ Before using the HBase sink connector, you need to create a configuration file t
         "familyName": "info",
         "qualifierNames": [ 'name', 'address', 'age']
     }
-    ```
 
+    ```
 
 * YAML
 
     ```yaml
+
     configs:
         hbaseConfigResources: "hbase-site.xml"
         zookeeperQuorum: "localhost"
@@ -63,6 +65,7 @@ Before using the HBase sink connector, you need to create a configuration file t
         rowKeyName: "rowKey"
         familyName: "info"
         qualifierNames: [ 'name', 'address', 'age']
+
     ```
 
     
\ No newline at end of file
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-hdfs2-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-hdfs2-sink.md
index 1804170..51c5597 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-hdfs2-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-hdfs2-sink.md
@@ -20,18 +20,18 @@ The configuration of the HDFS2 sink connector has the following properties.
 
 | Name | Type|Required | Default | Description 
 |------|----------|----------|---------|-------------|
-| `hdfsConfigResources` | String|true| None | A file or a comma-separated list containing the Hadoop file system configuration.<br/><br/>**Example**<br/>'core-site.xml'<br/>'hdfs-site.xml' |
+| `hdfsConfigResources` | String|true| None | A file or a comma-separated list containing the Hadoop file system configuration.<br /><br />**Example**<br />'core-site.xml'<br />'hdfs-site.xml' |
 | `directory` | String | true | None|The HDFS directory where files read from or written to. |
-| `encoding` | String |false |None |The character encoding for the files.<br/><br/>**Example**<br/>UTF-8<br/>ASCII |
-| `compression` | Compression |false |None |The compression code used to compress or de-compress the files on HDFS. <br/><br/>Below are the available options:<br/><li>BZIP2<br/></li><li>DEFLATE<br/></li><li>GZIP<br/></li><li>LZ4<br/></li><li>SNAPPY</li>|
+| `encoding` | String |false |None |The character encoding for the files.<br /><br />**Example**<br />UTF-8<br />ASCII |
+| `compression` | Compression |false |None |The compression code used to compress or de-compress the files on HDFS. <br /><br />Below are the available options:<br /><li>BZIP2<br /></li><li>DEFLATE<br /></li><li>GZIP<br /></li><li>LZ4<br /></li><li>SNAPPY</li>|
 | `kerberosUserPrincipal` |String| false| None|The principal account of Kerberos user used for authentication. |
 | `keytab` | String|false|None| The full pathname of the Kerberos keytab file used for authentication. |
-| `filenamePrefix` |String| true, if `compression` is set to `None`. | None |The prefix of the files created inside the HDFS directory.<br/><br/>**Example**<br/> The value of topicA result in files named topicA-. |
-| `fileExtension` | String| true | None | The extension added to the files written to HDFS.<br/><br/>**Example**<br/>'.txt'<br/> '.seq' |
-| `separator` | char|false |None |The character used to separate records in a text file. <br/><br/>If no value is provided, the contents from all records are concatenated together in one continuous byte array. |
+| `filenamePrefix` |String| true, if `compression` is set to `None`. | None |The prefix of the files created inside the HDFS directory.<br /><br />**Example**<br /> The value of topicA result in files named topicA-. |
+| `fileExtension` | String| true | None | The extension added to the files written to HDFS.<br /><br />**Example**<br />'.txt'<br /> '.seq' |
+| `separator` | char|false |None |The character used to separate records in a text file. <br /><br />If no value is provided, the contents from all records are concatenated together in one continuous byte array. |
 | `syncInterval` | long| false |0| The interval between calls to flush data to HDFS disk in milliseconds. |
-| `maxPendingRecords` |int| false|Integer.MAX_VALUE |  The maximum number of records that hold in memory before acking. <br/><br/>Setting this property to 1 makes every record send to disk before the record is acked.<br/><br/>Setting this property to a higher value allows buffering records before flushing them to disk. 
-| `subdirectoryPattern` | String | false | None | A subdirectory associated with the created time of the sink.<br/>The pattern is the formatted pattern of `directory`'s subdirectory.<br/><br/>See [DateTimeFormatter](https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html) for pattern's syntax. |
+| `maxPendingRecords` |int| false|Integer.MAX_VALUE |  The maximum number of records that hold in memory before acking. <br /><br />Setting this property to 1 makes every record send to disk before the record is acked.<br /><br />Setting this property to a higher value allows buffering records before flushing them to disk. 
+| `subdirectoryPattern` | String | false | None | A subdirectory associated with the created time of the sink.<br />The pattern is the formatted pattern of `directory`'s subdirectory.<br /><br />See [DateTimeFormatter](https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html) for pattern's syntax. |
 
 ### Example
 
@@ -40,6 +40,7 @@ Before using the HDFS2 sink connector, you need to create a configuration file t
 * JSON 
 
     ```json
+
     {
         "hdfsConfigResources": "core-site.xml",
         "directory": "/foo/bar",
@@ -48,11 +49,13 @@ Before using the HDFS2 sink connector, you need to create a configuration file t
         "compression": "SNAPPY",
         "subdirectoryPattern": "yyyy-MM-dd"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         hdfsConfigResources: "core-site.xml"
         directory: "/foo/bar"
@@ -60,4 +63,5 @@ Before using the HDFS2 sink connector, you need to create a configuration file t
         fileExtension: ".log"
         compression: "SNAPPY"
         subdirectoryPattern: "yyyy-MM-dd"
+
     ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-hdfs3-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-hdfs3-sink.md
index ff7457b..3f21357 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-hdfs3-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-hdfs3-sink.md
@@ -20,17 +20,17 @@ The configuration of the HDFS3 sink connector has the following properties.
 
 | Name | Type|Required | Default | Description 
 |------|----------|----------|---------|-------------|
-| `hdfsConfigResources` | String|true| None | A file or a comma-separated list containing the Hadoop file system configuration.<br/><br/>**Example**<br/>'core-site.xml'<br/>'hdfs-site.xml' |
+| `hdfsConfigResources` | String|true| None | A file or a comma-separated list containing the Hadoop file system configuration.<br /><br />**Example**<br />'core-site.xml'<br />'hdfs-site.xml' |
 | `directory` | String | true | None|The HDFS directory where files read from or written to. |
-| `encoding` | String |false |None |The character encoding for the files.<br/><br/>**Example**<br/>UTF-8<br/>ASCII |
-| `compression` | Compression |false |None |The compression code used to compress or de-compress the files on HDFS. <br/><br/>Below are the available options:<br/><li>BZIP2<br/></li><li>DEFLATE<br/></li><li>GZIP<br/></li><li>LZ4<br/></li><li>SNAPPY</li>|
+| `encoding` | String |false |None |The character encoding for the files.<br /><br />**Example**<br />UTF-8<br />ASCII |
+| `compression` | Compression |false |None |The compression code used to compress or de-compress the files on HDFS. <br /><br />Below are the available options:<br /><li>BZIP2<br /></li><li>DEFLATE<br /></li><li>GZIP<br /></li><li>LZ4<br /></li><li>SNAPPY</li>|
 | `kerberosUserPrincipal` |String| false| None|The principal account of Kerberos user used for authentication. |
 | `keytab` | String|false|None| The full pathname of the Kerberos keytab file used for authentication. |
-| `filenamePrefix` |String| false |None |The prefix of the files created inside the HDFS directory.<br/><br/>**Example**<br/> The value of topicA result in files named topicA-. |
-| `fileExtension` | String| false | None| The extension added to the files written to HDFS.<br/><br/>**Example**<br/>'.txt'<br/> '.seq' |
-| `separator` | char|false |None |The character used to separate records in a text file. <br/><br/>If no value is provided, the contents from all records are concatenated together in one continuous byte array. |
+| `filenamePrefix` |String| false |None |The prefix of the files created inside the HDFS directory.<br /><br />**Example**<br /> The value of topicA result in files named topicA-. |
+| `fileExtension` | String| false | None| The extension added to the files written to HDFS.<br /><br />**Example**<br />'.txt'<br /> '.seq' |
+| `separator` | char|false |None |The character used to separate records in a text file. <br /><br />If no value is provided, the contents from all records are concatenated together in one continuous byte array. |
 | `syncInterval` | long| false |0| The interval between calls to flush data to HDFS disk in milliseconds. |
-| `maxPendingRecords` |int| false|Integer.MAX_VALUE |  The maximum number of records that hold in memory before acking. <br/><br/>Setting this property to 1 makes every record send to disk before the record is acked.<br/><br/>Setting this property to a higher value allows buffering records before flushing them to disk. 
+| `maxPendingRecords` |int| false|Integer.MAX_VALUE |  The maximum number of records that hold in memory before acking. <br /><br />Setting this property to 1 makes every record send to disk before the record is acked.<br /><br />Setting this property to a higher value allows buffering records before flushing them to disk. 
 
 ### Example
 
@@ -39,20 +39,24 @@ Before using the HDFS3 sink connector, you need to create a configuration file t
 * JSON 
 
     ```json
+
     {
         "hdfsConfigResources": "core-site.xml",
         "directory": "/foo/bar",
         "filenamePrefix": "prefix",
         "compression": "SNAPPY"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         hdfsConfigResources: "core-site.xml"
         directory: "/foo/bar"
         filenamePrefix: "prefix"
         compression: "SNAPPY"
+
     ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-influxdb-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-influxdb-sink.md
index 2f2f881..f7fa3f6 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-influxdb-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-influxdb-sink.md
@@ -50,7 +50,9 @@ The configuration of the InfluxDB sink connector has the following properties.
 Before using the InfluxDB sink connector, you need to create a configuration file through one of the following methods.
 #### InfluxDBv2
 * JSON
+
     ```json
+
     {
         "influxdbUrl": "http://localhost:9999",
         "organization": "example-org",
@@ -62,10 +64,13 @@ Before using the InfluxDB sink connector, you need to create a configuration fil
         "batchTimeMs": 1000,
         "batchSize": 100
     }
+
     ```
   
 * YAML
+
     ```yaml
+
     {
         influxdbUrl: "http://localhost:9999"
         organization: "example-org"
@@ -77,6 +82,7 @@ Before using the InfluxDB sink connector, you need to create a configuration fil
         batchTimeMs: 1000
         batchSize: 100
     }
+
     ```
   
 #### InfluxDBv1
@@ -84,6 +90,7 @@ Before using the InfluxDB sink connector, you need to create a configuration fil
 * JSON 
 
     ```json
+
     {
         "influxdbUrl": "http://localhost:8086",
         "database": "test_db",
@@ -94,11 +101,13 @@ Before using the InfluxDB sink connector, you need to create a configuration fil
         "batchTimeMs": 1000,
         "batchSize": 100
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     {
         influxdbUrl: "http://localhost:8086"
         database: "test_db"
@@ -109,4 +118,5 @@ Before using the InfluxDB sink connector, you need to create a configuration fil
         batchTimeMs: 1000
         batchSize: 100
     }
+
     ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-jdbc-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-jdbc-sink.md
index 2d899ee..8700dfc 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-jdbc-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-jdbc-sink.md
@@ -12,12 +12,7 @@ import TabItem from '@theme/TabItem';
 The JDBC sink connectors allow pulling messages from Pulsar topics 
 and persists the messages to ClickHouse, MariaDB, PostgreSQL, and SQLite.
 
-:::note
-
-Currently, INSERT, DELETE and UPDATE operations are supported.
-
-:::
-
+> Currently, INSERT, DELETE and UPDATE operations are supported.
 
 ## Configuration 
 
@@ -41,17 +36,20 @@ The configuration of all JDBC sink connectors has the following properties.
 * JSON 
 
     ```json
+
     {
         "userName": "clickhouse",
         "password": "password",
         "jdbcUrl": "jdbc:clickhouse://localhost:8123/pulsar_clickhouse_jdbc_sink",
         "tableName": "pulsar_clickhouse_jdbc_sink"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "jdbc-clickhouse-sink"
@@ -62,6 +60,7 @@ The configuration of all JDBC sink connectors has the following properties.
         password: "password"
         jdbcUrl: "jdbc:clickhouse://localhost:8123/pulsar_clickhouse_jdbc_sink"
         tableName: "pulsar_clickhouse_jdbc_sink"
+
     ```
 
 ### Example for MariaDB
@@ -69,17 +68,20 @@ The configuration of all JDBC sink connectors has the following properties.
 * JSON 
 
     ```json
+
     {
         "userName": "mariadb",
         "password": "password",
         "jdbcUrl": "jdbc:mariadb://localhost:3306/pulsar_mariadb_jdbc_sink",
         "tableName": "pulsar_mariadb_jdbc_sink"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "jdbc-mariadb-sink"
@@ -90,6 +92,7 @@ The configuration of all JDBC sink connectors has the following properties.
         password: "password"
         jdbcUrl: "jdbc:mariadb://localhost:3306/pulsar_mariadb_jdbc_sink"
         tableName: "pulsar_mariadb_jdbc_sink"
+
     ```
 
 ### Example for PostgreSQL
@@ -99,17 +102,20 @@ Before using the JDBC PostgreSQL sink connector, you need to create a configurat
 * JSON 
 
     ```json
+
     {
         "userName": "postgres",
         "password": "password",
         "jdbcUrl": "jdbc:postgresql://localhost:5432/pulsar_postgres_jdbc_sink",
         "tableName": "pulsar_postgres_jdbc_sink"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "jdbc-postgres-sink"
@@ -120,6 +126,7 @@ Before using the JDBC PostgreSQL sink connector, you need to create a configurat
         password: "password"
         jdbcUrl: "jdbc:postgresql://localhost:5432/pulsar_postgres_jdbc_sink"
         tableName: "pulsar_postgres_jdbc_sink"
+
     ```
 
 For more information on **how to use this JDBC sink connector**, see [connect Pulsar to PostgreSQL](io-quickstart.md#connect-pulsar-to-postgresql).
@@ -129,15 +136,18 @@ For more information on **how to use this JDBC sink connector**, see [connect Pu
 * JSON 
 
     ```json
+
     {
         "jdbcUrl": "jdbc:sqlite:db.sqlite",
         "tableName": "pulsar_sqlite_jdbc_sink"
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     tenant: "public"
     namespace: "default"
     name: "jdbc-sqlite-sink"
@@ -146,4 +156,5 @@ For more information on **how to use this JDBC sink connector**, see [connect Pu
     configs:
         jdbcUrl: "jdbc:sqlite:db.sqlite"
         tableName: "pulsar_sqlite_jdbc_sink"
+
     ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-kafka-sink.md b/site2/website-next/versioned_docs/version-2.8.0/io-kafka-sink.md
index bf2d77f..c1669c1 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-kafka-sink.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-kafka-sink.md
@@ -23,13 +23,13 @@ The configuration of the Kafka sink connector has the following parameters.
 | Name | Type| Required | Default | Description 
 |------|----------|---------|-------------|-------------|
 |  `bootstrapServers` |String| true | " " (empty string) | A comma-separated list of host and port pairs for establishing the initial connection to the Kafka cluster. |
-|`acks`|String|true|" " (empty string) |The number of acknowledgments that the producer requires the leader to receive before a request completes. <br/>This controls the durability of the sent records.
+|`acks`|String|true|" " (empty string) |The number of acknowledgments that the producer requires the leader to receive before a request completes. <br />This controls the durability of the sent records.
 |`batchsize`|long|false|16384L|The batch size that a Kafka producer attempts to batch records together before sending them to brokers.
 |`maxRequestSize`|long|false|1048576L|The maximum size of a Kafka request in bytes.
 |`topic`|String|true|" " (empty string) |The Kafka topic which receives messages from Pulsar.
 | `keyDeserializationClass` | String|false | org.apache.kafka.common.serialization.StringSerializer | The serializer class for Kafka producers to serialize keys.
-| `valueDeserializationClass` | String|false | org.apache.kafka.common.serialization.ByteArraySerializer | The serializer class for Kafka producers to serialize values.<br/><br/>The serializer is set by a specific implementation of [`KafkaAbstractSink`](https://github.com/apache/pulsar/blob/master/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java).
-|`producerConfigProperties`|Map|false|" " (empty string)|The producer configuration properties to be passed to producers. <br/><br/>**Note:  other properties specified in the connector configuration file take precedence over this configuration**.
+| `valueDeserializationClass` | String|false | org.apache.kafka.common.serialization.ByteArraySerializer | The serializer class for Kafka producers to serialize values.<br /><br />The serializer is set by a specific implementation of [`KafkaAbstractSink`](https://github.com/apache/pulsar/blob/master/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSink.java).
+|`producerConfigProperties`|Map|false|" " (empty string)|The producer configuration properties to be passed to producers. <br /><br />**Note:  other properties specified in the connector configuration file take precedence over this configuration**.
 
 
 ### Example
@@ -39,6 +39,7 @@ Before using the Kafka sink connector, you need to create a configuration file t
 * JSON 
 
     ```json
+
     {
         "bootstrapServers": "localhost:6667",
         "topic": "test",
@@ -57,7 +58,9 @@ Before using the Kafka sink connector, you need to create a configuration file t
 
 * YAML
   
+
     ```yaml
+
     configs:
         bootstrapServers: "localhost:6667"
         topic: "test"
@@ -70,4 +73,5 @@ Before using the Kafka sink connector, you need to create a configuration file t
             sasl.mechanism: "GSSAPI"
             sasl.kerberos.service.name: "kafka"
             acks: "all"   
+
     ```
diff --git a/site2/website-next/versioned_docs/version-2.8.0/io-kafka-source.md b/site2/website-next/versioned_docs/version-2.8.0/io-kafka-source.md
index ed15dfa..fb852c9 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/io-kafka-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/io-kafka-source.md
@@ -25,13 +25,13 @@ The configuration of the Kafka source connector has the following properties.
 | `bootstrapServers` |String| true | " " (empty string) | A comma-separated list of host and port pairs for establishing the initial connection to the Kafka cluster. |
 | `groupId` |String| true | " " (empty string) | A unique string that identifies the group of consumer processes to which this consumer belongs. |
 | `fetchMinBytes` | long|false | 1 | The minimum byte expected for each fetch response. |
-| `autoCommitEnabled` | boolean |false | true | If set to true, the consumer's offset is periodically committed in the background.<br/><br/> This committed offset is used when the process fails as the position from which a new consumer begins. |
+| `autoCommitEnabled` | boolean |false | true | If set to true, the consumer's offset is periodically committed in the background.<br /><br /> This committed offset is used when the process fails as the position from which a new consumer begins. |
 | `autoCommitIntervalMs` | long|false | 5000 | The frequency in milliseconds that the consumer offsets are auto-committed to Kafka if `autoCommitEnabled` is set to true. |
-| `heartbeatIntervalMs` | long| false | 3000 | The interval between heartbeats to the consumer when using Kafka's group management facilities. <br/><br/>**Note: `heartbeatIntervalMs` must be smaller than `sessionTimeoutMs`**.|
+| `heartbeatIntervalMs` | long| false | 3000 | The interval between heartbeats to the consumer when using Kafka's group management facilities. <br /><br />**Note: `heartbeatIntervalMs` must be smaller than `sessionTimeoutMs`**.|
 | `sessionTimeoutMs` | long|false | 30000 | The timeout used to detect consumer failures when using Kafka's group management facility. |
 | `topic` | String|true | " " (empty string)| The Kafka topic which sends messages to Pulsar. |
-| `consumerConfigProperties` | Map| false | " " (empty string) | The consumer configuration properties to be passed to consumers. <br/><br/>**Note: other properties specified in the connector configuration file take precedence over this configuration**. |
-| `keyDeserializationClass` | String|false | org.apache.kafka.common.serialization.StringDeserializer | The deserializer class for Kafka consumers to deserialize keys.<br/> The deserializer is set by a specific implementation of [`KafkaAbstractSource`](https://github.com/apache/pulsar/blob/master/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java).
+| `consumerConfigProperties` | Map| false | " " (empty string) | The consumer configuration properties to be passed to consumers. <br /><br />**Note: other properties specified in the connector configuration file take precedence over this configuration**. |
+| `keyDeserializationClass` | String|false | org.apache.kafka.common.serialization.StringDeserializer | The deserializer class for Kafka consumers to deserialize keys.<br /> The deserializer is set by a specific implementation of [`KafkaAbstractSource`](https://github.com/apache/pulsar/blob/master/pulsar-io/kafka/src/main/java/org/apache/pulsar/io/kafka/KafkaAbstractSource.java).
 | `valueDeserializationClass` | String|false | org.apache.kafka.common.serialization.ByteArrayDeserializer | The deserializer class for Kafka consumers to deserialize values.
 | `autoOffsetReset` | String | false | "earliest" | The default offset reset policy. |
 
@@ -72,6 +72,7 @@ Before using the Kafka source connector, you need to create a configuration file
 * JSON 
 
     ```json
+
     {
         "bootstrapServers": "pulsar-kafka:9092",
         "groupId": "test-pulsar-io",
@@ -79,17 +80,20 @@ Before using the Kafka source connector, you need to create a configuration file
         "sessionTimeoutMs": "10000",
         "autoCommitEnabled": false
     }
+
     ```
 
 * YAML
 
     ```yaml
+
     configs:
         bootstrapServers: "pulsar-kafka:9092"
         groupId: "test-pulsar-io"
         topic: "my-topic"
         sessionTimeoutMs: "10000"
         autoCommitEnabled: false
+
     ```
 
 ## Usage
@@ -99,53 +103,71 @@ Here is an example of using the Kafka source connector with the configuration fi
 1. Download a Kafka client and a Kafka connector.
 
     ```bash
+
     $ wget https://repo1.maven.org/maven2/org/apache/kafka/kafka-clients/0.10.2.1/kafka-clients-0.10.2.1.jar
 
     $ wget https://archive.apache.org/dist/pulsar/pulsar-2.4.0/connectors/pulsar-io-kafka-2.4.0.nar
+
     ```
 
 2. Create a network.
    
+
    ```bash
+
    $ docker network create kafka-pulsar
+
    ```
 
 3. Pull a ZooKeeper image and start ZooKeeper.
    
+
    ```bash
+
    $ docker pull wurstmeister/zookeeper
 
    $ docker run -d -it -p 2181:2181 --name pulsar-kafka-zookeeper --network kafka-pulsar wurstmeister/zookeeper
+
    ```
 
 4. Pull a Kafka image and start Kafka.
    
+
    ```bash
+
    $ docker pull wurstmeister/kafka:2.11-1.0.2
    
    $ docker run -d -it --network kafka-pulsar -p 6667:6667 -p 9092:9092 -e KAFKA_ADVERTISED_HOST_NAME=pulsar-kafka -e KAFKA_ZOOKEEPER_CONNECT=pulsar-kafka-zookeeper:2181 --name pulsar-kafka wurstmeister/kafka:2.11-1.0.2
+
    ```
 
 5. Pull a Pulsar image and start Pulsar standalone.
    
+
    ```bash
-   $ docker pull apachepulsar/pulsar:{{pulsar:version}}
+
+   $ docker pull apachepulsar/pulsar:@pulsar:version@
    
    $ docker run -d -it --network kafka-pulsar -p 6650:6650 -p 8080:8080 -v $PWD/data:/pulsar/data --name pulsar-kafka-standalone apachepulsar/pulsar:2.4.0 bin/pulsar standalone
+
    ```
 
 6. Create a producer file _kafka-producer.py_.
    
+
    ```python
+
    from kafka import KafkaProducer
    producer = KafkaProducer(bootstrap_servers='pulsar-kafka:9092')
    future = producer.send('my-topic', b'hello world')
    future.get()
+
    ```
 
 7. Create a consumer file _pulsar-client.py_.
 
     ```python
+
     import pulsar
 
     client = pulsar.Client('pulsar://localhost:6650')
@@ -159,24 +181,29 @@ Here is an example of using the Kafka source connector with the configuration fi
         consumer.acknowledge(msg)
 
     client.close()
+
     ```
 
 8. Copy the following files to Pulsar.
    
+
     ```bash
-    $ docker cp pulsar-io-kafka-{{pulsar:version}}.nar pulsar-kafka-standalone:/pulsar
+
+    $ docker cp pulsar-io-kafka-@pulsar:version@.nar pulsar-kafka-standalone:/pulsar
     $ docker cp kafkaSourceConfig.yaml pulsar-kafka-standalone:/pulsar/conf
     $ docker cp pulsar-client.py pulsar-kafka-standalone:/pulsar/
     $ docker cp kafka-producer.py pulsar-kafka-standalone:/pulsar/
+
     ```
 
 9. Open a new terminal window and start the Kafka source connector in local run mode. 
 
     ```bash
+
     $ docker exec -it pulsar-kafka-standalone /bin/bash
 
     $ ./bin/pulsar-admin source localrun \
-    --archive ./pulsar-io-kafka-{{pulsar:version}}.nar \
+    --archive ./pulsar-io-kafka-@pulsar:version@.nar \
     --classname org.apache.pulsar.io.kafka.KafkaBytesSource \
     --tenant public \
     --namespace default \
@@ -184,20 +211,25 @@ Here is an example of using the Kafka source connector with the configuration fi
     --destination-topic-name my-topic \
     --source-config-file ./conf/kafkaSourceConfig.yaml \
     --parallelism 1
+
     ```
 
 10. Open a new terminal window and run the consumer.
 
     ```bash
+
     $ docker exec -it pulsar-kafka-standalone /bin/bash
 
     $ pip install kafka-python
 
     $ python3 kafka-producer.py
+
     ```
 
     The following information appears on the consumer terminal window.
 
     ```bash
+
     Received message: 'hello world'
+
... 6595 lines suppressed ...