You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ur...@apache.org on 2022/07/13 18:02:22 UTC
[pulsar-site] branch main updated: Docs sync done from apache/pulsar(#c122928)

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

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


The following commit(s) were added to refs/heads/main by this push:
     new a84acfe1fa4 Docs sync done from apache/pulsar(#c122928)
a84acfe1fa4 is described below

commit a84acfe1fa43248499b707e50179fb988ce6ba2c
Author: Pulsar Site Updater <de...@pulsar.apache.org>
AuthorDate: Wed Jul 13 18:02:16 2022 +0000

    Docs sync done from apache/pulsar(#c122928)
---
 site2/website-next/docs/admin-api-brokers.md       |  31 -----
 site2/website-next/docs/admin-api-namespaces.md    |  18 +--
 site2/website-next/docs/admin-api-packages.md      |  14 +-
 site2/website-next/docs/admin-api-topics.md        |  10 +-
 .../docs/developing-binary-protocol.md             |   2 +-
 site2/website-next/docs/io-cdc-debezium.md         |  18 +--
 site2/website-next/docs/io-debezium-source.md      |  47 ++++++-
 site2/website-next/docs/io-quickstart.md           |  50 ++++----
 site2/website-next/docs/reference-metrics.md       |  32 ++---
 .../version-2.10.0/admin-api-brokers.md            |   4 +-
 .../version-2.10.0/admin-api-functions.md          |  36 +++---
 .../version-2.10.0/admin-api-namespaces.md         | 142 +--------------------
 .../version-2.10.0/admin-api-packages.md           |  14 +-
 .../version-2.10.0/admin-api-topics.md             |  76 +++--------
 .../version-2.10.0/developing-binary-protocol.md   |   3 +-
 .../version-2.10.0/io-debezium-source.md           |  43 +++++++
 .../versioned_docs/version-2.10.0/schema-manage.md |   6 +-
 .../version-2.10.1/admin-api-brokers.md            |   6 +-
 .../version-2.10.1/admin-api-functions.md          |  36 +++---
 .../version-2.10.1/admin-api-namespaces.md         | 142 +--------------------
 .../version-2.10.1/admin-api-packages.md           |  14 +-
 .../version-2.10.1/admin-api-topics.md             |  56 +++-----
 .../version-2.10.1/developing-binary-protocol.md   |   3 +-
 .../version-2.10.1/io-debezium-source.md           |  43 +++++++
 .../versioned_docs/version-2.10.1/schema-manage.md |   8 +-
 .../version-2.8.0/admin-api-brokers.md             |   4 +-
 .../version-2.8.0/admin-api-functions.md           |  36 +++---
 .../version-2.8.0/admin-api-namespaces.md          | 123 +-----------------
 .../version-2.8.0/admin-api-packages.md            |  14 +-
 .../version-2.8.0/admin-api-topics.md              |  72 ++---------
 .../version-2.8.0/developing-binary-protocol.md    |   2 +-
 .../version-2.8.0/io-debezium-source.md            |  43 +++++++
 .../versioned_docs/version-2.8.0/schema-manage.md  |   6 +-
 .../version-2.8.1/admin-api-brokers.md             |   4 +-
 .../version-2.8.1/admin-api-functions.md           |  36 +++---
 .../version-2.8.1/admin-api-namespaces.md          | 124 +-----------------
 .../version-2.8.1/admin-api-packages.md            |  14 +-
 .../version-2.8.1/admin-api-topics.md              |  72 ++---------
 .../version-2.8.1/develop-binary-protocol.md       |   2 +-
 .../version-2.8.1/io-debezium-source.md            |  43 +++++++
 .../versioned_docs/version-2.8.1/schema-manage.md  |   6 +-
 .../version-2.8.2/admin-api-brokers.md             |   4 +-
 .../version-2.8.2/admin-api-functions.md           |  36 +++---
 .../version-2.8.2/admin-api-namespaces.md          | 124 +-----------------
 .../version-2.8.2/admin-api-packages.md            |  14 +-
 .../version-2.8.2/admin-api-topics.md              |  72 ++---------
 .../version-2.8.2/develop-binary-protocol.md       |   2 +-
 .../version-2.8.2/io-debezium-source.md            |  43 +++++++
 .../versioned_docs/version-2.8.2/schema-manage.md  |   6 +-
 .../version-2.8.3/admin-api-brokers.md             |   4 +-
 .../version-2.8.3/admin-api-functions.md           |  36 +++---
 .../version-2.8.3/admin-api-namespaces.md          | 120 +----------------
 .../version-2.8.3/admin-api-packages.md            |  14 +-
 .../version-2.8.3/admin-api-topics.md              |  72 ++---------
 .../version-2.8.3/developing-binary-protocol.md    |   2 +-
 .../version-2.8.3/io-debezium-source.md            |  43 +++++++
 .../versioned_docs/version-2.8.3/schema-manage.md  |   6 +-
 .../version-2.9.0/admin-api-brokers.md             |   4 +-
 .../version-2.9.0/admin-api-functions.md           |  36 +++---
 .../version-2.9.0/admin-api-namespaces.md          | 142 +--------------------
 .../version-2.9.0/admin-api-packages.md            |  14 +-
 .../version-2.9.0/admin-api-topics.md              |  72 ++---------
 .../version-2.9.0/develop-binary-protocol.md       |   2 +-
 .../version-2.9.0/io-debezium-source.md            |  43 +++++++
 .../versioned_docs/version-2.9.0/schema-manage.md  |   6 +-
 .../version-2.9.1/admin-api-brokers.md             |   4 +-
 .../version-2.9.1/admin-api-functions.md           |  36 +++---
 .../version-2.9.1/admin-api-namespaces.md          | 142 +--------------------
 .../version-2.9.1/admin-api-packages.md            |  14 +-
 .../version-2.9.1/admin-api-topics.md              |  72 ++---------
 .../version-2.9.1/develop-binary-protocol.md       |   2 +-
 .../version-2.9.1/io-debezium-source.md            |  43 +++++++
 .../versioned_docs/version-2.9.1/schema-manage.md  |   6 +-
 .../version-2.9.2/admin-api-brokers.md             |   4 +-
 .../version-2.9.2/admin-api-functions.md           |  36 +++---
 .../version-2.9.2/admin-api-namespaces.md          | 142 +--------------------
 .../version-2.9.2/admin-api-packages.md            |  14 +-
 .../version-2.9.2/admin-api-topics.md              |  72 ++---------
 .../version-2.9.2/developing-binary-protocol.md    |   2 +-
 .../version-2.9.2/io-debezium-source.md            |  43 +++++++
 .../versioned_docs/version-2.9.2/schema-manage.md  |   6 +-
 81 files changed, 952 insertions(+), 2058 deletions(-)

diff --git a/site2/website-next/docs/admin-api-brokers.md b/site2/website-next/docs/admin-api-brokers.md
index 598125a6cc7..a8c51b18ee9 100644
--- a/site2/website-next/docs/admin-api-brokers.md
+++ b/site2/website-next/docs/admin-api-brokers.md
@@ -39,37 +39,6 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic for local cluster .
-
-````mdx-code-block
-<Tabs groupId="api-choice"
-  defaultValue="pulsar-admin"
-  values={[{"label":"pulsar-admin","value":"pulsar-admin"},{"label":"REST API","value":"REST API"},{"label":"Java","value":"Java"}]}>
-<TabItem value="pulsar-admin">
-
-```shell
-$ pulsar-admin brokers list
-broker1.use.org.com:8080
-```
-
-</TabItem>
-<TabItem value="REST API">
-
-{@inject: endpoint|GET|/admin/v2/brokers|operation/getActiveBrokers?version=[[pulsar:version_number]]}
-
-
-</TabItem>
-<TabItem value="Java">
-
-```java
-admin.brokers().getActiveBrokers()
-```
-
-</TabItem>
-
-</Tabs>
-````
-
 Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
diff --git a/site2/website-next/docs/admin-api-namespaces.md b/site2/website-next/docs/admin-api-namespaces.md
index ce159d6fbbc..7b053004961 100644
--- a/site2/website-next/docs/admin-api-namespaces.md
+++ b/site2/website-next/docs/admin-api-namespaces.md
@@ -518,7 +518,9 @@ $ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
+```
+
+{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/:bundle/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -553,7 +555,9 @@ $ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenan
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
+```
+
+{@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/:bundle/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -745,7 +749,7 @@ $ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub m
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1173,14 +1177,6 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
-```json
-
-{
-  "interval": 1000
-}
-
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/docs/admin-api-packages.md b/site2/website-next/docs/admin-api-packages.md
index 9e29d315c9b..8d99819bbfe 100644
--- a/site2/website-next/docs/admin-api-packages.md
+++ b/site2/website-next/docs/admin-api-packages.md
@@ -102,7 +102,7 @@ bin/pulsar-admin packages upload function://public/default/example@v0.1 --path p
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -147,7 +147,7 @@ bin/pulsar-admin packages download function://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -194,7 +194,7 @@ bin/pulsar-admin packages delete functions://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -239,7 +239,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -284,7 +284,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -329,7 +329,7 @@ bin/pulsar-admin packages list-versions type://tenant/namespace/packageName
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -375,7 +375,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
diff --git a/site2/website-next/docs/admin-api-topics.md b/site2/website-next/docs/admin-api-topics.md
index 0db608818cd..8cdd75ad86a 100644
--- a/site2/website-next/docs/admin-api-topics.md
+++ b/site2/website-next/docs/admin-api-topics.md
@@ -1066,9 +1066,9 @@ admin.topics().resetCursor(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs groupId="api-choice"
@@ -1105,9 +1105,9 @@ admin.lookup().lookupDestination(topic);
 </Tabs>
 ````
 
-### Lookup of partitioned topic
+### Look up partitioned topic's owner broker
 
-You can locate the broker URL of each partitioned topic which is serving the given topic in the following ways.
+You can locate the owner broker of the given partitioned topic in the following ways.
 
 ````mdx-code-block
 <Tabs groupId="api-choice"
@@ -1155,7 +1155,7 @@ $ pulsar-admin topics partitioned-lookup \
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs groupId="api-choice"
diff --git a/site2/website-next/docs/developing-binary-protocol.md b/site2/website-next/docs/developing-binary-protocol.md
index 2d085254016..07460987d2e 100644
--- a/site2/website-next/docs/developing-binary-protocol.md
+++ b/site2/website-next/docs/developing-binary-protocol.md
@@ -534,7 +534,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic) docs.
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker) docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary protocol.
 
diff --git a/site2/website-next/docs/io-cdc-debezium.md b/site2/website-next/docs/io-cdc-debezium.md
index 7109acc9888..6ac2795e36a 100644
--- a/site2/website-next/docs/io-cdc-debezium.md
+++ b/site2/website-next/docs/io-cdc-debezium.md
@@ -13,16 +13,16 @@ The configuration of Debezium source connector has the following properties.
 
 | Name | Required | Default | Description |
 |------|----------|---------|-------------|
-| `task.class` | true | null | A source task class that implemented in Debezium. |
+| `task.class` | true | null | A source task class that is implemented in Debezium. |
 | `database.hostname` | true | null | The address of a database server. |
 | `database.port` | true | null | The port number of a database server.|
 | `database.user` | true | null | The name of a database user that has the required privileges. |
 | `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. |
-| `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.server.name` | true | null | The logical name of a database server/cluster, which forms a namespace and 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 that 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 the record key. |
+| `value.converter` | true | null | The converter provided by Kafka Connect to convert the 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.service.url` | true | null | Pulsar cluster service URL for history topic. |
@@ -159,7 +159,7 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
-4. Subscribe the topic _sub-products_ for the table _inventory.products_.
+4. Subscribe to the topic _sub-products_ for the table _inventory.products_.
 
    ```bash
    
@@ -290,7 +290,7 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        --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
@@ -300,7 +300,7 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
-4. Subscribe the topic _sub-products_ for the _inventory.products_ table.
+4. Subscribe to the topic _sub-products_ for the _inventory.products_ table.
 
    ```
    
@@ -465,7 +465,7 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
-4. Subscribe the topic _sub-products_ for the _inventory.products_ table.
+4. Subscribe to the topic _sub-products_ for the _inventory.products_ table.
 
    ```
    
diff --git a/site2/website-next/docs/io-debezium-source.md b/site2/website-next/docs/io-debezium-source.md
index a125394dff1..ca9bd7f1c5d 100644
--- a/site2/website-next/docs/io-debezium-source.md
+++ b/site2/website-next/docs/io-debezium-source.md
@@ -166,6 +166,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+     :::note
+      
+     Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+     If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+     :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -300,7 +313,7 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
    * 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
        
@@ -314,6 +327,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+     :::note
+
+     Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+
+       - One topic named with the database server name (`database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+
+     If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+     
+     :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -387,6 +413,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -466,7 +496,7 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
 
    * 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
        
@@ -480,6 +510,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+     :::note
+      
+     Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+     If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+     :::
+      
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/docs/io-quickstart.md b/site2/website-next/docs/io-quickstart.md
index e856926d8ff..e6944a528c0 100644
--- a/site2/website-next/docs/io-quickstart.md
+++ b/site2/website-next/docs/io-quickstart.md
@@ -6,13 +6,13 @@ sidebar_label: "Get started"
 
 This tutorial provides a hands-on look at how you can move data out of Pulsar without writing a single line of code.  
 
-It is helpful to review the [concepts](io-overview.md) for Pulsar I/O with running the steps in this guide to gain a deeper understanding.   
+It is helpful to review the [concepts](io-overview.md) for Pulsar I/O by running the steps in this guide to gain a deeper understanding.   
 
 At the end of this tutorial, you are able to:
 
-- [Connect Pulsar to Cassandra](#Connect-Pulsar-to-Cassandra)
+- [Connect Pulsar to Cassandra](#connect-pulsar-to-cassandra)
   
-- [Connect Pulsar to PostgreSQL](#Connect-Pulsar-to-PostgreSQL)
+- [Connect Pulsar to PostgreSQL](#connect-pulsar-to-postgreSQL)
 
 :::tip
 
@@ -112,7 +112,7 @@ This section demonstrates how to connect Pulsar to Cassandra.
 
 :::
 
-### Setup a Cassandra cluster
+### Set up a Cassandra cluster
 
 This example uses `cassandra` Docker image to start a single-node Cassandra cluster in Docker.
 
@@ -239,13 +239,15 @@ For more information, see [Cassandra sink connector](io-cassandra-sink.md).
 
 ### Create a Cassandra sink
 
-You can use the [Connector Admin CLI](/tools/pulsar-admin/) 
-to create a sink connector and perform other operations on them.
+You can use the [Connector Admin CLI](/tools/pulsar-admin/) to create a sink connector and perform other operations on them.
 
 Run the following command to create a Cassandra sink connector with sink type _cassandra_ and the config file _examples/cassandra-sink.yml_ created previously.
 
-#### Note
-> The `sink-type` parameter of the currently built-in connectors is determined by the setting of the `name` parameter specified in the pulsar-io.yaml file.
+:::note
+
+The `sink-type` parameter of the currently built-in connectors is determined by the setting of the `name` parameter specified in the _pulsar-io.yaml_ file.
+
+:::
 
 ```bash
 
@@ -261,13 +263,11 @@ bin/pulsar-admin sinks create \
 
 Once the command is executed, Pulsar creates the sink connector _cassandra-test-sink_. 
 
-This sink connector runs
-as a Pulsar Function and writes the messages produced in the topic _test_cassandra_ to the Cassandra table _pulsar_test_table_.
+This sink connector runs as a Pulsar Function and writes the messages produced in the topic _test_cassandra_ to the Cassandra table _pulsar_test_table_.
 
 ### Inspect a Cassandra sink
 
-You can use the [Connector Admin CLI](/tools/pulsar-admin/) 
-to monitor a connector and perform other operations on it.
+You can use the [Connector Admin CLI](/tools/pulsar-admin/) to monitor a connector and perform other operations on it.
 
 * Get the information of a Cassandra sink. 
 
@@ -449,15 +449,12 @@ This section demonstrates how to connect Pulsar to PostgreSQL.
 :::tip
 
 * Make sure you have Docker installed. If you do not have one, see [install Docker](https://docs.docker.com/docker-for-mac/install/).
-* The JDBC sink connector pulls messages from Pulsar topics 
+* The JDBC sink connector pulls messages from Pulsar topics and persists the messages to ClickHouse, MariaDB, PostgreSQL, or SQLite. For more information, see [JDBC sink connector](io-jdbc-sink.md).
 
 :::
 
-and persists the messages to ClickHouse, MariaDB, PostgreSQL, or SQlite. 
->For more information, see [JDBC sink connector](io-jdbc-sink.md).
-
 
-### Setup a PostgreSQL cluster
+### Set up a PostgreSQL cluster
 
 This example uses the PostgreSQL 12 docker image to start a single-node PostgreSQL cluster in Docker.
 
@@ -636,13 +633,13 @@ This sink connector runs as a Pulsar Function and writes the messages produced i
 
  #### Tip
 
- Flag | Description | This example 
+ Flag | Description | Example 
  ---|---|---|
- `--archive` | The path to the archive file for the sink. | _pulsar-io-jdbc-postgres-@pulsar:version@.nar_ |
+ `--archive` | The path to the archive file for the sink. | pulsar-io-jdbc-postgres-@pulsar:version@.nar |
  `--inputs` | The input topic(s) of the sink. <br /><br /> Multiple topics can be specified as a comma-separated list.||
- `--name` | The name of the sink. | _pulsar-postgres-jdbc-sink_ |
- `--sink-config-file` | The path to a YAML config file specifying the configuration of the sink. | _pulsar-postgres-jdbc-sink.yaml_ |
- `--parallelism` | The parallelism factor of the sink. <br /><br /> For example, the number of sink instances to run. |  _1_ |
+ `--name` | The name of the sink. | pulsar-postgres-jdbc-sink |
+ `--sink-config-file` | The path to a YAML config file specifying the configuration of the sink. | pulsar-postgres-jdbc-sink.yaml |
+ `--parallelism` | The parallelism factor of the sink. <br /><br /> For example, the number of sink instances to run. |  1 |
 
 :::tip
 
@@ -780,8 +777,7 @@ to monitor a connector and perform other operations on it.
 
 ### Stop a JDBC sink
 
-You can use the [Connector Admin CLI](/tools/pulsar-admin/) 
-to stop a connector and perform other operations on it.
+You can use the [Connector Admin CLI](/tools/pulsar-admin/) to stop a connector and perform other operations on it.
 
 ```bash
 
@@ -808,8 +804,7 @@ Stopped successfully
 
 ### Restart a JDBC sink
 
-You can use the [Connector Admin CLI](/tools/pulsar-admin/) 
-to restart a connector and perform other operations on it.
+You can use the [Connector Admin CLI](/tools/pulsar-admin/) to restart a connector and perform other operations on it.
 
 ```bash
 
@@ -844,8 +839,7 @@ Note that `pulsar-admin sinks localrun options` **runs a sink connector locally*
 
 ### Update a JDBC sink
 
-You can use the [Connector Admin CLI](/tools/pulsar-admin/) 
-to update a connector and perform other operations on it.
+You can use the [Connector Admin CLI](/tools/pulsar-admin/) to update a connector and perform other operations on it.
 
 This example updates the parallelism of the _pulsar-postgres-jdbc-sink_ sink connector to 2.
 
diff --git a/site2/website-next/docs/reference-metrics.md b/site2/website-next/docs/reference-metrics.md
index 3ee6aa0e52b..b7493367c7d 100644
--- a/site2/website-next/docs/reference-metrics.md
+++ b/site2/website-next/docs/reference-metrics.md
@@ -479,7 +479,7 @@ All the token metrics are labelled with the following labels:
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_expired_token_count | Counter | The number of expired tokens in Pulsar. |
+| pulsar_expired_token_total | Counter | The number of expired tokens in Pulsar. |
 | pulsar_expiring_token_minutes | Histogram | The remaining time of expiring tokens in minutes. |
 
 ### Authentication metrics
@@ -489,12 +489,12 @@ All the authentication metrics are labelled with the following labels:
 - *cluster*: `cluster=${pulsar_cluster}`. `${pulsar_cluster}` is the cluster name that you have configured in the `broker.conf` file.
 - *provider_name*: `provider_name=${provider_name}`. `${provider_name}` is the class name of the authentication provider.
 - *auth_method*: `auth_method=${auth_method}`. `${auth_method}` is the authentication method of the authentication provider.
-- *reason*: `reason=${reason}`. `${reason}` is the reason for failing authentication operation. (This label is only for `pulsar_authentication_failures_count`.)
+- *reason*: `reason=${reason}`. `${reason}` is the reason for failing authentication operation. (This label is only for `pulsar_authentication_failures_total`.)
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_authentication_success_count| Counter | The number of successful authentication operations. |
-| pulsar_authentication_failures_count | Counter | The number of failing authentication operations. |
+| pulsar_authentication_success_total| Counter | The number of successful authentication operations. |
+| pulsar_authentication_failures_total | Counter | The number of failing authentication operations. |
 
 ### Jetty metrics
 
@@ -591,16 +591,16 @@ All the Pulsar Functions metrics are labelled with the following labels:
 | Name | Type | Description |
 |---|---|---|
 | pulsar_function_processed_successfully_total | Counter | The total number of messages processed successfully. |
-| pulsar_function_processed_successfully_total_1min | Counter | The total number of messages processed successfully in the last 1 minute. |
+| pulsar_function_processed_successfully_1min_total | Counter | The total number of messages processed successfully in the last 1 minute. |
 | pulsar_function_system_exceptions_total | Counter | The total number of system exceptions. |
-| pulsar_function_system_exceptions_total_1min | Counter | The total number of system exceptions in the last 1 minute. |
+| pulsar_function_system_exceptions_1min_total | Counter | The total number of system exceptions in the last 1 minute. |
 | pulsar_function_user_exceptions_total | Counter | The total number of user exceptions. |
-| pulsar_function_user_exceptions_total_1min | Counter | The total number of user exceptions in the last 1 minute. |
+| pulsar_function_user_exceptions_1min_total | Counter | The total number of user exceptions in the last 1 minute. |
 | pulsar_function_process_latency_ms | Summary | The process latency in milliseconds. |
 | pulsar_function_process_latency_ms_1min | Summary | The process latency in milliseconds in the last 1 minute. |
 | pulsar_function_last_invocation | Gauge | The timestamp of the last invocation of the function. |
 | pulsar_function_received_total | Counter | The total number of messages received from source. |
-| pulsar_function_received_total_1min | Counter | The total number of messages received from source in the last 1 minute. |
+| pulsar_function_received_1min_total | Counter | The total number of messages received from source in the last 1 minute. |
 pulsar_function_user_metric_ | Summary|The user-defined metrics.
 
 ## Connectors
@@ -617,16 +617,16 @@ Connector metrics contain **source** metrics and **sink** metrics.
   | Name | Type | Description |
   |---|---|---|
   pulsar_source_written_total|Counter|The total number of records written to a Pulsar topic.
-  pulsar_source_written_total_1min|Counter|The total number of records written to a Pulsar topic in the last 1 minute.
+  pulsar_source_written_1min_total|Counter|The total number of records written to a Pulsar topic in the last 1 minute.
   pulsar_source_received_total|Counter|The total number of records received from source.
-  pulsar_source_received_total_1min|Counter|The total number of records received from source in the last 1 minute.
+  pulsar_source_received_1min_total|Counter|The total number of records received from source in the last 1 minute.
   pulsar_source_last_invocation|Gauge|The timestamp of the last invocation of the source.
   pulsar_source_source_exception|Gauge|The exception from a source.
   pulsar_source_source_exceptions_total|Counter|The total number of source exceptions.
-  pulsar_source_source_exceptions_total_1min |Counter|The total number of source exceptions in the last 1 minute.
+  pulsar_source_source_exceptions_1min_total |Counter|The total number of source exceptions in the last 1 minute.
   pulsar_source_system_exception|Gauge|The exception from system code.
   pulsar_source_system_exceptions_total|Counter|The total number of system exceptions.
-  pulsar_source_system_exceptions_total_1min|Counter|The total number of system exceptions in the last 1 minute.
+  pulsar_source_system_exceptions_1min_total|Counter|The total number of system exceptions in the last 1 minute.
   pulsar_source_user_metric_ | Summary|The user-defined metrics.
 
 - **Sink** metrics
@@ -634,16 +634,16 @@ Connector metrics contain **source** metrics and **sink** metrics.
   | Name | Type | Description |
   |---|---|---|
   pulsar_sink_written_total|Counter| The total number of records processed by a sink.
-  pulsar_sink_written_total_1min|Counter| The total number of records processed by a sink in the last 1 minute.
-  pulsar_sink_received_total_1min|Counter| The total number of messages that a sink has received from Pulsar topics in the last 1 minute.
+  pulsar_sink_written_1min_total|Counter| The total number of records processed by a sink in the last 1 minute.
+  pulsar_sink_received_1min_total|Counter| The total number of messages that a sink has received from Pulsar topics in the last 1 minute.
   pulsar_sink_received_total|Counter| The total number of records that a sink has received from Pulsar topics.
   pulsar_sink_last_invocation|Gauge|The timestamp of the last invocation of the sink.
   pulsar_sink_sink_exception|Gauge|The exception from a sink.
   pulsar_sink_sink_exceptions_total|Counter|The total number of sink exceptions.
-  pulsar_sink_sink_exceptions_total_1min |Counter|The total number of sink exceptions in the last 1 minute.
+  pulsar_sink_sink_exceptions_1min_total |Counter|The total number of sink exceptions in the last 1 minute.
   pulsar_sink_system_exception|Gauge|The exception from system code.
   pulsar_sink_system_exceptions_total|Counter|The total number of system exceptions.
-  pulsar_sink_system_exceptions_total_1min|Counter|The total number of system exceptions in the last 1 minute.
+  pulsar_sink_system_exceptions_1min_total|Counter|The total number of system exceptions in the last 1 minute.
   pulsar_sink_user_metric_ | Summary|The user-defined metrics.
 
 ## Proxy
diff --git a/site2/website-next/versioned_docs/version-2.10.0/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.10.0/admin-api-brokers.md
index 9aeeea1a904..2674c7da875 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/admin-api-brokers.md
@@ -40,7 +40,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -104,7 +104,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.10.0/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.10.0/admin-api-functions.md
index 948580a2250..8274a21d680 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/admin-api-functions.md
@@ -69,7 +69,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -125,7 +125,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -175,7 +175,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -217,7 +217,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -260,7 +260,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -302,7 +302,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -345,7 +345,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -387,7 +387,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -428,7 +428,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -470,7 +470,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -512,7 +512,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -554,7 +554,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -596,7 +596,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -638,7 +638,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -680,7 +680,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -725,7 +725,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -768,7 +768,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -813,7 +813,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.10.0/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.10.0/admin-api-namespaces.md
index 78c88fb19c0..6bc74dad236 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/admin-api-namespaces.md
@@ -52,12 +52,8 @@ $ pulsar-admin namespaces create test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/createNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -114,12 +110,8 @@ $ pulsar-admin namespaces policies test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace|operation/getPolicies?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -157,12 +149,8 @@ test-tenant/ns2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant|operation/getTenantNamespaces?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -198,12 +186,8 @@ $ pulsar-admin namespaces delete test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace|operation/deleteNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -240,12 +224,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -285,12 +265,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -334,12 +310,8 @@ $ pulsar-admin namespaces set-backlog-quota --limit 10G --limitTime 36000 --poli
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -384,12 +356,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -423,12 +391,8 @@ $ pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -472,12 +436,8 @@ $ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -522,12 +482,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -563,12 +519,8 @@ $ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -602,12 +554,8 @@ $ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenan
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -643,12 +591,8 @@ $ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -688,18 +632,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
-```
-
-100
-
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -739,12 +673,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -781,12 +711,8 @@ $ pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -820,11 +746,7 @@ $ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub m
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -861,12 +783,8 @@ $ pulsar-admin namespaces set-retention --size 100 --time 10 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -909,12 +827,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -964,12 +878,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1013,12 +923,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1060,12 +966,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1109,12 +1011,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1156,12 +1054,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1205,12 +1099,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1246,11 +1136,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1286,19 +1172,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1333,11 +1207,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1380,12 +1250,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.10.0/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.10.0/admin-api-packages.md
index a6d9446ace7..608dfb7587d 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/admin-api-packages.md
@@ -90,7 +90,7 @@ bin/pulsar-admin packages upload function://public/default/example@v0.1 --path p
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -135,7 +135,7 @@ bin/pulsar-admin packages download function://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -182,7 +182,7 @@ bin/pulsar-admin packages delete functions://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -227,7 +227,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -272,7 +272,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -317,7 +317,7 @@ bin/pulsar-admin packages list-versions type://tenant/namespace/packageName
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -363,7 +363,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.10.0/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.10.0/admin-api-topics.md
index 0f7d8b517bf..3ade22df09e 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/admin-api-topics.md
@@ -811,7 +811,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1067,9 +1067,9 @@ admin.topics().resetCursor(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1106,9 +1106,9 @@ admin.lookup().lookupDestination(topic);
 </Tabs>
 ````
 
-### Lookup of partitioned topic
+### Look up partitioned topic's owner broker
 
-You can locate the broker URL of each partitioned topic which is serving the given topic in the following ways.
+You can locate the owner broker of the given partitioned topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1156,7 +1156,7 @@ $ pulsar-admin topics partitioned-lookup \
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1251,7 +1251,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1329,11 +1329,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1370,19 +1366,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1417,11 +1401,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1459,11 +1439,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1498,11 +1474,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1537,11 +1509,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1579,11 +1547,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1618,11 +1582,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1657,11 +1617,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.10.0/developing-binary-protocol.md b/site2/website-next/versioned_docs/version-2.10.0/developing-binary-protocol.md
index 825a0d04fe3..9787f91e362 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/developing-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/developing-binary-protocol.md
@@ -515,8 +515,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
-docs.
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker) docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
 protocol.
diff --git a/site2/website-next/versioned_docs/version-2.10.0/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.10.0/io-debezium-source.md
index 5246718823f..122c4024068 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/io-debezium-source.md
@@ -167,6 +167,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+     :::note
+      
+     Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+     If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+     :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -315,6 +328,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -388,6 +414,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -481,6 +511,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.10.0/schema-manage.md b/site2/website-next/versioned_docs/version-2.10.0/schema-manage.md
index 56addb7b55a..e62818c7e82 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.10.1/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.10.1/admin-api-brokers.md
index 9aeeea1a904..7ac1f7292b8 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/admin-api-brokers.md
@@ -40,7 +40,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -104,7 +104,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -176,7 +176,7 @@ One way to configure a Pulsar [broker](reference-terminology.md#broker) is to su
 
 But since all broker configuration in Pulsar is stored in ZooKeeper, configuration values can also be dynamically updated *while the broker is running*. When you update broker configuration dynamically, ZooKeeper will notify the broker of the change and the broker will then override any existing configuration values.
 
-* The [`brokers`](reference-pulsar-admin.md#brokers) command for the [`pulsar-admin`](reference-pulsar-admin.md) tool has a variety of subcommands that enable you to manipulate a broker's configuration dynamically, enabling you to [update config values](#update-dynamic-configuration) and more.
+* The [`brokers`](reference-pulsar-admin.md#brokers) command for the [`pulsar-admin`](reference-pulsar-admin) tool has a variety of subcommands that enable you to manipulate a broker's configuration dynamically, enabling you to [update config values](#update-dynamic-configuration) and more.
 * In the Pulsar admin {@inject: rest:REST:/} API, dynamic configuration is managed through the `/admin/v2/brokers/configuration` endpoint.
 
 ### Update dynamic configuration
diff --git a/site2/website-next/versioned_docs/version-2.10.1/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.10.1/admin-api-functions.md
index 948580a2250..8274a21d680 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/admin-api-functions.md
@@ -69,7 +69,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -125,7 +125,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -175,7 +175,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -217,7 +217,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -260,7 +260,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -302,7 +302,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -345,7 +345,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -387,7 +387,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -428,7 +428,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -470,7 +470,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -512,7 +512,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -554,7 +554,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -596,7 +596,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -638,7 +638,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -680,7 +680,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -725,7 +725,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -768,7 +768,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -813,7 +813,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.10.1/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.10.1/admin-api-namespaces.md
index 78c88fb19c0..6bc74dad236 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/admin-api-namespaces.md
@@ -52,12 +52,8 @@ $ pulsar-admin namespaces create test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/createNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -114,12 +110,8 @@ $ pulsar-admin namespaces policies test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace|operation/getPolicies?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -157,12 +149,8 @@ test-tenant/ns2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant|operation/getTenantNamespaces?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -198,12 +186,8 @@ $ pulsar-admin namespaces delete test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace|operation/deleteNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -240,12 +224,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -285,12 +265,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -334,12 +310,8 @@ $ pulsar-admin namespaces set-backlog-quota --limit 10G --limitTime 36000 --poli
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -384,12 +356,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -423,12 +391,8 @@ $ pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -472,12 +436,8 @@ $ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -522,12 +482,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -563,12 +519,8 @@ $ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -602,12 +554,8 @@ $ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenan
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -643,12 +591,8 @@ $ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -688,18 +632,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
-```
-
-100
-
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -739,12 +673,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -781,12 +711,8 @@ $ pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -820,11 +746,7 @@ $ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub m
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -861,12 +783,8 @@ $ pulsar-admin namespaces set-retention --size 100 --time 10 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -909,12 +827,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -964,12 +878,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1013,12 +923,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1060,12 +966,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1109,12 +1011,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1156,12 +1054,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1205,12 +1099,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1246,11 +1136,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1286,19 +1172,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1333,11 +1207,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1380,12 +1250,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.10.1/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.10.1/admin-api-packages.md
index a6d9446ace7..608dfb7587d 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/admin-api-packages.md
@@ -90,7 +90,7 @@ bin/pulsar-admin packages upload function://public/default/example@v0.1 --path p
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -135,7 +135,7 @@ bin/pulsar-admin packages download function://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -182,7 +182,7 @@ bin/pulsar-admin packages delete functions://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -227,7 +227,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -272,7 +272,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -317,7 +317,7 @@ bin/pulsar-admin packages list-versions type://tenant/namespace/packageName
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -363,7 +363,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.10.1/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.10.1/admin-api-topics.md
index 0f7d8b517bf..c55db61479b 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/admin-api-topics.md
@@ -811,7 +811,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1067,9 +1067,9 @@ admin.topics().resetCursor(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1106,9 +1106,9 @@ admin.lookup().lookupDestination(topic);
 </Tabs>
 ````
 
-### Lookup of partitioned topic
+### Look up partitioned topic's owner broker
 
-You can locate the broker URL of each partitioned topic which is serving the given topic in the following ways.
+You can locate the owner broker of the given partitioned topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1156,7 +1156,7 @@ $ pulsar-admin topics partitioned-lookup \
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1251,7 +1251,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1331,7 +1331,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 
 ```
 
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 ```
 
@@ -1372,7 +1372,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 
 ```
 
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 ```
 
@@ -1419,7 +1419,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 
 ```
 
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 ```
 
@@ -1459,11 +1459,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1498,11 +1494,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1537,11 +1529,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1579,11 +1567,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1618,11 +1602,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1657,11 +1637,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.10.1/developing-binary-protocol.md b/site2/website-next/versioned_docs/version-2.10.1/developing-binary-protocol.md
index 825a0d04fe3..9787f91e362 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/developing-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/developing-binary-protocol.md
@@ -515,8 +515,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
-docs.
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker) docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
 protocol.
diff --git a/site2/website-next/versioned_docs/version-2.10.1/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.10.1/io-debezium-source.md
index 5246718823f..6015f3f17d7 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/io-debezium-source.md
@@ -167,6 +167,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+     :::note
+      
+     Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+     If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+     :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -315,6 +328,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+     Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+   
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -388,6 +414,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -481,6 +511,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+     Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.10.1/schema-manage.md b/site2/website-next/versioned_docs/version-2.10.1/schema-manage.md
index 56addb7b55a..b3637473799 100644
--- a/site2/website-next/versioned_docs/version-2.10.1/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.10.1/schema-manage.md
@@ -160,7 +160,7 @@ To manage schemas, you can use one of the following methods.
 
 | Method |  Description | 
 | --- | --- |
-|  **Admin CLI**<li></li> |   You can use the `pulsar-admin` tool to manage Pulsar schemas, brokers, clusters, sources, sinks, topics, tenants and so on. For more information about how to use the `pulsar-admin` tool, see [here](reference-pulsar-admin.md).  | 
+|  **Admin CLI**<li></li> |   You can use the `pulsar-admin` tool to manage Pulsar schemas, brokers, clusters, sources, sinks, topics, tenants and so on. For more information about how to use the `pulsar-admin` tool, see [here](reference-pulsar-admin).  | 
 |  **REST API**<li></li> |   Pulsar exposes schema related management API in Pulsar’s admin RESTful API. You can access the admin RESTful endpoint directly to manage schemas. For more information about how to use the Pulsar REST API, see [here](/admin-rest-api/).  | 
 |  **Java Admin API**<li></li> |  Pulsar provides Java admin library. | 
 
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.8.0/admin-api-brokers.md
index d1f89f4290e..d51a71e1603 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/admin-api-brokers.md
@@ -30,7 +30,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -94,7 +94,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.0/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.8.0/admin-api-functions.md
index 6db66c719f2..e5b97bd4011 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/admin-api-functions.md
@@ -59,7 +59,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -115,7 +115,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -165,7 +165,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -207,7 +207,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -250,7 +250,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -292,7 +292,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -335,7 +335,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -377,7 +377,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -418,7 +418,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -460,7 +460,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -502,7 +502,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -544,7 +544,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -586,7 +586,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -628,7 +628,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -670,7 +670,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -715,7 +715,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -758,7 +758,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -803,7 +803,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.8.0/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.8.0/admin-api-namespaces.md
index a6903c7f1c7..72655c79de5 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/admin-api-namespaces.md
@@ -214,12 +214,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -259,12 +255,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -314,12 +306,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -364,12 +352,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -409,12 +393,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -464,12 +444,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -514,12 +490,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -561,12 +533,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -607,12 +575,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -654,12 +618,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -699,12 +659,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -744,12 +700,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -792,12 +744,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -837,11 +785,7 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -884,12 +828,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -932,12 +872,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -964,9 +900,9 @@ disables the throttling.
 :::note
 
 - If neither `clusterDispatchRate` nor `topicDispatchRate` is configured, dispatch throttling is disabled.
->
+
 - If `topicDispatchRate` is not configured, `clusterDispatchRate` takes effect.
-> 
+
 - If `topicDispatchRate` is configured, `topicDispatchRate` takes effect.
 
 :::
@@ -989,12 +925,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1038,12 +970,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1085,12 +1013,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1134,12 +1058,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1181,12 +1101,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1230,12 +1146,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1271,11 +1183,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1311,19 +1219,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1358,11 +1254,8 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
-```
 
 </TabItem>
 <TabItem value="Java">
@@ -1405,12 +1298,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.8.0/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.8.0/admin-api-packages.md
index e2aa2cce565..70bebfcf35d 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/admin-api-packages.md
@@ -91,7 +91,7 @@ bin/pulsar-admin packages upload function://public/default/example@v0.1 --path p
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -135,7 +135,7 @@ bin/pulsar-admin packages download function://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -178,7 +178,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -221,7 +221,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -265,7 +265,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -308,7 +308,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -354,7 +354,7 @@ bin/pulsar-admin packages delete function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.0/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.8.0/admin-api-topics.md
index 9b7edd5de66..aab3802967d 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/admin-api-topics.md
@@ -650,7 +650,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -828,9 +828,9 @@ admin.topics().skipAllMessages(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -869,7 +869,7 @@ admin.lookup().lookupDestination(topic);
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -964,7 +964,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1003,11 +1003,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1044,19 +1040,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1091,11 +1075,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1133,11 +1113,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1172,11 +1148,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1211,11 +1183,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1253,11 +1221,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1292,11 +1256,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1331,11 +1291,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.8.0/developing-binary-protocol.md b/site2/website-next/versioned_docs/version-2.8.0/developing-binary-protocol.md
index cb9a5f69ed0..177ffebd6e5 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/developing-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/developing-binary-protocol.md
@@ -483,7 +483,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker)
 docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
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 03082d2e1d2..8c3ba0cb20f 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
@@ -170,6 +170,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -318,6 +331,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -391,6 +417,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -486,6 +516,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.8.0/schema-manage.md b/site2/website-next/versioned_docs/version-2.8.0/schema-manage.md
index 98105408fb3..4ae363882b2 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.1/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.8.1/admin-api-brokers.md
index d1f89f4290e..d51a71e1603 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/admin-api-brokers.md
@@ -30,7 +30,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -94,7 +94,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.1/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.8.1/admin-api-functions.md
index 6db66c719f2..e5b97bd4011 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/admin-api-functions.md
@@ -59,7 +59,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -115,7 +115,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -165,7 +165,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -207,7 +207,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -250,7 +250,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -292,7 +292,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -335,7 +335,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -377,7 +377,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -418,7 +418,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -460,7 +460,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -502,7 +502,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -544,7 +544,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -586,7 +586,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -628,7 +628,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -670,7 +670,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -715,7 +715,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -758,7 +758,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -803,7 +803,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.8.1/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.8.1/admin-api-namespaces.md
index a6903c7f1c7..7da0bdea191 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/admin-api-namespaces.md
@@ -214,12 +214,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -259,12 +255,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -314,12 +306,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -364,12 +352,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -409,12 +393,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -464,12 +444,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -514,12 +490,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -561,12 +533,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -607,12 +575,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -654,12 +618,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -699,12 +659,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -744,12 +700,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -792,12 +744,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -837,11 +785,7 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -884,12 +828,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -932,12 +872,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -964,9 +900,9 @@ disables the throttling.
 :::note
 
 - If neither `clusterDispatchRate` nor `topicDispatchRate` is configured, dispatch throttling is disabled.
->
+
 - If `topicDispatchRate` is not configured, `clusterDispatchRate` takes effect.
-> 
+
 - If `topicDispatchRate` is configured, `topicDispatchRate` takes effect.
 
 :::
@@ -989,12 +925,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1038,12 +970,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1085,12 +1013,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1134,12 +1058,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1181,12 +1101,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1230,12 +1146,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1271,11 +1183,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1311,19 +1219,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1358,11 +1254,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1405,12 +1297,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.8.1/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.8.1/admin-api-packages.md
index e2aa2cce565..70bebfcf35d 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/admin-api-packages.md
@@ -91,7 +91,7 @@ bin/pulsar-admin packages upload function://public/default/example@v0.1 --path p
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -135,7 +135,7 @@ bin/pulsar-admin packages download function://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -178,7 +178,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -221,7 +221,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -265,7 +265,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -308,7 +308,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -354,7 +354,7 @@ bin/pulsar-admin packages delete function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.1/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.8.1/admin-api-topics.md
index 166fdcefd2e..1230dc553f0 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/admin-api-topics.md
@@ -650,7 +650,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -828,9 +828,9 @@ admin.topics().skipAllMessages(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -869,7 +869,7 @@ admin.lookup().lookupDestination(topic);
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -964,7 +964,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1004,11 +1004,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1045,19 +1041,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1092,11 +1076,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1134,11 +1114,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1173,11 +1149,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1212,11 +1184,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1254,11 +1222,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1293,11 +1257,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1332,11 +1292,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.8.1/develop-binary-protocol.md b/site2/website-next/versioned_docs/version-2.8.1/develop-binary-protocol.md
index 74ef751e643..dfddb344ed9 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/develop-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/develop-binary-protocol.md
@@ -458,7 +458,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker)
 docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
diff --git a/site2/website-next/versioned_docs/version-2.8.1/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.8.1/io-debezium-source.md
index 03082d2e1d2..8c3ba0cb20f 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/io-debezium-source.md
@@ -170,6 +170,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -318,6 +331,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -391,6 +417,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -486,6 +516,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.8.1/schema-manage.md b/site2/website-next/versioned_docs/version-2.8.1/schema-manage.md
index 98105408fb3..4ae363882b2 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.2/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.8.2/admin-api-brokers.md
index 2651b708a1e..3effc4a1923 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/admin-api-brokers.md
@@ -40,7 +40,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -104,7 +104,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.2/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.8.2/admin-api-functions.md
index da544fdd8a3..cd6c365ece4 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/admin-api-functions.md
@@ -69,7 +69,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -125,7 +125,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -175,7 +175,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -217,7 +217,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -260,7 +260,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -302,7 +302,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -345,7 +345,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -387,7 +387,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -428,7 +428,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -470,7 +470,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -512,7 +512,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -554,7 +554,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -596,7 +596,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -638,7 +638,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -680,7 +680,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -725,7 +725,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -768,7 +768,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -813,7 +813,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.8.2/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.8.2/admin-api-namespaces.md
index c87b613b84d..3a41aa710b2 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/admin-api-namespaces.md
@@ -224,12 +224,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -269,12 +265,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -324,12 +316,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -374,12 +362,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -419,12 +403,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -474,12 +454,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -524,12 +500,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -571,12 +543,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -617,12 +585,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -664,12 +628,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -709,12 +669,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -754,12 +710,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -802,12 +754,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -847,11 +795,7 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -894,12 +838,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -942,12 +882,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -974,9 +910,9 @@ disables the throttling.
 :::note
 
 - If neither `clusterDispatchRate` nor `topicDispatchRate` is configured, dispatch throttling is disabled.
->
+
 - If `topicDispatchRate` is not configured, `clusterDispatchRate` takes effect.
-> 
+
 - If `topicDispatchRate` is configured, `topicDispatchRate` takes effect.
 
 :::
@@ -999,12 +935,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1048,12 +980,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1095,12 +1023,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1144,12 +1068,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1191,12 +1111,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1240,12 +1156,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1281,11 +1193,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1321,19 +1229,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1368,11 +1264,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1415,12 +1307,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.8.2/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.8.2/admin-api-packages.md
index 79be58295bf..efb4dcfabcd 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/admin-api-packages.md
@@ -101,7 +101,7 @@ bin/pulsar-admin packages upload function://public/default/example@v0.1 --path p
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -145,7 +145,7 @@ bin/pulsar-admin packages download function://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -188,7 +188,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -231,7 +231,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -275,7 +275,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -318,7 +318,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -364,7 +364,7 @@ bin/pulsar-admin packages delete function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.2/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.8.2/admin-api-topics.md
index 61cf1228412..4cfb48432b1 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/admin-api-topics.md
@@ -660,7 +660,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -838,9 +838,9 @@ admin.topics().skipAllMessages(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -879,7 +879,7 @@ admin.lookup().lookupDestination(topic);
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -974,7 +974,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1013,11 +1013,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1054,19 +1050,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1101,11 +1085,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1143,11 +1123,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1182,11 +1158,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1221,11 +1193,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1263,11 +1231,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1302,11 +1266,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1341,11 +1301,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.8.2/develop-binary-protocol.md b/site2/website-next/versioned_docs/version-2.8.2/develop-binary-protocol.md
index 74ef751e643..dfddb344ed9 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/develop-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/develop-binary-protocol.md
@@ -458,7 +458,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker)
 docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
diff --git a/site2/website-next/versioned_docs/version-2.8.2/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.8.2/io-debezium-source.md
index 03082d2e1d2..8c3ba0cb20f 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/io-debezium-source.md
@@ -170,6 +170,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -318,6 +331,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -391,6 +417,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -486,6 +516,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.8.2/schema-manage.md b/site2/website-next/versioned_docs/version-2.8.2/schema-manage.md
index a280eba263e..ec05a0f2bab 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.8.3/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.8.3/admin-api-brokers.md
index 2651b708a1e..3effc4a1923 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/admin-api-brokers.md
@@ -40,7 +40,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -104,7 +104,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.3/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.8.3/admin-api-functions.md
index da544fdd8a3..cd6c365ece4 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/admin-api-functions.md
@@ -69,7 +69,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -125,7 +125,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -175,7 +175,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -217,7 +217,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -260,7 +260,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -302,7 +302,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -345,7 +345,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -387,7 +387,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -428,7 +428,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -470,7 +470,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -512,7 +512,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -554,7 +554,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -596,7 +596,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -638,7 +638,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -680,7 +680,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -725,7 +725,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -768,7 +768,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -813,7 +813,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.8.3/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.8.3/admin-api-namespaces.md
index c87b613b84d..d3921166ab3 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/admin-api-namespaces.md
@@ -224,12 +224,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -269,12 +265,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -324,12 +316,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -374,12 +362,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -419,12 +403,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -474,12 +454,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -524,12 +500,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -571,12 +543,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -617,12 +585,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -664,12 +628,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -709,12 +669,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -754,12 +710,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -802,12 +754,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -847,11 +795,7 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -894,12 +838,8 @@ N/A
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -942,12 +882,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -999,12 +935,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1048,12 +980,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1095,12 +1023,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1144,12 +1068,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1191,12 +1111,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1240,12 +1156,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1281,11 +1193,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1321,19 +1229,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1368,11 +1264,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1415,12 +1307,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.8.3/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.8.3/admin-api-packages.md
index 79be58295bf..efb4dcfabcd 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/admin-api-packages.md
@@ -101,7 +101,7 @@ bin/pulsar-admin packages upload function://public/default/example@v0.1 --path p
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -145,7 +145,7 @@ bin/pulsar-admin packages download function://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -188,7 +188,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -231,7 +231,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -275,7 +275,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -318,7 +318,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -364,7 +364,7 @@ bin/pulsar-admin packages delete function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.8.3/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.8.3/admin-api-topics.md
index 61cf1228412..4cfb48432b1 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/admin-api-topics.md
@@ -660,7 +660,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -838,9 +838,9 @@ admin.topics().skipAllMessages(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -879,7 +879,7 @@ admin.lookup().lookupDestination(topic);
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -974,7 +974,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1013,11 +1013,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1054,19 +1050,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1101,11 +1085,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1143,11 +1123,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1182,11 +1158,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1221,11 +1193,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1263,11 +1231,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1302,11 +1266,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1341,11 +1301,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.8.3/developing-binary-protocol.md b/site2/website-next/versioned_docs/version-2.8.3/developing-binary-protocol.md
index cb9a5f69ed0..177ffebd6e5 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/developing-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/developing-binary-protocol.md
@@ -483,7 +483,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker)
 docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
diff --git a/site2/website-next/versioned_docs/version-2.8.3/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.8.3/io-debezium-source.md
index 03082d2e1d2..8c3ba0cb20f 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/io-debezium-source.md
@@ -170,6 +170,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -318,6 +331,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -391,6 +417,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -486,6 +516,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.8.3/schema-manage.md b/site2/website-next/versioned_docs/version-2.8.3/schema-manage.md
index a280eba263e..ec05a0f2bab 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.9.0/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.9.0/admin-api-brokers.md
index 8bbe0e8f3cd..22409e6c238 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/admin-api-brokers.md
@@ -40,7 +40,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -104,7 +104,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.9.0/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.9.0/admin-api-functions.md
index 9478704c4c0..6c0bb255fd5 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/admin-api-functions.md
@@ -69,7 +69,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -125,7 +125,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -175,7 +175,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -217,7 +217,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -260,7 +260,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -302,7 +302,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -345,7 +345,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -387,7 +387,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -428,7 +428,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -470,7 +470,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -512,7 +512,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -554,7 +554,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -596,7 +596,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -638,7 +638,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -680,7 +680,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -725,7 +725,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -768,7 +768,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -813,7 +813,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.9.0/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.9.0/admin-api-namespaces.md
index 3c37c112a7d..e07e158682e 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/admin-api-namespaces.md
@@ -52,12 +52,8 @@ $ pulsar-admin namespaces create test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/createNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -114,12 +110,8 @@ $ pulsar-admin namespaces policies test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace|operation/getPolicies?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -157,12 +149,8 @@ test-tenant/ns2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant|operation/getTenantNamespaces?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -198,12 +186,8 @@ $ pulsar-admin namespaces delete test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace|operation/deleteNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -240,12 +224,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -285,12 +265,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -334,12 +310,8 @@ $ pulsar-admin namespaces set-backlog-quota --limit 10G --limitTime 36000 --poli
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -384,12 +356,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -423,12 +391,8 @@ $ pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -472,12 +436,8 @@ $ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -522,12 +482,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -563,12 +519,8 @@ $ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -602,12 +554,8 @@ $ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenan
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -643,12 +591,8 @@ $ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -688,18 +632,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
-```
-
-100
-
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -739,12 +673,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -781,12 +711,8 @@ $ pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -820,11 +746,7 @@ $ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub m
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -861,12 +783,8 @@ $ pulsar-admin namespaces set-retention --size 100 --time 10 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -909,12 +827,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -964,12 +878,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1013,12 +923,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1060,12 +966,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1109,12 +1011,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1156,12 +1054,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1205,12 +1099,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1246,11 +1136,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1286,19 +1172,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1333,11 +1207,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1380,12 +1250,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.9.0/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.9.0/admin-api-packages.md
index 439dea6a165..2852fb74a02 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/admin-api-packages.md
@@ -101,7 +101,7 @@ bin/pulsar-admin packages upload functions://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -145,7 +145,7 @@ bin/pulsar-admin packages download functions://public/default/example@v0.1 --pat
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -188,7 +188,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -231,7 +231,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -275,7 +275,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -318,7 +318,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -364,7 +364,7 @@ bin/pulsar-admin packages delete functions://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.9.0/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.9.0/admin-api-topics.md
index 4051f633909..3ba5c2f1bf3 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/admin-api-topics.md
@@ -805,7 +805,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1061,9 +1061,9 @@ admin.topics().skipAllMessages(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1102,7 +1102,7 @@ admin.lookup().lookupDestination(topic);
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1236,7 +1236,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1275,11 +1275,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1316,19 +1312,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1363,11 +1347,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1405,11 +1385,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1444,11 +1420,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1483,11 +1455,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1525,11 +1493,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1564,11 +1528,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1603,11 +1563,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.9.0/develop-binary-protocol.md b/site2/website-next/versioned_docs/version-2.9.0/develop-binary-protocol.md
index 74ef751e643..dfddb344ed9 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/develop-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/develop-binary-protocol.md
@@ -458,7 +458,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker)
 docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
diff --git a/site2/website-next/versioned_docs/version-2.9.0/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.9.0/io-debezium-source.md
index 34e1fd10e6f..e7dc56cf54c 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/io-debezium-source.md
@@ -165,6 +165,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -313,6 +326,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -386,6 +412,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -479,6 +509,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.9.0/schema-manage.md b/site2/website-next/versioned_docs/version-2.9.0/schema-manage.md
index 98105408fb3..4ae363882b2 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.9.1/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.9.1/admin-api-brokers.md
index 8bbe0e8f3cd..22409e6c238 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/admin-api-brokers.md
@@ -40,7 +40,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -104,7 +104,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.9.1/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.9.1/admin-api-functions.md
index 9478704c4c0..6c0bb255fd5 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/admin-api-functions.md
@@ -69,7 +69,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -125,7 +125,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -175,7 +175,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -217,7 +217,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -260,7 +260,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -302,7 +302,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -345,7 +345,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -387,7 +387,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -428,7 +428,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -470,7 +470,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -512,7 +512,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -554,7 +554,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -596,7 +596,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -638,7 +638,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -680,7 +680,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -725,7 +725,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -768,7 +768,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -813,7 +813,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.9.1/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.9.1/admin-api-namespaces.md
index 3c37c112a7d..e07e158682e 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/admin-api-namespaces.md
@@ -52,12 +52,8 @@ $ pulsar-admin namespaces create test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/createNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -114,12 +110,8 @@ $ pulsar-admin namespaces policies test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace|operation/getPolicies?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -157,12 +149,8 @@ test-tenant/ns2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant|operation/getTenantNamespaces?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -198,12 +186,8 @@ $ pulsar-admin namespaces delete test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace|operation/deleteNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -240,12 +224,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -285,12 +265,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -334,12 +310,8 @@ $ pulsar-admin namespaces set-backlog-quota --limit 10G --limitTime 36000 --poli
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -384,12 +356,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -423,12 +391,8 @@ $ pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -472,12 +436,8 @@ $ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -522,12 +482,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -563,12 +519,8 @@ $ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -602,12 +554,8 @@ $ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenan
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -643,12 +591,8 @@ $ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -688,18 +632,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
-```
-
-100
-
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -739,12 +673,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -781,12 +711,8 @@ $ pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -820,11 +746,7 @@ $ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub m
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -861,12 +783,8 @@ $ pulsar-admin namespaces set-retention --size 100 --time 10 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -909,12 +827,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -964,12 +878,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1013,12 +923,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1060,12 +966,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1109,12 +1011,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1156,12 +1054,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1205,12 +1099,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1246,11 +1136,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1286,19 +1172,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1333,11 +1207,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1380,12 +1250,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.9.1/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.9.1/admin-api-packages.md
index 439dea6a165..2852fb74a02 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/admin-api-packages.md
@@ -101,7 +101,7 @@ bin/pulsar-admin packages upload functions://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -145,7 +145,7 @@ bin/pulsar-admin packages download functions://public/default/example@v0.1 --pat
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -188,7 +188,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -231,7 +231,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -275,7 +275,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -318,7 +318,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -364,7 +364,7 @@ bin/pulsar-admin packages delete functions://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.9.1/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.9.1/admin-api-topics.md
index c0eab96468c..cc3e7ba5ad4 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/admin-api-topics.md
@@ -805,7 +805,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1061,9 +1061,9 @@ admin.topics().skipAllMessages(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1102,7 +1102,7 @@ admin.lookup().lookupDestination(topic);
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1236,7 +1236,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1276,11 +1276,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1317,19 +1313,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1364,11 +1348,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1406,11 +1386,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1445,11 +1421,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1484,11 +1456,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1526,11 +1494,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1565,11 +1529,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1604,11 +1564,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.9.1/develop-binary-protocol.md b/site2/website-next/versioned_docs/version-2.9.1/develop-binary-protocol.md
index 74ef751e643..dfddb344ed9 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/develop-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/develop-binary-protocol.md
@@ -458,7 +458,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker)
 docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
diff --git a/site2/website-next/versioned_docs/version-2.9.1/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.9.1/io-debezium-source.md
index 34e1fd10e6f..f94f8336fc0 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/io-debezium-source.md
@@ -165,6 +165,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -313,6 +326,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+     
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -386,6 +412,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -479,6 +509,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.9.1/schema-manage.md b/site2/website-next/versioned_docs/version-2.9.1/schema-manage.md
index 98105408fb3..4ae363882b2 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
diff --git a/site2/website-next/versioned_docs/version-2.9.2/admin-api-brokers.md b/site2/website-next/versioned_docs/version-2.9.2/admin-api-brokers.md
index 8bbe0e8f3cd..22409e6c238 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/admin-api-brokers.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/admin-api-brokers.md
@@ -40,7 +40,7 @@ In addition to being configurable when you start them up, brokers can also be [d
 
 ### List active brokers
 
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic with cluster name.
 
 ````mdx-code-block
 <Tabs 
@@ -104,7 +104,7 @@ BrokerInfo(serviceUrl=broker1.use.org.com:8080)
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v2/brokers/leaderBroker|operation/getLeaderBroker?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.9.2/admin-api-functions.md b/site2/website-next/versioned_docs/version-2.9.2/admin-api-functions.md
index 9478704c4c0..6c0bb255fd5 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/admin-api-functions.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/admin-api-functions.md
@@ -69,7 +69,7 @@ $ pulsar-admin functions create \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName|operation/registerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -125,7 +125,7 @@ $ pulsar-admin functions update \
 </TabItem>
 <TabItem value="REST Admin API">
 
-{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/functions/:tenant/:namespace/:functionName|operation/updateFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -175,7 +175,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -217,7 +217,7 @@ $ pulsar-admin functions start \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/start|operation/startFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -260,7 +260,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -302,7 +302,7 @@ $ pulsar-admin functions stop \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/stop|operation/stopFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -345,7 +345,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -387,7 +387,7 @@ $ pulsar-admin functions restart \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/restart|operation/restartFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -428,7 +428,7 @@ $ pulsar-admin functions list \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace|operation/listFunctions?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -470,7 +470,7 @@ $ pulsar-admin functions delete \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/functions/:tenant/:namespace/:functionName|operation/deregisterFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -512,7 +512,7 @@ $ pulsar-admin functions get \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName|operation/getFunctionInfo?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -554,7 +554,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/status|operation/getFunctionInstanceStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -596,7 +596,7 @@ $ pulsar-admin functions status \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/status|operation/getFunctionStatus?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -638,7 +638,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/:instanceId/stats|operation/getFunctionInstanceStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -680,7 +680,7 @@ $ pulsar-admin functions stats \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/stats|operation/getFunctionStats?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -725,7 +725,7 @@ $ pulsar-admin functions trigger \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/trigger|operation/triggerFunction?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -768,7 +768,7 @@ $ pulsar-admin functions putstate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/putFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin API">
@@ -813,7 +813,7 @@ $ pulsar-admin functions querystate \
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/functions/:tenant/:namespace/:functionName/state/:key|operation/getFunctionState?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java Admin CLI">
diff --git a/site2/website-next/versioned_docs/version-2.9.2/admin-api-namespaces.md b/site2/website-next/versioned_docs/version-2.9.2/admin-api-namespaces.md
index 3c37c112a7d..e07e158682e 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/admin-api-namespaces.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/admin-api-namespaces.md
@@ -52,12 +52,8 @@ $ pulsar-admin namespaces create test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace|operation/createNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -114,12 +110,8 @@ $ pulsar-admin namespaces policies test-tenant/test-namespace
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace|operation/getPolicies?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -157,12 +149,8 @@ test-tenant/ns2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant|operation/getTenantNamespaces?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -198,12 +186,8 @@ $ pulsar-admin namespaces delete test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace|operation/deleteNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -240,12 +224,8 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replication|operation/setNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -285,12 +265,8 @@ cl2
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replication|operation/getNamespaceReplicationClusters?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -334,12 +310,8 @@ $ pulsar-admin namespaces set-backlog-quota --limit 10G --limitTime 36000 --poli
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/setBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -384,12 +356,8 @@ $ pulsar-admin namespaces get-backlog-quotas test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/backlogQuotaMap|operation/getBacklogQuotaMap?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -423,12 +391,8 @@ $ pulsar-admin namespaces remove-backlog-quota test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/backlogQuota|operation/removeBacklogQuota?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -472,12 +436,8 @@ $ pulsar-admin namespaces set-persistence --bookkeeper-ack-quorum 2 --bookkeeper
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/setPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -522,12 +482,8 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/persistence|operation/getPersistence?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -563,12 +519,8 @@ $ pulsar-admin namespaces unload --bundle 0x00000000_0xffffffff test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/unload|operation/unloadNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -602,12 +554,8 @@ $ pulsar-admin namespaces split-bundle --bundle 0x00000000_0xffffffff test-tenan
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/{bundle}/split|operation/splitNamespaceBundle?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -643,12 +591,8 @@ $ pulsar-admin namespaces set-message-ttl --messageTTL 100 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/setNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -688,18 +632,8 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/getNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
-```
-
-100
-
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -739,12 +673,8 @@ $ pulsar-admin namespaces remove-message-ttl test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/messageTTL|operation/removeNamespaceMessageTTL?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -781,12 +711,8 @@ $ pulsar-admin namespaces clear-backlog --sub my-subscription test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/clearBacklog|operation/clearNamespaceBacklogForSubscription?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -820,11 +746,7 @@ $ pulsar-admin namespaces clear-backlog  --bundle 0x00000000_0xffffffff  --sub m
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/{bundle}/clearBacklog|operation?version=@pulsar:version_number@/clearNamespaceBundleBacklogForSubscription}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/:bundle/clearBacklog|operation/clearNamespaceBundleBacklogForSubscription?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -861,12 +783,8 @@ $ pulsar-admin namespaces set-retention --size 100 --time 10 test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/retention|operation/setRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -909,12 +827,8 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/retention|operation/getRetention?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -964,12 +878,8 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1013,12 +923,8 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/dispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1060,12 +966,8 @@ $ pulsar-admin namespaces set-subscription-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1109,12 +1011,8 @@ $ pulsar-admin namespaces get-subscription-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/subscriptionDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1156,12 +1054,8 @@ $ pulsar-admin namespaces set-replicator-dispatch-rate test-tenant/ns1 \
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/setDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1205,12 +1099,8 @@ $ pulsar-admin namespaces get-replicator-dispatch-rate test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
 {@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/replicatorDispatchRate|operation/getDispatchRate?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
@@ -1246,11 +1136,7 @@ $ pulsar-admin namespaces get-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1286,19 +1172,7 @@ $ pulsar-admin namespaces set-deduplication-snapshot-interval test-tenant/ns1 --
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1333,11 +1207,7 @@ $ pulsar-admin namespaces remove-deduplication-snapshot-interval test-tenant/ns1
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/namespaces/:tenant/:namespace/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1380,12 +1250,8 @@ $ pulsar-admin namespaces unload my-tenant/my-ns
 </TabItem>
 <TabItem value="REST">
 
-```
-
 {@inject: endpoint|PUT|/admin/v2/namespaces/:tenant/:namespace/unload|operation/unloadNamespace?version=@pulsar:version_number@}
 
-```
-
 </TabItem>
 <TabItem value="Java">
 
diff --git a/site2/website-next/versioned_docs/version-2.9.2/admin-api-packages.md b/site2/website-next/versioned_docs/version-2.9.2/admin-api-packages.md
index 439dea6a165..2852fb74a02 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/admin-api-packages.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/admin-api-packages.md
@@ -101,7 +101,7 @@ bin/pulsar-admin packages upload functions://public/default/example@v0.1 --path
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|POST|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/upload?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -145,7 +145,7 @@ bin/pulsar-admin packages download functions://public/default/example@v0.1 --pat
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/download?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -188,7 +188,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName|operation/listPackageVersion?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -231,7 +231,7 @@ bin/pulsar-admin packages list --type function public/default
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace|operation/listPackages?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -275,7 +275,7 @@ bin/pulsar-admin packages get-metadata function://public/default/test@v1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|GET|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/getMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -318,7 +318,7 @@ bin/pulsar-admin packages update-metadata function://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata/?version=@pulsar:version_number@}
+{@inject: endpoint|PUT|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/metadata|operation/updateMeta?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
@@ -364,7 +364,7 @@ bin/pulsar-admin packages delete functions://public/default/example@v0.1
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version/?version=@pulsar:version_number@}
+{@inject: endpoint|DELETE|/admin/v3/packages/:type/:tenant/:namespace/:packageName/:version|operation/delete?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="JAVA">
diff --git a/site2/website-next/versioned_docs/version-2.9.2/admin-api-topics.md b/site2/website-next/versioned_docs/version-2.9.2/admin-api-topics.md
index c0eab96468c..cc3e7ba5ad4 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/admin-api-topics.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/admin-api-topics.md
@@ -805,7 +805,7 @@ msg-payload
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation?version=@pulsar:version_number@/peekNthMessage}
+{@inject: endpoint|GET|/admin/v2/:schema/:tenant/:namespace/:topic/subscription/:subName/position/:messagePosition|operation/peekNthMessage?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1061,9 +1061,9 @@ admin.topics().skipAllMessages(topic, subName, timestamp);
 </Tabs>
 ````
 
-### Lookup of topic
+### Look up topic's owner broker
 
-You can locate the broker URL which is serving the given topic in the following ways.
+You can locate the owner broker of the given topic in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1102,7 +1102,7 @@ admin.lookup().lookupDestination(topic);
 
 ### Get bundle
 
-You can check the range of the bundle which contains given topic in the following ways.
+You can get the range of the bundle that the given topic belongs to in the following ways.
 
 ````mdx-code-block
 <Tabs 
@@ -1236,7 +1236,7 @@ pulsar-admin topics last-message-id topic-name
 </TabItem>
 <TabItem value="REST API">
 
-{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId?version=@pulsar:version_number@}
+{@inject: endpoint|Get|/admin/v2/:schema/:tenant/:namespace/:topic/lastMessageId|operation/getLastMessageId?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java">
@@ -1276,11 +1276,7 @@ pulsar-admin topics get-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/getDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1317,19 +1313,7 @@ pulsar-admin topics set-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
-
-```json
-
-{
-  "interval": 1000
-}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/setDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1364,11 +1348,7 @@ pulsar-admin topics remove-deduplication-snapshot-interval options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/deduplicationSnapshotInterval|operation/deleteDeduplicationSnapshotInterval?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1406,11 +1386,7 @@ pulsar-admin topics get-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/getInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1445,11 +1421,7 @@ pulsar-admin topics set-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/setInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1484,11 +1456,7 @@ pulsar-admin topics remove-inactive-topic-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/inactiveTopicPolicies|operation/removeInactiveTopicPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1526,11 +1494,7 @@ pulsar-admin topics get-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|GET|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/getOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1565,11 +1529,7 @@ pulsar-admin topics set-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|POST|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/setOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
@@ -1604,11 +1564,7 @@ pulsar-admin topics remove-offload-policies options
 </TabItem>
 <TabItem value="REST API">
 
-```
-
-{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies?version=@pulsar:version_number@}
-
-```
+{@inject: endpoint|DELETE|/admin/v2/topics/:tenant/:namespace/:topic/offloadPolicies|operation/removeOffloadPolicies?version=@pulsar:version_number@}
 
 </TabItem>
 <TabItem value="Java API">
diff --git a/site2/website-next/versioned_docs/version-2.9.2/developing-binary-protocol.md b/site2/website-next/versioned_docs/version-2.9.2/developing-binary-protocol.md
index a18a8b8d561..b34b7a4cf90 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/developing-binary-protocol.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/developing-binary-protocol.md
@@ -483,7 +483,7 @@ Topic lookup needs to be performed each time a client needs to create or
 reconnect a producer or a consumer. Lookup is used to discover which particular
 broker is serving the topic we are about to use.
 
-Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#lookup-of-topic)
+Lookup can be done with a REST call as described in the [admin API](admin-api-topics.md#look-up-topics-owner-broker)
 docs.
 
 Since Pulsar-1.16 it is also possible to perform the lookup within the binary
diff --git a/site2/website-next/versioned_docs/version-2.9.2/io-debezium-source.md b/site2/website-next/versioned_docs/version-2.9.2/io-debezium-source.md
index 34e1fd10e6f..f9b7e10a8e2 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/io-debezium-source.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/io-debezium-source.md
@@ -165,6 +165,19 @@ This example shows how to change the data of a MySQL table using the Pulsar Debe
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+     
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -313,6 +326,19 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
@@ -386,6 +412,10 @@ This example shows how to change the data of a PostgreSQL table using the Pulsar
 
 You need to create a configuration file before using the Pulsar Debezium connector.
 
+### Configuration
+
+You can use one of the following methods to create a configuration file.
+
 * JSON 
 
   ```json
@@ -479,6 +509,19 @@ This example shows how to change the data of a MongoDB table using the Pulsar De
        
        ```
 
+    :::note
+      
+    Currently, the destination topic (specified by the `destination-topic-name` option ) is a required configuration but it is not used for the Debezium connector to save data. The Debezium connector saves data in the following 4 types of topics:
+      
+       - One topic named with the database server name ( `database.server.name`) for storing the database metadata messages, such as `public/default/database.server.name`.
+       - One topic (`database.history.pulsar.topic`) for storing the database history information. The connector writes and recovers DDL statements on this topic.
+       - One topic (`offset.storage.topic`) for storing the offset metadata messages. The connector saves the last successfully-committed offsets on this topic.
+       - One per-table topic. The connector writes change events for all operations that occur in a table to a single Pulsar topic that is specific to that table.
+      
+    If the automatic topic creation is disabled on your broker, you need to manually create the above 4 types of topics and the destination topic.
+
+    :::
+
    * Use the **YAML** configuration file as shown previously.
 
        ```bash
diff --git a/site2/website-next/versioned_docs/version-2.9.2/schema-manage.md b/site2/website-next/versioned_docs/version-2.9.2/schema-manage.md
index 98105408fb3..4ae363882b2 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/schema-manage.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/schema-manage.md
@@ -234,7 +234,7 @@ Here are examples of the `schema-definition-file` for a JSON schema.
 </TabItem>
 <TabItem value="REST API">
 
-Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchem?version=@pulsar:version_number@a}
+Send a `POST` request to this endpoint: {@inject: endpoint|POST|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/uploadSchema?version=@pulsar:version_number@}
 
 The post payload is in JSON format.
 
@@ -325,7 +325,7 @@ $ pulsar-admin schemas get <topic-name>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to this endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.
 
@@ -406,7 +406,7 @@ $ pulsar-admin schemas get <topic-name> --version=<version>
 </TabItem>
 <TabItem value="REST API">
 
-Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchem?version=@pulsar:version_number@a}
+Send a `GET` request to a schema endpoint: {@inject: endpoint|GET|/admin/v2/schemas/:tenant/:namespace/:topic/schema/:version|operation/getSchema?version=@pulsar:version_number@}
 
 Here is an example of a response, which is returned in JSON format.