[pulsar-site] branch main updated: Specially handle Python and C++ API documents (#291)

tison Tue, 15 Nov 2022 08:39:06 -0800

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

tison 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 69214b2886a Specially handle Python and C++ API documents  (#291)
69214b2886a is described below

commit 69214b2886a2fb7d371387285fb04eb69fa0311d
Author: tison <[email protected]>
AuthorDate: Wed Nov 16 00:38:53 2022 +0800

    Specially handle Python and C++ API documents  (#291)
    
    Signed-off-by: tison <[email protected]>
---
 site2/website-next/docs/client-libraries-cpp.md    |  2 +-
 site2/website-next/docs/client-libraries-python.md |  4 ++--
 site2/website-next/docs/client-libraries.md        | 16 ++++++-------
 site2/website-next/scripts/replace.js              | 28 +++++++++++++---------
 .../version-2.10.x/client-libraries-cpp.md         |  2 +-
 .../version-2.10.x/client-libraries-python.md      |  6 ++---
 .../version-2.10.x/client-libraries.md             | 18 +++++++-------
 .../version-2.2.0/client-libraries-python.md       |  4 ++--
 .../version-2.2.0/client-libraries.md              |  4 ++--
 .../versioned_docs/version-2.2.0/functions-api.md  |  2 +-
 .../version-2.2.1/client-libraries-cpp.md          |  2 +-
 .../version-2.2.1/client-libraries-python.md       |  6 ++---
 .../version-2.2.1/client-libraries.md              |  4 ++--
 .../version-2.3.0/client-libraries-python.md       |  4 ++--
 .../version-2.3.0/client-libraries.md              |  4 ++--
 .../version-2.3.1/client-libraries-python.md       |  4 ++--
 .../version-2.3.1/client-libraries.md              |  4 ++--
 .../version-2.3.2/client-libraries-cpp.md          |  2 +-
 .../version-2.3.2/client-libraries-python.md       |  6 ++---
 .../version-2.3.2/client-libraries.md              |  4 ++--
 .../version-2.4.0/client-libraries-cpp.md          |  2 +-
 .../version-2.4.0/client-libraries-python.md       |  4 ++--
 .../version-2.4.0/client-libraries.md              |  4 ++--
 .../versioned_docs/version-2.4.0/functions-api.md  |  2 +-
 .../version-2.4.1/client-libraries-cpp.md          |  2 +-
 .../version-2.4.1/client-libraries-python.md       |  4 ++--
 .../version-2.4.1/client-libraries.md              |  4 ++--
 .../version-2.4.2/client-libraries-cpp.md          |  2 +-
 .../version-2.4.2/client-libraries-python.md       |  4 ++--
 .../version-2.4.2/client-libraries.md              |  4 ++--
 .../version-2.5.0/client-libraries-python.md       |  4 ++--
 .../version-2.5.0/client-libraries.md              |  4 ++--
 .../version-2.5.1/client-libraries-cpp.md          |  2 +-
 .../version-2.5.1/client-libraries-python.md       |  6 ++---
 .../version-2.5.2/client-libraries-cpp.md          |  2 +-
 .../version-2.5.2/client-libraries-python.md       |  6 ++---
 .../version-2.6.0/client-libraries-cpp.md          |  2 +-
 .../version-2.6.0/client-libraries-python.md       |  6 ++---
 .../version-2.6.1/client-libraries-cpp.md          |  2 +-
 .../version-2.6.1/client-libraries-python.md       |  6 ++---
 .../version-2.6.2/client-libraries-cpp.md          |  2 +-
 .../version-2.6.2/client-libraries-python.md       |  6 ++---
 .../version-2.6.3/client-libraries-cpp.md          |  2 +-
 .../version-2.6.3/client-libraries-python.md       |  6 ++---
 .../version-2.6.4/client-libraries-cpp.md          |  2 +-
 .../version-2.6.4/client-libraries-python.md       |  6 ++---
 .../version-2.7.0/client-libraries-cpp.md          |  2 +-
 .../version-2.7.0/client-libraries-python.md       |  6 ++---
 .../version-2.7.1/client-libraries-cpp.md          |  2 +-
 .../version-2.7.1/client-libraries-python.md       |  6 ++---
 .../version-2.7.2/client-libraries-cpp.md          |  2 +-
 .../version-2.7.2/client-libraries-python.md       |  6 ++---
 .../version-2.7.3/client-libraries-cpp.md          |  2 +-
 .../version-2.7.3/client-libraries-python.md       |  6 ++---
 .../version-2.7.4/client-libraries-cpp.md          |  2 +-
 .../version-2.7.4/client-libraries-python.md       |  6 ++---
 .../version-2.7.5/client-libraries-cpp.md          |  2 +-
 .../version-2.7.5/client-libraries-python.md       |  6 ++---
 .../version-2.8.x/client-libraries-cpp.md          |  2 +-
 .../version-2.8.x/client-libraries-python.md       |  6 ++---
 .../version-2.9.x/client-libraries-cpp.md          |  2 +-
 .../version-2.9.x/client-libraries-python.md       |  6 ++---
 62 files changed, 146 insertions(+), 140 deletions(-)

diff --git a/site2/website-next/docs/client-libraries-cpp.md 
b/site2/website-next/docs/client-libraries-cpp.md
index a3ac9422543..ee8b657d81d 100644
--- a/site2/website-next/docs/client-libraries-cpp.md
+++ b/site2/website-next/docs/client-libraries-cpp.md
@@ -11,7 +11,7 @@ import TabItem from '@theme/TabItem';
 
 You can use a Pulsar C++ client to create producers, consumers, and readers. 
For complete examples, refer to [C++ client 
examples](https://github.com/apache/pulsar-client-cpp/tree/main/examples).
 
-All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](/api/cpp) for the C++ client.
+All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ 
client.
 
 ## Installation
 
diff --git a/site2/website-next/docs/client-libraries-python.md 
b/site2/website-next/docs/client-libraries-python.md
index 460d2ec477f..c3e41e6aac2 100644
--- a/site2/website-next/docs/client-libraries-python.md
+++ b/site2/website-next/docs/client-libraries-python.md
@@ -11,7 +11,7 @@ import TabItem from '@theme/TabItem';
 
 You can use a Pulsar Python client to create producers, consumers, and readers.
 
-All the methods in producer, consumer, and reader of a Python client are 
thread-safe. You can read the [API docs](/api/python) for the Python client.
+All the methods in producer, consumer, and reader of a Python client are 
thread-safe. You can read the [API docs](@pulsar:apidoc:python@) for the Python 
client.
 
 ## Installation
 
@@ -65,7 +65,7 @@ pulsar+ssl://pulsar.us-west.example.com:6651
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git a/site2/website-next/docs/client-libraries.md 
b/site2/website-next/docs/client-libraries.md
index f76de91ed7a..0a31b9d1ee5 100644
--- a/site2/website-next/docs/client-libraries.md
+++ b/site2/website-next/docs/client-libraries.md
@@ -6,14 +6,14 @@ sidebar_label: "Overview"
 
 Pulsar supports the following language-specific client libraries:
 
-| Language  | Documentation                                                    
    | Release note                                                              
        | Code repo                                                             
|
-| --------- | 
-------------------------------------------------------------------- | 
---------------------------------------------------------------------------------
 | --------------------------------------------------------------------- |
-| Java      | [User doc](client-libraries-java.md)   <br/> [API 
doc](/api/client/) | [Bundled](/release-notes/)                                 
                       | 
[Bundled](https://github.com/apache/pulsar/tree/master/pulsar-client) |
-| C++       | [User doc](client-libraries-cpp.md)    <br/> [API 
doc](/api/cpp/)    | [Bundled](/release-notes/)                                 
                       | 
[Standalone](https://github.com/apache/pulsar/pulsar-client-cpp)      |
-| Python    | [User doc](client-libraries-python.md) <br/> [API 
doc](/api/python/) | [Bundled](/release-notes/)                                 
                       | 
[Standalone](https://github.com/apache/pulsar-client-python)          |
-| Go client | [User doc](client-libraries-go.md)                               
    | [Standalone](https://github.com/apache/pulsar-client-go/releases)         
        | [Standalone](https://github.com/apache/pulsar-client-go)              
|
-| Node.js   | [User doc](client-libraries-node.md)                             
    | [Standalone](https://github.com/apache/pulsar-client-node/releases)       
        | [Standalone](https://github.com/apache/pulsar-client-node)            
|
-| C#        | [User doc](client-libraries-dotnet.md)                           
    | 
[Standalone](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG.md)
 | [Standalone](https://github.com/apache/pulsar-dotpulsar)              |
+| Language  | Documentation                                                    
      | Release note                                                            
          | Code repo                                                           
  |
+| --------- 
|------------------------------------------------------------------------| 
---------------------------------------------------------------------------------
 | --------------------------------------------------------------------- |
+| Java      | [User doc](client-libraries-java.md)   <br/> [API 
doc](/api/client/)   | [Bundled](/release-notes/)                               
                         | 
[Bundled](https://github.com/apache/pulsar/tree/master/pulsar-client) |
+| C++       | [User doc](client-libraries-cpp.md)    <br/> [API 
doc](/api/cpp/3.0.0) | [Bundled](/release-notes/)                               
                         | 
[Standalone](https://github.com/apache/pulsar/pulsar-client-cpp)      |
+| Python    | [User doc](client-libraries-python.md) <br/> [API 
doc](@pulsar:apidoc:python@)       | [Bundled](/release-notes/)                 
                                       | 
[Standalone](https://github.com/apache/pulsar-client-python)          |
+| Go client | [User doc](client-libraries-go.md)                               
      | [Standalone](https://github.com/apache/pulsar-client-go/releases)       
          | [Standalone](https://github.com/apache/pulsar-client-go)            
  |
+| Node.js   | [User doc](client-libraries-node.md)                             
      | [Standalone](https://github.com/apache/pulsar-client-node/releases)     
          | [Standalone](https://github.com/apache/pulsar-client-node)          
  |
+| C#        | [User doc](client-libraries-dotnet.md)                           
      | 
[Standalone](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG.md)
 | [Standalone](https://github.com/apache/pulsar-dotpulsar)              |
 
 Pulsar supports the following language-agnostic client libraries:
 
diff --git a/site2/website-next/scripts/replace.js 
b/site2/website-next/scripts/replace.js
index dbaf6c4ae1a..27316a60723 100644
--- a/site2/website-next/scripts/replace.js
+++ b/site2/website-next/scripts/replace.js
@@ -113,16 +113,22 @@ function debDistUrl(version, type) {
   }
 }
 
+// Specially handle Python and C++ API documents, since they are moved out 
start from 2.11.0.
+function multiClientVersionUrl(version, type) {
+  if (type === "python" && version === "2.6.4") {
+    // There's no release for Python client 2.6.4. Add this trick to avoid 
broken link.
+    return `${siteConfig.url}/api/${type}/2.6.3`
+  }
+  return `${siteConfig.url}/api/${type}/${version}`
+}
+
 function clientVersionUrl(version, type) {
   var versions = version.split(".");
   var majorVersion = parseInt(versions[0]);
   var minorVersion = parseInt(versions[1]);
-  if (
-    (majorVersion === 2 && minorVersion < 5) ||
-    (type === "python" && minorVersion >= 7)
-  ) {
+  if (majorVersion === 2 && minorVersion < 5) {
     return `(${siteConfig.url}/api/${type}/${version}`;
-  } else if (majorVersion >= 2 && minorVersion >= 5) {
+  } else {
     return 
`(${siteConfig.url}/api/${type}/${majorVersion}.${minorVersion}.0-SNAPSHOT`;
   }
 }
@@ -165,8 +171,8 @@ const from = [
   /@pulsar:dist_deb:client@/g,
   /@pulsar:dist_deb:client-devel@/g,
 
-  /\(\/api\/python/g,
-  /\(\/api\/cpp/g,
+  /@pulsar:apidoc:python@/g,
+  /@pulsar:apidoc:cpp@/g,
   /\(\/api\/pulsar-functions/g,
   /\(\/api\/client/g,
   /\(\/api\/admin/g,
@@ -199,8 +205,8 @@ const options = {
     debDistUrl(`${latestVersion}`, ""),
     debDistUrl(`${latestVersion}`, "-dev"),
 
-    clientVersionUrl(`${latestVersion}`, "python"),
-    clientVersionUrl(`${latestVersion}`, "cpp"),
+    multiClientVersionUrl(`${latestVersion}`, "python"),
+    multiClientVersionUrl(`${latestVersion}`, "cpp"),
     clientVersionUrl(`${latestVersion}`, "pulsar-functions"),
     clientVersionUrl(`${latestVersion}`, "client"),
     clientVersionUrl(`${latestVersion}`, "admin"),
@@ -245,8 +251,8 @@ for (let _v of versions) {
       rpmDistUrl(`${v}`, "-devel"),
       debDistUrl(`${v}`, ""),
       debDistUrl(`${v}`, "-dev"),
-      clientVersionUrl(`${v}`, "python"),
-      clientVersionUrl(`${v}`, "cpp"),
+      multiClientVersionUrl(`${v}`, "python"),
+      multiClientVersionUrl(`${v}`, "cpp"),
       clientVersionUrl(`${v}`, "pulsar-functions"),
       clientVersionUrl(`${v}`, "client"),
       clientVersionUrl(`${v}`, "admin"),
diff --git 
a/site2/website-next/versioned_docs/version-2.10.x/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.10.x/client-libraries-cpp.md
index e88df87b654..a17f977ddda 100644
--- a/site2/website-next/versioned_docs/version-2.10.x/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.10.x/client-libraries-cpp.md
@@ -12,7 +12,7 @@ import TabItem from '@theme/TabItem';
 
 You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](/api/cpp) for the C++ client.
+All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ 
client.
 
 ## Installation
 
diff --git 
a/site2/website-next/versioned_docs/version-2.10.x/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.10.x/client-libraries-python.md
index 7837b0ae4aa..9cc87de872f 100644
--- 
a/site2/website-next/versioned_docs/version-2.10.x/client-libraries-python.md
+++ 
b/site2/website-next/versioned_docs/version-2.10.x/client-libraries-python.md
@@ -11,11 +11,11 @@ import TabItem from '@theme/TabItem';
 ````
 
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -70,7 +70,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[(@pulsar:apidoc:python@)](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.10.x/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.10.x/client-libraries.md
index 0a02c5a6a19..d3c49b27e77 100644
--- a/site2/website-next/versioned_docs/version-2.10.x/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.10.x/client-libraries.md
@@ -7,15 +7,15 @@ original_id: client-libraries
 
 Pulsar supports the following client libraries:
 
-|Language|Documentation|Release note|Code repo
-|---|---|---|---
-Java |- [User doc](client-libraries-java.md) <br /><br />- [API 
doc](/api/client/)|[Here](/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)
 
-C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](/api/cpp/)|[Here](/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
-Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](/api/python/)|[Here](/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
-WebSocket| [User doc](client-libraries-websocket.md) | 
[Here](/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket)
 
-Go client|[User 
doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG)
 |[Here](https://github.com/apache/pulsar-client-go) 
-Node.js|[User 
doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases)
 |[Here](https://github.com/apache/pulsar-client-node) 
-C# |[User doc](client-libraries-dotnet.md)| 
[Here](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG)|[Here](https://github.com/apache/pulsar-dotpulsar)
 
+| Language  | Documentation                                                    
                        | Release note                                          
                   | Code repo                                                  
           |
+|-----------|------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|-----------------------------------------------------------------------|
+| Java      | - [User doc](client-libraries-java.md) <br /><br />- [API 
doc](/api/client/)             | [Here](/release-notes/)                        
                          | 
[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)    |
+| C++       | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](@pulsar:apidoc:cpp@)       | [Here](/release-notes/)                       
                           | 
[Here](https://github.com/apache/pulsar-client-cpp)                   |
+| Python    | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](@pulsar:apidoc:python@) | [Here](/release-notes/)                          
                        | 
[Here](https://github.com/apache/pulsar-client-python)                |
+| WebSocket | [User doc](client-libraries-websocket.md)                        
                        | [Here](/release-notes/)                               
                   | 
[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket) |
+| Go client | [User doc](client-libraries-go.md)                               
                        | 
[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG) | 
[Here](https://github.com/apache/pulsar-client-go)                    |
+| Node.js   | [User doc](client-libraries-node.md)                             
                        | 
[Here](https://github.com/apache/pulsar-client-node/releases)            | 
[Here](https://github.com/apache/pulsar-client-node)                  |
+| C#        | [User doc](client-libraries-dotnet.md)                           
                        | 
[Here](https://github.com/apache/pulsar-dotpulsar/blob/master/CHANGELOG) | 
[Here](https://github.com/apache/pulsar-dotpulsar)                    |
 
 :::note
 
diff --git 
a/site2/website-next/versioned_docs/version-2.2.0/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.2.0/client-libraries-python.md
index a6cd6febb9d..46bcb2c190a 100644
--- a/site2/website-next/versioned_docs/version-2.2.0/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.2.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.2.0/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.2.0/client-libraries.md
index a86194d2aab..e4bb3980f38 100644
--- a/site2/website-next/versioned_docs/version-2.2.0/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.2.0/client-libraries.md
@@ -32,13 +32,13 @@ For a tutorial on using the Pulsar Go client, see [The 
Pulsar Go client](client-
 
 For a tutorial on using the Pulsar Python client, see [The Pulsar Python 
client](client-libraries-python.md).
 
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs 
for the Python client [here](/api/python).
+There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs 
for the Python client [here](@pulsar:apidoc:python@).
 
 ## C++ client
 
 For a tutorial on using the Pulsar C++ clent, see [The Pulsar C++ 
client](client-libraries-cpp.md).
 
-There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API 
docs for the C++ client [here](/api/cpp).
+There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API 
docs for the C++ client [here](@pulsar:apidoc:cpp@).
 
 ## Feature Matrix
 
diff --git a/site2/website-next/versioned_docs/version-2.2.0/functions-api.md 
b/site2/website-next/versioned_docs/version-2.2.0/functions-api.md
index c0c25f9e8a8..4708ed36485 100644
--- a/site2/website-next/versioned_docs/version-2.2.0/functions-api.md
+++ b/site2/website-next/versioned_docs/version-2.2.0/functions-api.md
@@ -600,7 +600,7 @@ There is one example Python native function in this 
{@inject: github:folder:/pul
 
 ### Python SDK functions
 
-To get started developing Pulsar Functions using the Python SDK, you'll need 
to install the [`pulsar-client`](/api/python) library using the instructions 
[above](#getting-started).
+To get started developing Pulsar Functions using the Python SDK, you'll need 
to install the [`pulsar-client`](@pulsar:apidoc:python@) library using the 
instructions [above](#getting-started).
 
 #### Python SDK examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.2.1/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.2.1/client-libraries-cpp.md
index 3fee9ca2fb0..dd4ae20137d 100644
--- a/site2/website-next/versioned_docs/version-2.2.1/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.2.1/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** 
platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
diff --git 
a/site2/website-next/versioned_docs/version-2.2.1/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.2.1/client-libraries-python.md
index f7d2211df63..46cffc58070 100644
--- a/site2/website-next/versioned_docs/version-2.2.1/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.2.1/client-libraries-python.md
@@ -10,11 +10,11 @@ import TabItem from '@theme/TabItem';
 ````
 
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -70,7 +70,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.2.1/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.2.1/client-libraries.md
index ea93ebd51f5..2ab7b9bfee2 100644
--- a/site2/website-next/versioned_docs/version-2.2.1/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.2.1/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)
 
-C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
-Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
+C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
+Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
 WebSocket| [User doc](client-libraries-websocket.md) | 
[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket)
 
 Go client|[User 
doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG)
 |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User 
doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases)
 |[Here](https://github.com/apache/pulsar-client-node) 
diff --git 
a/site2/website-next/versioned_docs/version-2.3.0/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.3.0/client-libraries-python.md
index 1f7327cea3b..6c7f8f0fde8 100644
--- a/site2/website-next/versioned_docs/version-2.3.0/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.3.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.3.0/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.3.0/client-libraries.md
index ea93ebd51f5..2ab7b9bfee2 100644
--- a/site2/website-next/versioned_docs/version-2.3.0/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.3.0/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)
 
-C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
-Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
+C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
+Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
 WebSocket| [User doc](client-libraries-websocket.md) | 
[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket)
 
 Go client|[User 
doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG)
 |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User 
doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases)
 |[Here](https://github.com/apache/pulsar-client-node) 
diff --git 
a/site2/website-next/versioned_docs/version-2.3.1/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.3.1/client-libraries-python.md
index ec6a954e61d..4ef63be0748 100644
--- a/site2/website-next/versioned_docs/version-2.3.1/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.3.1/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.3.1/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.3.1/client-libraries.md
index ea93ebd51f5..2ab7b9bfee2 100644
--- a/site2/website-next/versioned_docs/version-2.3.1/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.3.1/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)
 
-C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
-Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
+C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
+Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
 WebSocket| [User doc](client-libraries-websocket.md) | 
[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket)
 
 Go client|[User 
doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG)
 |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User 
doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases)
 |[Here](https://github.com/apache/pulsar-client-node) 
diff --git 
a/site2/website-next/versioned_docs/version-2.3.2/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.3.2/client-libraries-cpp.md
index 3fee9ca2fb0..dd4ae20137d 100644
--- a/site2/website-next/versioned_docs/version-2.3.2/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.3.2/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** 
platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
diff --git 
a/site2/website-next/versioned_docs/version-2.3.2/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.3.2/client-libraries-python.md
index f7d2211df63..46cffc58070 100644
--- a/site2/website-next/versioned_docs/version-2.3.2/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.3.2/client-libraries-python.md
@@ -10,11 +10,11 @@ import TabItem from '@theme/TabItem';
 ````
 
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -70,7 +70,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.3.2/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.3.2/client-libraries.md
index b6ca97de9ca..8887f1628d6 100644
--- a/site2/website-next/versioned_docs/version-2.3.2/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.3.2/client-libraries.md
@@ -33,13 +33,13 @@ For a tutorial on using the Pulsar Go client, see [Pulsar 
Go client](client-libr
 
 For a tutorial on using the Pulsar Python client, see [Pulsar Python 
client](client-libraries-python.md).
 
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs 
for the Python client [here](/api/python).
+There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs 
for the Python client [here](@pulsar:apidoc:python@).
 
 ## C++ client
 
 For a tutorial on using the Pulsar C++ clent, see [Pulsar C++ 
client](client-libraries-cpp.md).
 
-There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API 
docs for the C++ client [here](/api/cpp).
+There are also [Doxygen](http://www.stack.nl/~dimitri/doxygen/)-generated API 
docs for the C++ client [here](@pulsar:apidoc:cpp@).
 
 ## Feature Matrix
 Pulsar client feature matrix for different languages is listed on [Client 
Features Matrix](https://github.com/apache/pulsar/wiki/Client-Features-Matrix) 
page.
diff --git 
a/site2/website-next/versioned_docs/version-2.4.0/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.4.0/client-libraries-cpp.md
index 3fee9ca2fb0..dd4ae20137d 100644
--- a/site2/website-next/versioned_docs/version-2.4.0/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.4.0/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** 
platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
diff --git 
a/site2/website-next/versioned_docs/version-2.4.0/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.4.0/client-libraries-python.md
index 5b5988d51b4..1b36e97a806 100644
--- a/site2/website-next/versioned_docs/version-2.4.0/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.4.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.4.0/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.4.0/client-libraries.md
index ea93ebd51f5..2ab7b9bfee2 100644
--- a/site2/website-next/versioned_docs/version-2.4.0/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.4.0/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)
 
-C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
-Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
+C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
+Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
 WebSocket| [User doc](client-libraries-websocket.md) | 
[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket)
 
 Go client|[User 
doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG)
 |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User 
doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases)
 |[Here](https://github.com/apache/pulsar-client-node) 
diff --git a/site2/website-next/versioned_docs/version-2.4.0/functions-api.md 
b/site2/website-next/versioned_docs/version-2.4.0/functions-api.md
index 6409c055628..d36f2040967 100644
--- a/site2/website-next/versioned_docs/version-2.4.0/functions-api.md
+++ b/site2/website-next/versioned_docs/version-2.4.0/functions-api.md
@@ -607,7 +607,7 @@ There is one example Python native function in this 
{@inject: github:folder:/pul
 
 ### Python SDK functions
 
-To get started developing Pulsar Functions using the Python SDK, you'll need 
to install the [`pulsar-client`](/api/python) library using the instructions 
[above](#getting-started).
+To get started developing Pulsar Functions using the Python SDK, you'll need 
to install the [`pulsar-client`](@pulsar:apidoc:python@) library using the 
instructions [above](#getting-started).
 
 #### Python SDK examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.4.1/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.4.1/client-libraries-cpp.md
index 3fee9ca2fb0..dd4ae20137d 100644
--- a/site2/website-next/versioned_docs/version-2.4.1/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.4.1/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** 
platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
diff --git 
a/site2/website-next/versioned_docs/version-2.4.1/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.4.1/client-libraries-python.md
index 7bf2345a94f..22a87af6b6e 100644
--- a/site2/website-next/versioned_docs/version-2.4.1/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.4.1/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.4.1/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.4.1/client-libraries.md
index ea93ebd51f5..2ab7b9bfee2 100644
--- a/site2/website-next/versioned_docs/version-2.4.1/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.4.1/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)
 
-C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
-Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
+C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
+Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
 WebSocket| [User doc](client-libraries-websocket.md) | 
[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket)
 
 Go client|[User 
doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG)
 |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User 
doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases)
 |[Here](https://github.com/apache/pulsar-client-node) 
diff --git 
a/site2/website-next/versioned_docs/version-2.4.2/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.4.2/client-libraries-cpp.md
index 3fee9ca2fb0..dd4ae20137d 100644
--- a/site2/website-next/versioned_docs/version-2.4.2/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.4.2/client-libraries-cpp.md
@@ -12,7 +12,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** ,**MacOS** and **Windows** 
platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 
 ## Linux
diff --git 
a/site2/website-next/versioned_docs/version-2.4.2/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.4.2/client-libraries-python.md
index 7bf2345a94f..22a87af6b6e 100644
--- a/site2/website-next/versioned_docs/version-2.4.2/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.4.2/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.4.2/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.4.2/client-libraries.md
index ea93ebd51f5..2ab7b9bfee2 100644
--- a/site2/website-next/versioned_docs/version-2.4.2/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.4.2/client-libraries.md
@@ -9,8 +9,8 @@ Pulsar supports the following client libraries:
 |Language|Documentation|Release note|Code repo
 |---|---|---|---
 Java |- [User doc](client-libraries-java.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/client/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-client)
 
-C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/cpp/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
-Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](https://pulsar.apache.org/api/python/)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
+C++ | - [User doc](client-libraries-cpp.md) <br /><br />- [API 
doc](@pulsar:apidoc:cpp@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-cpp)
 
+Python | - [User doc](client-libraries-python.md) <br /><br />- [API 
doc](@pulsar:apidoc:python@)|[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar-client-python)
 
 WebSocket| [User doc](client-libraries-websocket.md) | 
[Here](https://pulsar.apache.org/release-notes/)|[Here](https://github.com/apache/pulsar/tree/master/pulsar-websocket)
 
 Go client|[User 
doc](client-libraries-go.md)|[Here](https://github.com/apache/pulsar-client-go/blob/master/CHANGELOG)
 |[Here](https://github.com/apache/pulsar-client-go) 
 Node.js|[User 
doc](client-libraries-node.md)|[Here](https://github.com/apache/pulsar-client-node/releases)
 |[Here](https://github.com/apache/pulsar-client-node) 
diff --git 
a/site2/website-next/versioned_docs/version-2.5.0/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.5.0/client-libraries-python.md
index cd3077c6abd..dd200c49069 100644
--- a/site2/website-next/versioned_docs/version-2.5.0/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.5.0/client-libraries-python.md
@@ -5,7 +5,7 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+The Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 ## Installation
 
@@ -44,7 +44,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.5.0/client-libraries.md 
b/site2/website-next/versioned_docs/version-2.5.0/client-libraries.md
index 7bb8611208d..6fb205bd86b 100644
--- a/site2/website-next/versioned_docs/version-2.5.0/client-libraries.md
+++ b/site2/website-next/versioned_docs/version-2.5.0/client-libraries.md
@@ -33,13 +33,13 @@ For a tutorial on using the Pulsar Go client, see [Pulsar 
Go client](client-libr
 
 For a tutorial on using the Pulsar Python client, see [Pulsar Python 
client](client-libraries-python.md).
 
-There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs 
for the Python client [here](/api/python).
+There are also [pdoc](https://github.com/BurntSushi/pdoc)-generated API docs 
for the Python client [here](@pulsar:apidoc:python@).
 
 ## C++ client
 
 For a tutorial on using the Pulsar C++ clent, see [Pulsar C++ 
client](client-libraries-cpp.md).
 
-There are also [Doxygen](http://www.doxygen.nl/)-generated API docs for the 
C++ client [here](/api/cpp).
+There are also [Doxygen](http://www.doxygen.nl/)-generated API docs for the 
C++ client [here](@pulsar:apidoc:cpp@).
 
 ## Feature Matrix
 Pulsar client feature matrix for different languages is listed on [Client 
Features Matrix](https://github.com/apache/pulsar/wiki/Client-Features-Matrix) 
page.
diff --git 
a/site2/website-next/versioned_docs/version-2.5.1/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.5.1/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.5.1/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.5.1/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.5.1/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.5.1/client-libraries-python.md
index 273525cf5b7..47bf6a6ead6 100644
--- a/site2/website-next/versioned_docs/version-2.5.1/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.5.1/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.5.2/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.5.2/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.5.2/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.5.2/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.5.2/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.5.2/client-libraries-python.md
index 273525cf5b7..47bf6a6ead6 100644
--- a/site2/website-next/versioned_docs/version-2.5.2/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.5.2/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.0/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.6.0/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.6.0/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.6.0/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.0/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.6.0/client-libraries-python.md
index 273525cf5b7..47bf6a6ead6 100644
--- a/site2/website-next/versioned_docs/version-2.6.0/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.6.0/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.1/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.6.1/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.6.1/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.6.1/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.1/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.6.1/client-libraries-python.md
index 9c029dd6427..29ad2697c7c 100644
--- a/site2/website-next/versioned_docs/version-2.6.1/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.6.1/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.2/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.6.2/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.6.2/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.6.2/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.2/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.6.2/client-libraries-python.md
index 9c029dd6427..29ad2697c7c 100644
--- a/site2/website-next/versioned_docs/version-2.6.2/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.6.2/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.3/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.6.3/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.6.3/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.6.3/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.3/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.6.3/client-libraries-python.md
index 9c029dd6427..29ad2697c7c 100644
--- a/site2/website-next/versioned_docs/version-2.6.3/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.6.3/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.4/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.6.4/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.6.4/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.6.4/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.6.4/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.6.4/client-libraries-python.md
index 9c029dd6427..29ad2697c7c 100644
--- a/site2/website-next/versioned_docs/version-2.6.4/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.6.4/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.0/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.7.0/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.7.0/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.7.0/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.0/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.7.0/client-libraries-python.md
index 273525cf5b7..47bf6a6ead6 100644
--- a/site2/website-next/versioned_docs/version-2.7.0/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.7.0/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.1/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.7.1/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.7.1/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.7.1/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.1/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.7.1/client-libraries-python.md
index 996f4a03f34..e94ab0d219a 100644
--- a/site2/website-next/versioned_docs/version-2.7.1/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.7.1/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.2/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.7.2/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.7.2/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.7.2/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.2/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.7.2/client-libraries-python.md
index 2f9accad5b4..6a44038574c 100644
--- a/site2/website-next/versioned_docs/version-2.7.2/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.7.2/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.3/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.7.3/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.7.3/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.7.3/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.3/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.7.3/client-libraries-python.md
index 2f9accad5b4..6a44038574c 100644
--- a/site2/website-next/versioned_docs/version-2.7.3/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.7.3/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.4/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.7.4/client-libraries-cpp.md
index 71dbaa19c15..7037b122be6 100644
--- a/site2/website-next/versioned_docs/version-2.7.4/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.7.4/client-libraries-cpp.md
@@ -13,7 +13,7 @@ All the methods in producer, consumer, and reader of a C++ 
client are thread-saf
 
 Pulsar C++ client is supported on **Linux** and **MacOS** platforms.
 
-[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](/api/cpp).
+[Doxygen](http://www.doxygen.nl/)-generated API docs for the C++ client are 
available [here](@pulsar:apidoc:cpp@).
 
 ## Linux
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.4/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.7.4/client-libraries-python.md
index 2f9accad5b4..6a44038574c 100644
--- a/site2/website-next/versioned_docs/version-2.7.4/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.7.4/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.5/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.7.5/client-libraries-cpp.md
index 204b63f3442..bebb4b94113 100644
--- a/site2/website-next/versioned_docs/version-2.7.5/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.7.5/client-libraries-cpp.md
@@ -12,7 +12,7 @@ import TabItem from '@theme/TabItem';
 
 You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](/api/cpp) for the C++ client.
+All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ 
client.
 
 ## Installation
 
diff --git 
a/site2/website-next/versioned_docs/version-2.7.5/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.7.5/client-libraries-python.md
index 2f9accad5b4..6a44038574c 100644
--- a/site2/website-next/versioned_docs/version-2.7.5/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.7.5/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -48,7 +48,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.8.x/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.8.x/client-libraries-cpp.md
index 4f8903ae0b0..f6da1402521 100644
--- a/site2/website-next/versioned_docs/version-2.8.x/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.8.x/client-libraries-cpp.md
@@ -12,7 +12,7 @@ import TabItem from '@theme/TabItem';
 
 You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](/api/cpp) for the C++ client.
+All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ 
client.
 
 ## Installation
 
diff --git 
a/site2/website-next/versioned_docs/version-2.8.x/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.8.x/client-libraries-python.md
index e675e5cfac3..320a8730c80 100644
--- a/site2/website-next/versioned_docs/version-2.8.x/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.8.x/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [`python` GitHub 
Repository](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -65,7 +65,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples
 
diff --git 
a/site2/website-next/versioned_docs/version-2.9.x/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.9.x/client-libraries-cpp.md
index aabf7f0969b..d1ef13416ae 100644
--- a/site2/website-next/versioned_docs/version-2.9.x/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.9.x/client-libraries-cpp.md
@@ -12,7 +12,7 @@ import TabItem from '@theme/TabItem';
 
 You can use a Pulsar C++ client to create producers, consumers, and readers.
 
-All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](/api/cpp) for the C++ client.
+All the methods in producer, consumer, and reader of a C++ client are 
thread-safe. You can read the [API docs](@pulsar:apidoc:cpp@) for the C++ 
client.
 
 ## Installation
 
diff --git 
a/site2/website-next/versioned_docs/version-2.9.x/client-libraries-python.md 
b/site2/website-next/versioned_docs/version-2.9.x/client-libraries-python.md
index b6fadb8e2c6..779704290f0 100644
--- a/site2/website-next/versioned_docs/version-2.9.x/client-libraries-python.md
+++ b/site2/website-next/versioned_docs/version-2.9.x/client-libraries-python.md
@@ -5,11 +5,11 @@ sidebar_label: "Python"
 original_id: client-libraries-python
 ---
 
-Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](/api/cpp). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
+Pulsar Python client library is a wrapper over the existing [C++ client 
library](client-libraries-cpp.md) and exposes all of the [same 
features](@pulsar:apidoc:cpp@). You can find the code in the [Python 
directory](https://github.com/apache/pulsar-client-python) of the C++ client 
code.
 
 All the methods in producer, consumer, and reader of a Python client are 
thread-safe.
 
-[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](/api/python).
+[pdoc](https://github.com/BurntSushi/pdoc)-generated API docs for the Python 
client are available [here](@pulsar:apidoc:python@).
 
 ## Install
 
@@ -64,7 +64,7 @@ $ sudo python setup.py install
 
 ## API Reference
 
-The complete Python API reference is available at [api/python](/api/python).
+The complete Python API reference is available at 
[api/python](@pulsar:apidoc:python@).
 
 ## Examples

[pulsar-site] branch main updated: Specially handle Python and C++ API documents (#291)

Reply via email to