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 5956902651 Docs sync done from apache/pulsar(#88cd81d)
5956902651 is described below

commit 5956902651af063eabeedde15c07c607145448d7
Author: Pulsar Site Updater <[email protected]>
AuthorDate: Fri May 6 06:03:26 2022 +0000

    Docs sync done from apache/pulsar(#88cd81d)
---
 site2/docs/client-libraries-cpp.md                 |   2 +-
 site2/docs/reference-metrics.md                    | 108 +++++++++++++--------
 site2/docs/tiered-storage-aliyun.md                |   6 +-
 site2/docs/tiered-storage-aws.md                   |  10 +-
 site2/docs/tiered-storage-azure.md                 |   6 +-
 site2/docs/tiered-storage-gcs.md                   |   7 +-
 site2/docs/tiered-storage-overview.md              |   8 +-
 site2/website-next/docs/client-libraries-cpp.md    |   2 +-
 site2/website-next/docs/reference-metrics.md       |  90 ++++++++++-------
 site2/website-next/docs/tiered-storage-aliyun.md   |   2 -
 site2/website-next/docs/tiered-storage-aws.md      |   2 -
 site2/website-next/docs/tiered-storage-azure.md    |   2 -
 site2/website-next/docs/tiered-storage-gcs.md      |   2 -
 site2/website-next/docs/tiered-storage-overview.md |   6 +-
 .../version-2.1.0-incubating/about.md              |   7 +-
 .../version-2.1.1-incubating/about.md              |   7 +-
 .../versioned_docs/version-2.10.0/about.md         |   7 +-
 .../version-2.10.0/client-libraries-cpp.md         |   2 +-
 .../versioned_docs/version-2.2.0/about.md          |   7 +-
 .../versioned_docs/version-2.2.1/about.md          |   7 +-
 .../version-2.2.1/client-libraries-cpp.md          |   2 +-
 .../versioned_docs/version-2.3.0/about.md          |   7 +-
 .../versioned_docs/version-2.3.1/about.md          |   7 +-
 .../versioned_docs/version-2.3.2/about.md          |   7 +-
 .../version-2.3.2/client-libraries-cpp.md          |   2 +-
 .../versioned_docs/version-2.4.0/about.md          |   7 +-
 .../version-2.4.0/client-libraries-cpp.md          |   2 +-
 .../versioned_docs/version-2.4.1/about.md          |   7 +-
 .../version-2.4.1/client-libraries-cpp.md          |   2 +-
 .../versioned_docs/version-2.4.2/about.md          |   7 +-
 .../version-2.4.2/client-libraries-cpp.md          |   2 +-
 .../versioned_docs/version-2.5.0/about.md          |   7 +-
 .../versioned_docs/version-2.5.1/about.md          |   7 +-
 .../versioned_docs/version-2.5.2/about.md          |   7 +-
 .../versioned_docs/version-2.6.0/about.md          |   7 +-
 .../versioned_docs/version-2.6.1/about.md          |   7 +-
 .../versioned_docs/version-2.6.2/about.md          |   7 +-
 .../versioned_docs/version-2.6.3/about.md          |   7 +-
 .../versioned_docs/version-2.6.4/about.md          |   7 +-
 .../versioned_docs/version-2.7.0/about.md          |   7 +-
 .../versioned_docs/version-2.7.1/about.md          |   7 +-
 .../versioned_docs/version-2.7.2/about.md          |   7 +-
 .../versioned_docs/version-2.7.3/about.md          |   7 +-
 .../versioned_docs/version-2.7.4/about.md          |   7 +-
 .../versioned_docs/version-2.8.0/about.md          |   7 +-
 .../versioned_docs/version-2.8.1/about.md          |   7 +-
 .../versioned_docs/version-2.8.2/about.md          |   7 +-
 .../versioned_docs/version-2.8.3/about.md          |   7 +-
 .../versioned_docs/version-2.9.0/about.md          |   7 +-
 .../versioned_docs/version-2.9.1/about.md          |   7 +-
 .../versioned_docs/version-2.9.2/about.md          |   7 +-
 site2/website/release-notes.md                     |   2 +-
 .../version-2.10.0/client-libraries-cpp.md         |   2 +-
 53 files changed, 308 insertions(+), 178 deletions(-)

diff --git a/site2/docs/client-libraries-cpp.md 
b/site2/docs/client-libraries-cpp.md
index 28796ca800..815fdc7560 100644
--- a/site2/docs/client-libraries-cpp.md
+++ b/site2/docs/client-libraries-cpp.md
@@ -129,7 +129,7 @@ The `libpulsarwithdeps.a` does not include library openssl 
related libraries `li
 $ rpm -ivh apache-pulsar-client*.rpm
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 ```bash
 lrwxrwxrwx 1 root root 18 Dec 30 22:21 libpulsar.so -> libpulsar.so.2.9.1
 lrwxrwxrwx 1 root root 23 Dec 30 22:21 libpulsarnossl.so -> 
libpulsarnossl.so.2.9.1
diff --git a/site2/docs/reference-metrics.md b/site2/docs/reference-metrics.md
index 2589d5ca54..dfe1898133 100644
--- a/site2/docs/reference-metrics.md
+++ b/site2/docs/reference-metrics.md
@@ -42,7 +42,7 @@ in the `bookkeeper.conf` configuration file.
 
 | Name | Type | Description |
 |---|---|---|
-| bookie_SERVER_STATUS | Gauge | The server status for bookie server. 
<br><ul><li>1: the bookie is running in writable mode.</li><li>0: the bookie is 
running in readonly mode.</li></ul> |
+| bookie_SERVER_STATUS | Gauge | The server status for bookie server. <br 
/><ul><li>1: the bookie is running in writable mode.</li><li>0: the bookie is 
running in readonly mode.</li></ul> |
 | bookkeeper_server_ADD_ENTRY_count | Counter | The total number of ADD_ENTRY 
requests received at the bookie. The `success` label is used to distinguish 
successes and failures. |
 | bookkeeper_server_READ_ENTRY_count | Counter | The total number of 
READ_ENTRY requests received at the bookie. The `success` label is used to 
distinguish successes and failures. |
 | bookie_WRITE_BYTES | Counter | The total number of bytes written to the 
bookie. |
@@ -112,6 +112,7 @@ The following metrics are available for broker:
   - [Connection metrics](#connection-metrics)
   - [Jetty metrics](#jetty-metrics)
   - [Schema metrics](#schema-metrics)
+  - [Offload metrics](#offload-metrics)
 - [Pulsar Functions](#pulsar-functions)
 - [Proxy](#proxy)
 - [Pulsar SQL Worker](#pulsar-sql-worker)
@@ -142,19 +143,19 @@ All the namespace metrics are labelled with the following 
labels:
 | pulsar_subscriptions_count | Gauge | The number of Pulsar subscriptions of 
the namespace served by this broker. |
 | pulsar_producers_count | Gauge | The number of active producers of the 
namespace connected to this broker. |
 | pulsar_consumers_count | Gauge | The number of active consumers of the 
namespace connected to this broker. |
-| pulsar_rate_in | Gauge | The total message rate of the namespace coming into 
this broker (messages/second). |
-| pulsar_rate_out | Gauge | The total message rate of the namespace going out 
from this broker (messages/second). |
-| pulsar_throughput_in | Gauge | The total throughput of the namespace coming 
into this broker (bytes/second). |
-| pulsar_throughput_out | Gauge | The total throughput of the namespace going 
out from this broker (bytes/second). |
+| pulsar_rate_in | Gauge | The total message rate of the namespace coming into 
this broker (message per second). |
+| pulsar_rate_out | Gauge | The total message rate of the namespace going out 
from this broker (message per second). |
+| pulsar_throughput_in | Gauge | The total throughput of the namespace coming 
into this broker (byte per second). |
+| pulsar_throughput_out | Gauge | The total throughput of the namespace going 
out from this broker (byte per second). |
 | pulsar_storage_size | Gauge | The total storage size of the topics in this 
namespace owned by this broker (bytes). |
 | pulsar_storage_logical_size | Gauge | The storage size of topics in the 
namespace owned by the broker without replicas (in bytes). |
 | pulsar_storage_backlog_size | Gauge | The total backlog size of the topics 
of this namespace owned by this broker (messages). |
 | pulsar_storage_offloaded_size | Gauge | The total amount of the data in this 
namespace offloaded to the tiered storage (bytes). |
-| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this namespace (message batches / second). |
-| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this namespace (message batches / second). |
+| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this namespace (message batch per second). |
+| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this namespace (message batch per second). |
 | pulsar_subscription_delayed | Gauge | The total message batches (entries) 
are delayed for dispatching. |
-| pulsar_storage_write_latency_le_* | Histogram | The entry rate of a 
namespace that the storage write latency is smaller with a given threshold.<br> 
Available thresholds: <br><ul><li>pulsar_storage_write_latency_le_0_5: <= 0.5ms 
</li><li>pulsar_storage_write_latency_le_1: <= 
1ms</li><li>pulsar_storage_write_latency_le_5: <= 
5ms</li><li>pulsar_storage_write_latency_le_10: <= 
10ms</li><li>pulsar_storage_write_latency_le_20: <= 
20ms</li><li>pulsar_storage_write_latency_le_50: <= 50ms</li>< [...]
-| pulsar_entry_size_le_* | Histogram | The entry rate of a namespace that the 
entry size is smaller with a given threshold.<br> Available thresholds: 
<br><ul><li>pulsar_entry_size_le_128: <= 128 bytes 
</li><li>pulsar_entry_size_le_512: <= 512 
bytes</li><li>pulsar_entry_size_le_1_kb: <= 1 
KB</li><li>pulsar_entry_size_le_2_kb: <= 2 
KB</li><li>pulsar_entry_size_le_4_kb: <= 4 
KB</li><li>pulsar_entry_size_le_16_kb: <= 16 
KB</li><li>pulsar_entry_size_le_100_kb: <= 100 KB</li><li>pulsar_entry_s [...]
+| pulsar_storage_write_latency_le_* | Histogram | The entry rate of a 
namespace that the storage write latency is smaller with a given threshold.<br 
/> Available thresholds: <br /><ul><li>pulsar_storage_write_latency_le_0_5: <= 
0.5ms </li><li>pulsar_storage_write_latency_le_1: <= 
1ms</li><li>pulsar_storage_write_latency_le_5: <= 
5ms</li><li>pulsar_storage_write_latency_le_10: <= 
10ms</li><li>pulsar_storage_write_latency_le_20: <= 
20ms</li><li>pulsar_storage_write_latency_le_50: <= 50ms</ [...]
+| pulsar_entry_size_le_* | Histogram | The entry rate of a namespace that the 
entry size is smaller with a given threshold.<br /> Available thresholds: <br 
/><ul><li>pulsar_entry_size_le_128: <= 128 bytes 
</li><li>pulsar_entry_size_le_512: <= 512 
bytes</li><li>pulsar_entry_size_le_1_kb: <= 1 
KB</li><li>pulsar_entry_size_le_2_kb: <= 2 
KB</li><li>pulsar_entry_size_le_4_kb: <= 4 
KB</li><li>pulsar_entry_size_le_16_kb: <= 16 
KB</li><li>pulsar_entry_size_le_100_kb: <= 100 KB</li><li>pulsar_ent [...]
 
 #### Replication metrics
 
@@ -164,12 +165,12 @@ All the replication metrics are also labelled with 
`remoteCluster=${pulsar_remot
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_replication_rate_in | Gauge | The total message rate of the namespace 
replicating from remote cluster (messages/second). |
-| pulsar_replication_rate_out | Gauge | The total message rate of the 
namespace replicating to remote cluster (messages/second). |
-| pulsar_replication_throughput_in | Gauge | The total throughput of the 
namespace replicating from remote cluster (bytes/second). |
-| pulsar_replication_throughput_out | Gauge | The total throughput of the 
namespace replicating to remote cluster (bytes/second). |
+| pulsar_replication_rate_in | Gauge | The total message rate of the namespace 
replicating from remote cluster (message per second). |
+| pulsar_replication_rate_out | Gauge | The total message rate of the 
namespace replicating to remote cluster (message per second). |
+| pulsar_replication_throughput_in | Gauge | The total throughput of the 
namespace replicating from remote cluster (byte per second). |
+| pulsar_replication_throughput_out | Gauge | The total throughput of the 
namespace replicating to remote cluster (byte per second). |
 | pulsar_replication_backlog | Gauge | The total backlog of the namespace 
replicating to remote cluster (messages). |
-| pulsar_replication_rate_expired | Gauge | Total rate of messages expired 
(messages/second). |
+| pulsar_replication_rate_expired | Gauge | Total rate of messages expired 
(message per second). |
 | pulsar_replication_connected_count | Gauge | The count of 
replication-subscriber up and running to replicate to remote cluster. |
 | pulsar_replication_delay_in_seconds | Gauge | Time in seconds from the time 
a message was produced to the time when it is about to be replicated. |
 
@@ -189,21 +190,21 @@ All the topic metrics are labelled with the following 
labels:
 | pulsar_subscriptions_count | Gauge | The number of Pulsar subscriptions of 
the topic served by this broker. |
 | pulsar_producers_count | Gauge | The number of active producers of the topic 
connected to this broker. |
 | pulsar_consumers_count | Gauge | The number of active consumers of the topic 
connected to this broker. |
-| pulsar_rate_in | Gauge | The total message rate of the topic coming into 
this broker (messages/second). |
-| pulsar_rate_out | Gauge | The total message rate of the topic going out from 
this broker (messages/second). |
+| pulsar_rate_in | Gauge | The total message rate of the topic coming into 
this broker (message per second). |
+| pulsar_rate_out | Gauge | The total message rate of the topic going out from 
this broker (message per second). |
 | pulsar_publish_rate_limit_times | Gauge | The number of times the publish 
rate limit is triggered. |
-| pulsar_throughput_in | Gauge | The total throughput of the topic coming into 
this broker (bytes/second). |
-| pulsar_throughput_out | Gauge | The total throughput of the topic going out 
from this broker (bytes/second). |
+| pulsar_throughput_in | Gauge | The total throughput of the topic coming into 
this broker (byte per second). |
+| pulsar_throughput_out | Gauge | The total throughput of the topic going out 
from this broker (byte per second). |
 | pulsar_storage_size | Gauge | The total storage size of the topics in this 
topic owned by this broker (bytes). |
 | pulsar_storage_logical_size | Gauge | The storage size of topics in the 
namespace owned by the broker without replicas (in bytes). |
 | pulsar_storage_backlog_size | Gauge | The total backlog size of the topics 
of this topic owned by this broker (messages). |
 | pulsar_storage_offloaded_size | Gauge | The total amount of the data in this 
topic offloaded to the tiered storage (bytes). |
 | pulsar_storage_backlog_quota_limit | Gauge | The total amount of the data in 
this topic that limit the backlog quota (bytes). |
-| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this topic (message batches / second). |
-| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this topic (message batches / second). |
+| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this topic (message batch per second). |
+| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this topic (message batch per second). |
 | pulsar_subscription_delayed | Gauge | The total message batches (entries) 
are delayed for dispatching. |
-| pulsar_storage_write_latency_le_* | Histogram | The entry rate of a topic 
that the storage write latency is smaller with a given threshold.<br> Available 
thresholds: <br><ul><li>pulsar_storage_write_latency_le_0_5: <= 0.5ms 
</li><li>pulsar_storage_write_latency_le_1: <= 
1ms</li><li>pulsar_storage_write_latency_le_5: <= 
5ms</li><li>pulsar_storage_write_latency_le_10: <= 
10ms</li><li>pulsar_storage_write_latency_le_20: <= 
20ms</li><li>pulsar_storage_write_latency_le_50: <= 50ms</li><li>p [...]
-| pulsar_entry_size_le_* | Histogram | The entry rate of a topic that the 
entry size is smaller with a given threshold.<br> Available thresholds: 
<br><ul><li>pulsar_entry_size_le_128: <= 128 bytes 
</li><li>pulsar_entry_size_le_512: <= 512 
bytes</li><li>pulsar_entry_size_le_1_kb: <= 1 
KB</li><li>pulsar_entry_size_le_2_kb: <= 2 
KB</li><li>pulsar_entry_size_le_4_kb: <= 4 
KB</li><li>pulsar_entry_size_le_16_kb: <= 16 
KB</li><li>pulsar_entry_size_le_100_kb: <= 100 KB</li><li>pulsar_entry_size_ 
[...]
+| pulsar_storage_write_latency_le_* | Histogram | The entry rate of a topic 
that the storage write latency is smaller with a given threshold.<br /> 
Available thresholds: <br /><ul><li>pulsar_storage_write_latency_le_0_5: <= 
0.5ms </li><li>pulsar_storage_write_latency_le_1: <= 
1ms</li><li>pulsar_storage_write_latency_le_5: <= 
5ms</li><li>pulsar_storage_write_latency_le_10: <= 
10ms</li><li>pulsar_storage_write_latency_le_20: <= 
20ms</li><li>pulsar_storage_write_latency_le_50: <= 50ms</li>< [...]
+| pulsar_entry_size_le_* | Histogram | The entry rate of a topic that the 
entry size is smaller with a given threshold.<br /> Available thresholds: <br 
/><ul><li>pulsar_entry_size_le_128: <= 128 bytes 
</li><li>pulsar_entry_size_le_512: <= 512 
bytes</li><li>pulsar_entry_size_le_1_kb: <= 1 
KB</li><li>pulsar_entry_size_le_2_kb: <= 2 
KB</li><li>pulsar_entry_size_le_4_kb: <= 4 
KB</li><li>pulsar_entry_size_le_16_kb: <= 16 
KB</li><li>pulsar_entry_size_le_100_kb: <= 100 KB</li><li>pulsar_entry_s [...]
 | pulsar_in_bytes_total | Counter | The total number of messages in bytes 
received for this topic. |
 | pulsar_in_messages_total | Counter | The total number of messages received 
for this topic. |
 | pulsar_out_bytes_total | Counter | The total number of messages in bytes 
read from this topic. |
@@ -214,7 +215,7 @@ All the topic metrics are labelled with the following 
labels:
 | pulsar_compaction_duration_time_in_mills | Gauge | The duration time of the 
compaction. |
 | pulsar_compaction_read_throughput | Gauge | The read throughput of the 
compaction. |
 | pulsar_compaction_write_throughput | Gauge | The write throughput of the 
compaction. |
-| pulsar_compaction_latency_le_* | Histogram | The compaction latency with 
given quantile. <br> Available thresholds: 
<br><ul><li>pulsar_compaction_latency_le_0_5: <= 0.5ms 
</li><li>pulsar_compaction_latency_le_1: <= 
1ms</li><li>pulsar_compaction_latency_le_5: <= 
5ms</li><li>pulsar_compaction_latency_le_10: <= 
10ms</li><li>pulsar_compaction_latency_le_20: <= 
20ms</li><li>pulsar_compaction_latency_le_50: <= 
50ms</li><li>pulsar_compaction_latency_le_100: <= 
100ms</li><li>pulsar_compaction_ [...]
+| pulsar_compaction_latency_le_* | Histogram | The compaction latency with 
given quantile. <br /> Available thresholds: <br 
/><ul><li>pulsar_compaction_latency_le_0_5: <= 0.5ms 
</li><li>pulsar_compaction_latency_le_1: <= 
1ms</li><li>pulsar_compaction_latency_le_5: <= 
5ms</li><li>pulsar_compaction_latency_le_10: <= 
10ms</li><li>pulsar_compaction_latency_le_20: <= 
20ms</li><li>pulsar_compaction_latency_le_50: <= 
50ms</li><li>pulsar_compaction_latency_le_100: <= 100ms</li><li>pulsar_compact 
[...]
 | pulsar_compaction_compacted_entries_count | Gauge | The total number of the 
compacted entries. |
 | pulsar_compaction_compacted_entries_size |Gauge  | The total size of the 
compacted entries. |
 
@@ -226,10 +227,10 @@ All the replication metrics are labelled with 
`remoteCluster=${pulsar_remote_clu
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_replication_rate_in | Gauge | The total message rate of the topic 
replicating from remote cluster (messages/second). |
-| pulsar_replication_rate_out | Gauge | The total message rate of the topic 
replicating to remote cluster (messages/second). |
-| pulsar_replication_throughput_in | Gauge | The total throughput of the topic 
replicating from remote cluster (bytes/second). |
-| pulsar_replication_throughput_out | Gauge | The total throughput of the 
topic replicating to remote cluster (bytes/second). |
+| pulsar_replication_rate_in | Gauge | The total message rate of the topic 
replicating from remote cluster (message per second). |
+| pulsar_replication_rate_out | Gauge | The total message rate of the topic 
replicating to remote cluster (message per second). |
+| pulsar_replication_throughput_in | Gauge | The total throughput of the topic 
replicating from remote cluster (byte per second). |
+| pulsar_replication_throughput_out | Gauge | The total throughput of the 
topic replicating to remote cluster (byte per second). |
 | pulsar_replication_backlog | Gauge | The total backlog of the topic 
replicating to remote cluster (messages). |
 
 #### Topic lookup metrics
@@ -272,8 +273,8 @@ All the managedLedger metrics are labelled with the 
following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_ml_AddEntryBytesRate | Gauge | The bytes/s rate of messages added |
-| pulsar_ml_AddEntryWithReplicasBytesRate | Gauge | The bytes/s rate of 
messages added with replicas |
+| pulsar_ml_AddEntryBytesRate | Gauge | The B/s rate of messages added |
+| pulsar_ml_AddEntryWithReplicasBytesRate | Gauge | The B/s rate of messages 
added with replicas |
 | pulsar_ml_AddEntryErrors | Gauge | The number of addEntry requests that 
failed |
 | pulsar_ml_AddEntryLatencyBuckets | Histogram | The latency of adding a 
ledger entry with a given quantile (threshold), including time spent on waiting 
in queue on the broker side.<br> Available quantile: <br><ul><li> 
quantile="0.0_0.5" is AddEntryLatency between (0.0ms, 0.5ms]</li> 
<li>quantile="0.5_1.0" is AddEntryLatency between (0.5ms, 
1.0ms]</li><li>quantile="1.0_5.0" is AddEntryLatency between (1ms, 
5ms]</li><li>quantile="5.0_10.0" is AddEntryLatency between (5ms, 
10ms]</li><li>qu [...]
 | pulsar_ml_AddEntryLatencyBuckets_OVERFLOW | Gauge | The number of times the 
AddEntryLatency is longer than 1 second |
@@ -287,7 +288,7 @@ All the managedLedger metrics are labelled with the 
following labels:
 | pulsar_ml_LedgerAddEntryLatencyBuckets_OVERFLOW | Gauge | The number of 
times the LedgerAddEntryLatency is longer than 1 second |
 | pulsar_ml_MarkDeleteRate | Gauge | The rate of mark-delete ops/s |
 | pulsar_ml_NumberOfMessagesInBacklog | Gauge | The number of backlog messages 
for all the consumers |
-| pulsar_ml_ReadEntriesBytesRate | Gauge | The bytes/s rate of messages read |
+| pulsar_ml_ReadEntriesBytesRate | Gauge | The B/s rate of messages read |
 | pulsar_ml_ReadEntriesErrors | Gauge | The number of readEntries requests 
that failed |
 | pulsar_ml_ReadEntriesRate | Gauge | The msg/s rate of messages read |
 | pulsar_ml_ReadEntriesSucceeded | Gauge | The number of readEntries requests 
that succeeded |
@@ -358,13 +359,13 @@ All the bundle metrics are labelled with the following 
labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_bundle_msg_rate_in | Gauge | The total message rate coming into the 
topics in this bundle  (messages/second). |
-| pulsar_bundle_msg_rate_out | Gauge | The total message rate going out from 
the topics in this bundle  (messages/second).  |
+| pulsar_bundle_msg_rate_in | Gauge | The total message rate coming into the 
topics in this bundle  (message per second). |
+| pulsar_bundle_msg_rate_out | Gauge | The total message rate going out from 
the topics in this bundle  (message per second).  |
 | pulsar_bundle_topics_count | Gauge | The topic count in this bundle.  |
 | pulsar_bundle_consumer_count | Gauge | The consumer count of the topics in 
this bundle. |
 | pulsar_bundle_producer_count | Gauge | The producer count of the topics in 
this bundle. |
-| pulsar_bundle_msg_throughput_in | Gauge | The total throughput coming into 
the topics in this bundle (bytes/second). |
-| pulsar_bundle_msg_throughput_out | Gauge | The total throughput going out 
from the topics in this bundle (bytes/second). |
+| pulsar_bundle_msg_throughput_in | Gauge | The total throughput coming into 
the topics in this bundle (byte per second). |
+| pulsar_bundle_msg_throughput_out | Gauge | The total throughput going out 
from the topics in this bundle (byte per second). |
 
 ### Subscription metrics
 
@@ -382,11 +383,11 @@ All the subscription metrics are labelled with the 
following labels:
 | pulsar_subscription_back_log | Gauge | The total backlog of a subscription 
(entries). |
 | pulsar_subscription_back_log_no_delayed | Gauge | The backlog of a 
subscription that do not contain the delay messages (entries). |
 | pulsar_subscription_delayed | Gauge | The total number of messages are 
delayed to be dispatched for a subscription (messages). |
-| pulsar_subscription_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (messages/second). |
+| pulsar_subscription_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (message per second). |
 | pulsar_subscription_unacked_messages | Gauge | The total number of 
unacknowledged messages of a subscription (messages). |
-| pulsar_subscription_blocked_on_unacked_messages | Gauge | Indicate whether a 
subscription is blocked on unacknowledged messages or not. <br> <ul><li>1 means 
the subscription is blocked on waiting unacknowledged messages to be 
acked.</li><li>0 means the subscription is not blocked on waiting 
unacknowledged messages to be acked.</li></ul> |
-| pulsar_subscription_msg_rate_out | Gauge | The total message dispatch rate 
for a subscription (messages/second). |
-| pulsar_subscription_msg_throughput_out | Gauge | The total message dispatch 
throughput for a subscription (bytes/second). |
+| pulsar_subscription_blocked_on_unacked_messages | Gauge | Indicate whether a 
subscription is blocked on unacknowledged messages or not. <br /> <ul><li>1 
means the subscription is blocked on waiting unacknowledged messages to be 
acked.</li><li>0 means the subscription is not blocked on waiting 
unacknowledged messages to be acked.</li></ul> |
+| pulsar_subscription_msg_rate_out | Gauge | The total message dispatch rate 
for a subscription (message per second). |
+| pulsar_subscription_msg_throughput_out | Gauge | The total message dispatch 
throughput for a subscription (byte per second). |
 
 ### Consumer metrics
 
@@ -403,11 +404,11 @@ All the consumer metrics are labelled with the following 
labels:
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_consumer_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (messages/second). |
+| pulsar_consumer_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (message per second). |
 | pulsar_consumer_unacked_messages | Gauge | The total number of 
unacknowledged messages of a consumer (messages). |
-| pulsar_consumer_blocked_on_unacked_messages | Gauge | Indicate whether a 
consumer is blocked on unacknowledged messages or not. <br> <ul><li>1 means the 
consumer is blocked on waiting unacknowledged messages to be acked.</li><li>0 
means the consumer is not blocked on waiting unacknowledged messages to be 
acked.</li></ul> |
-| pulsar_consumer_msg_rate_out | Gauge | The total message dispatch rate for a 
consumer (messages/second). |
-| pulsar_consumer_msg_throughput_out | Gauge | The total message dispatch 
throughput for a consumer (bytes/second). |
+| pulsar_consumer_blocked_on_unacked_messages | Gauge | Indicate whether a 
consumer is blocked on unacknowledged messages or not. <br /> <ul><li>1 means 
the consumer is blocked on waiting unacknowledged messages to be 
acked.</li><li>0 means the consumer is not blocked on waiting unacknowledged 
messages to be acked.</li></ul> |
+| pulsar_consumer_msg_rate_out | Gauge | The total message dispatch rate for a 
consumer (message per second). |
+| pulsar_consumer_msg_throughput_out | Gauge | The total message dispatch 
throughput for a consumer (byte per second). |
 | pulsar_consumer_available_permits | Gauge | The available permits for for a 
consumer. |
 
 ### Managed ledger bookie client metrics
@@ -515,6 +516,27 @@ All the schema metrics are labelled with the following 
labels:
 | pulsar_schema_get_ops_latency | Summary | Latency of successful operations 
to get schemas. |
 | pulsar_schema_put_ops_latency | Summary | Latency of successful operations 
to send schemas. |
 
+### Offload metrics
+
+All the offload metrics are labelled with the following labels:
+
+- *cluster*: `cluster=${pulsar_cluster}`. `${pulsar_cluster}` is the cluster 
name that you configured in `broker.conf`.
+- *namespace*: `namespace=${pulsar_namespace}`. `${pulsar_namespace}` is the 
namespace name.
+- *topic*: `topic=${pulsar_topic}`. `${pulsar_topic}` is the topic name.
+
+| Name                                           | Type    | Description       
                                                              |
+|------------------------------------------------|---------|---------------------------------------------------------------------------------|
+| brk_ledgeroffloader_offload_error              | Counter | The number of 
failed operations to offload.                                     |
+| brk_ledgeroffloader_offload_rate               | Gauge   | The rate of 
offloading(byte per second).                                        |
+| brk_ledgeroffloader_read_offload_error         | Counter | The number of 
failed operations to read offload ledgers.                        |
+| brk_ledgeroffloader_read_offload_rate          | Gauge   | The rate of 
reading entries from offload ledgers(byte per second).              |
+| brk_ledgeroffloader_write_storage_error        | Counter | The number of 
failed operations to write to storage.                            |
+| brk_ledgeroffloader_read_offload_index_latency | Summary | The latency of 
reading index from offload ledgers.                              |
+| brk_ledgeroffloader_read_offload_data_latency  | Summary | The latency of 
reading data from offload ledgers.                               |
+| brk_ledgeroffloader_read_ledger_latency        | Summary | The latency of 
reading entries from BookKeeper.                                 |
+| brk_ledgeroffloader_delete_offload_ops         | Counter | The total number 
of successful and failed operations to delete offload ledgers. |
+
+
 ## Pulsar Functions
 
 All the Pulsar Functions metrics are labelled with the following labels:
@@ -637,4 +659,4 @@ All the transaction metrics are labelled with the following 
labels:
 | pulsar_txn_aborted_count | Counter | Number of aborted transactions of this 
coordinator. |
 | pulsar_txn_timeout_count | Counter | Number of timeout transactions. |
 | pulsar_txn_append_log_count | Counter | Number of append transaction logs. |
-| pulsar_txn_execution_latency_le_* | Histogram | Transaction execution 
latency. <br> Available latencies are as below: <br><ul><li> latency="10" is 
TransactionExecutionLatency between (0ms, 10ms]</li> <li>latency="20" is 
TransactionExecutionLatency between (10ms, 20ms]</li><li>latency="50" is 
TransactionExecutionLatency between (20ms, 50ms]</li><li>latency="100" is 
TransactionExecutionLatency between (50ms, 100ms]</li><li>latency="500" is 
TransactionExecutionLatency between (100ms, 500m [...]
+| pulsar_txn_execution_latency_le_* | Histogram | Transaction execution 
latency. <br /> Available latencies are as below: <br /><ul><li> latency="10" 
is TransactionExecutionLatency between (0ms, 10ms]</li> <li>latency="20" is 
TransactionExecutionLatency between (10ms, 20ms]</li><li>latency="50" is 
TransactionExecutionLatency between (20ms, 50ms]</li><li>latency="100" is 
TransactionExecutionLatency between (50ms, 100ms]</li><li>latency="500" is 
TransactionExecutionLatency between (100ms,  [...]
diff --git a/site2/docs/tiered-storage-aliyun.md 
b/site2/docs/tiered-storage-aliyun.md
index c131842e9b..183bd746fe 100644
--- a/site2/docs/tiered-storage-aliyun.md
+++ b/site2/docs/tiered-storage-aliyun.md
@@ -24,8 +24,6 @@ This example uses Pulsar 2.8.0.
 
     **Output**
     
-    As shown from the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support [AWS 
S3](https://aws.amazon.com/s3/), [GCS](https://cloud.google.com/storage/), 
[Azure](https://portal.azure.com/#home), and [Aliyun 
OSS](https://www.aliyun.com/product/oss) for long-term storage.
-    
     ```
     tiered-storage-file-system-2.8.0.nar
     tiered-storage-jcloud-2.8.0.nar
@@ -64,8 +62,8 @@ You can configure the Aliyun OSS offloader driver in the 
configuration file `bro
     | --- | --- | --- |
     | `managedLedgerOffloadReadBufferSizeInBytes` | Size of block read | 1 MB |
     | `managedLedgerOffloadMaxBlockSizeInBytes` | Size of block write | 64 MB |
-    | `managedLedgerMinLedgerRolloverTimeMinutes` | Minimum time between 
ledger rollover for a topic<br><br>**Note**: it is not recommended that you set 
this configuration in the production environment. | 2 |
-    | `managedLedgerMaxEntriesPerLedger` | Maximum number of entries to append 
to a ledger before triggering a rollover.<br><br>**Note**: it is not 
recommended that you set this configuration in the production environment. | 
5000 |
+    | `managedLedgerMinLedgerRolloverTimeMinutes` | Minimum time between 
ledger rollover for a topic<br /><br />**Note**: it is not recommended that you 
set this configuration in the production environment. | 2 |
+    | `managedLedgerMaxEntriesPerLedger` | Maximum number of entries to append 
to a ledger before triggering a rollover.<br /><br />**Note**: it is not 
recommended that you set this configuration in the production environment. | 
5000 |
 
 #### Bucket (required)
 
diff --git a/site2/docs/tiered-storage-aws.md b/site2/docs/tiered-storage-aws.md
index 640c104464..75b430732a 100644
--- a/site2/docs/tiered-storage-aws.md
+++ b/site2/docs/tiered-storage-aws.md
@@ -47,8 +47,6 @@ This example uses Pulsar 2.5.1.
 
     **Output**
 
-    As shown from the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support [AWS 
S3](https://aws.amazon.com/s3/) and [GCS](https://cloud.google.com/storage/) 
for long term storage. 
-
     ```
     tiered-storage-file-system-2.5.1.nar
     tiered-storage-jcloud-2.5.1.nar
@@ -76,7 +74,7 @@ You can configure the AWS S3 offloader driver in the 
configuration file `broker.
   
     Required configuration | Description | Example value
     |---|---|---
-    `managedLedgerOffloadDriver` | Offloader driver name, which is 
case-insensitive. <br><br>**Note**: there is a third driver type, S3, which is 
identical to AWS S3, though S3 requires that you specify an endpoint URL using 
`s3ManagedLedgerOffloadServiceEndpoint`. This is useful if using an S3 
compatible data store other than AWS S3. | aws-s3
+    `managedLedgerOffloadDriver` | Offloader driver name, which is 
case-insensitive. <br /><br />**Note**: there is a third driver type, S3, which 
is identical to AWS S3, though S3 requires that you specify an endpoint URL 
using `s3ManagedLedgerOffloadServiceEndpoint`. This is useful if using an S3 
compatible data store other than AWS S3. | aws-s3
     `offloadersDirectory` | Offloader directory | offloaders
     `s3ManagedLedgerOffloadBucket` | Bucket | pulsar-topic-offload
 
@@ -84,11 +82,11 @@ You can configure the AWS S3 offloader driver in the 
configuration file `broker.
 
     Optional | Description | Example value
     |---|---|---
-    `s3ManagedLedgerOffloadRegion` | Bucket region <br><br>**Note**: before 
specifying a value for this parameter, you need to set the following 
configurations. Otherwise, you might get an error.<br><br>- Set 
[`s3ManagedLedgerOffloadServiceEndpoint`](https://docs.aws.amazon.com/general/latest/gr/s3.html).<br><br>Example<br>`s3ManagedLedgerOffloadServiceEndpoint=https://s3.YOUR_REGION.amazonaws.com`<br><br>-
 Grant `GetBucketLocation` permission to a user.<br><br>For how to grant 
`GetBucke [...]
+    `s3ManagedLedgerOffloadRegion` | Bucket region <br /><br />**Note**: 
before specifying a value for this parameter, you need to set the following 
configurations. Otherwise, you might get an error.<br /><br />- Set 
[`s3ManagedLedgerOffloadServiceEndpoint`](https://docs.aws.amazon.com/general/latest/gr/s3.html).<br
 /><br />Example<br 
/>`s3ManagedLedgerOffloadServiceEndpoint=https://s3.YOUR_REGION.amazonaws.com`<br
 /><br />- Grant `GetBucketLocation` permission to a user.<br /><br />For  [...]
     `s3ManagedLedgerOffloadReadBufferSizeInBytes`|Size of block read|1 MB
     `s3ManagedLedgerOffloadMaxBlockSizeInBytes`|Size of block write|64 MB
-    `managedLedgerMinLedgerRolloverTimeMinutes`|Minimum time between ledger 
rollover for a topic<br><br>**Note**: it is not recommended that you set this 
configuration in the production environment.|2
-    `managedLedgerMaxEntriesPerLedger`|Maximum number of entries to append to 
a ledger before triggering a rollover.<br><br>**Note**: it is not recommended 
that you set this configuration in the production environment.|5000
+    `managedLedgerMinLedgerRolloverTimeMinutes`|Minimum time between ledger 
rollover for a topic<br /><br />**Note**: it is not recommended that you set 
this configuration in the production environment.|2
+    `managedLedgerMaxEntriesPerLedger`|Maximum number of entries to append to 
a ledger before triggering a rollover.<br /><br />**Note**: it is not 
recommended that you set this configuration in the production environment.|5000
 
 #### Bucket (required)
 
diff --git a/site2/docs/tiered-storage-azure.md 
b/site2/docs/tiered-storage-azure.md
index 64feb69496..019cafab7a 100644
--- a/site2/docs/tiered-storage-azure.md
+++ b/site2/docs/tiered-storage-azure.md
@@ -47,8 +47,6 @@ This example uses Pulsar 2.6.2.
 
     **Output**
 
-    As shown from the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support [AWS 
S3](https://aws.amazon.com/s3/),  [GCS](https://cloud.google.com/storage/) and 
[Azure](https://portal.azure.com/#home) for long term storage. 
-
     ```
     tiered-storage-file-system-2.6.2.nar
     tiered-storage-jcloud-2.6.2.nar
@@ -86,8 +84,8 @@ You can configure the Azure BlobStore offloader driver in the 
configuration file
     |---|---|---
     `managedLedgerOffloadReadBufferSizeInBytes`|Size of block read|1 MB
     `managedLedgerOffloadMaxBlockSizeInBytes`|Size of block write|64 MB
-    `managedLedgerMinLedgerRolloverTimeMinutes`|Minimum time between ledger 
rollover for a topic<br><br>**Note**: it is not recommended that you set this 
configuration in the production environment.|2
-    `managedLedgerMaxEntriesPerLedger`|Maximum number of entries to append to 
a ledger before triggering a rollover.<br><br>**Note**: it is not recommended 
that you set this configuration in the production environment.|5000
+    `managedLedgerMinLedgerRolloverTimeMinutes`|Minimum time between ledger 
rollover for a topic<br /><br />**Note**: it is not recommended that you set 
this configuration in the production environment.|2
+    `managedLedgerMaxEntriesPerLedger`|Maximum number of entries to append to 
a ledger before triggering a rollover.<br /><br />**Note**: it is not 
recommended that you set this configuration in the production environment.|5000
 
 #### Bucket (required)
 
diff --git a/site2/docs/tiered-storage-gcs.md b/site2/docs/tiered-storage-gcs.md
index 02f96184c1..90d891f344 100644
--- a/site2/docs/tiered-storage-gcs.md
+++ b/site2/docs/tiered-storage-gcs.md
@@ -54,9 +54,6 @@ This example uses Pulsar 2.5.1.
 
     **Output**
 
-    As shown in the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support GCS and AWS S3 for long term 
storage. 
-
-
     ```
     tiered-storage-file-system-2.5.1.nar
     tiered-storage-jcloud-2.5.1.nar
@@ -166,8 +163,8 @@ You can configure the size of a request sent to or read 
from GCS in the configur
 
 Configuration|Description
 |---|---
-`gcsManagedLedgerOffloadReadBufferSizeInBytes`|Block size for each individual 
read when reading back data from GCS.<br><br>The **default** value is 1 MB.
-`gcsManagedLedgerOffloadMaxBlockSizeInBytes`|Maximum size of a "part" sent 
during a multipart upload to GCS. <br><br>It **can not** be smaller than 5 MB. 
<br><br>The **default** value is 64 MB.
+`gcsManagedLedgerOffloadReadBufferSizeInBytes`|Block size for each individual 
read when reading back data from GCS.<br /><br />The **default** value is 1 MB.
+`gcsManagedLedgerOffloadMaxBlockSizeInBytes`|Maximum size of a "part" sent 
during a multipart upload to GCS. <br /><br />It **can not** be smaller than 5 
MB. <br /><br />The **default** value is 64 MB.
 
 ### Configure GCS offloader to run automatically
 
diff --git a/site2/docs/tiered-storage-overview.md 
b/site2/docs/tiered-storage-overview.md
index 320513764a..aa1595d704 100644
--- a/site2/docs/tiered-storage-overview.md
+++ b/site2/docs/tiered-storage-overview.md
@@ -7,7 +7,7 @@ sidebar_label: Overview
 Pulsar's **Tiered Storage** feature allows older backlog data to be moved from 
BookKeeper to long term and cheaper storage, while still allowing clients to 
access the backlog as if nothing has changed. 
 
 * Tiered storage uses [Apache jclouds](https://jclouds.apache.org) to support
-[Amazon S3](https://aws.amazon.com/s3/) and [GCS (Google Cloud 
Storage)](https://cloud.google.com/storage/) for long term storage. 
+[Amazon S3](https://aws.amazon.com/s3/), [GCS (Google Cloud 
Storage)](https://cloud.google.com/storage/), 
[Azure](https://azure.microsoft.com/en-us/services/storage/blobs/) and [Aliyun 
OSS](https://www.aliyun.com/product/oss) for long term storage. 
 
     With jclouds, it is easy to add support for more
 [cloud storage 
providers](https://jclouds.apache.org/reference/providers/#blobstore-providers) 
in the future.
@@ -17,6 +17,10 @@ Pulsar's **Tiered Storage** feature allows older backlog 
data to be moved from B
     > For more information about how to use the AWS S3 offloader with Pulsar, 
see [here](tiered-storage-aws.md).
     > 
     > For more information about how to use the GCS offloader with Pulsar, see 
[here](tiered-storage-gcs.md).
+    >
+    > For more information about how to use the Azure offloader with Pulsar, 
see [here](tiered-storage-azure.md).
+    > 
+    > For more information about how to use the Aliyun OSS offloader with 
Pulsar, see [here](tiered-storage-aliyun.md).
 
 * Tiered storage uses [Apache Hadoop](http://hadoop.apache.org/) to support 
filesystems for long term storage. 
 
@@ -47,3 +51,5 @@ Before offloading ledgers to long term storage, you need to 
configure buckets, c
 After offloading ledgers to long term storage, you can still query data in the 
offloaded ledgers with Pulsar SQL.
 
 For more information about tiered storage for Pulsar topics, see 
[here](https://github.com/apache/pulsar/wiki/PIP-17:-Tiered-storage-for-Pulsar-topics).
+
+For more information about offload metrics, see 
[here](reference-metrics.md#offload-metrics).
\ No newline at end of file
diff --git a/site2/website-next/docs/client-libraries-cpp.md 
b/site2/website-next/docs/client-libraries-cpp.md
index 48f826701c..99755ab88a 100644
--- a/site2/website-next/docs/client-libraries-cpp.md
+++ b/site2/website-next/docs/client-libraries-cpp.md
@@ -151,7 +151,7 @@ $ rpm -ivh apache-pulsar-client*.rpm
 
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 
 ```bash
 
diff --git a/site2/website-next/docs/reference-metrics.md 
b/site2/website-next/docs/reference-metrics.md
index ff15ad5789..5a21a97f5a 100644
--- a/site2/website-next/docs/reference-metrics.md
+++ b/site2/website-next/docs/reference-metrics.md
@@ -108,6 +108,7 @@ The following metrics are available for broker:
   - [Connection metrics](#connection-metrics)
   - [Jetty metrics](#jetty-metrics)
   - [Schema metrics](#schema-metrics)
+  - [Offload metrics](#offload-metrics)
 - [Pulsar Functions](#pulsar-functions)
 - [Proxy](#proxy)
 - [Pulsar SQL Worker](#pulsar-sql-worker)
@@ -138,16 +139,16 @@ All the namespace metrics are labelled with the following 
labels:
 | pulsar_subscriptions_count | Gauge | The number of Pulsar subscriptions of 
the namespace served by this broker. |
 | pulsar_producers_count | Gauge | The number of active producers of the 
namespace connected to this broker. |
 | pulsar_consumers_count | Gauge | The number of active consumers of the 
namespace connected to this broker. |
-| pulsar_rate_in | Gauge | The total message rate of the namespace coming into 
this broker (messages/second). |
-| pulsar_rate_out | Gauge | The total message rate of the namespace going out 
from this broker (messages/second). |
-| pulsar_throughput_in | Gauge | The total throughput of the namespace coming 
into this broker (bytes/second). |
-| pulsar_throughput_out | Gauge | The total throughput of the namespace going 
out from this broker (bytes/second). |
+| pulsar_rate_in | Gauge | The total message rate of the namespace coming into 
this broker (message per second). |
+| pulsar_rate_out | Gauge | The total message rate of the namespace going out 
from this broker (message per second). |
+| pulsar_throughput_in | Gauge | The total throughput of the namespace coming 
into this broker (byte per second). |
+| pulsar_throughput_out | Gauge | The total throughput of the namespace going 
out from this broker (byte per second). |
 | pulsar_storage_size | Gauge | The total storage size of the topics in this 
namespace owned by this broker (bytes). |
 | pulsar_storage_logical_size | Gauge | The storage size of topics in the 
namespace owned by the broker without replicas (in bytes). |
 | pulsar_storage_backlog_size | Gauge | The total backlog size of the topics 
of this namespace owned by this broker (messages). |
 | pulsar_storage_offloaded_size | Gauge | The total amount of the data in this 
namespace offloaded to the tiered storage (bytes). |
-| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this namespace (message batches / second). |
-| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this namespace (message batches / second). |
+| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this namespace (message batch per second). |
+| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this namespace (message batch per second). |
 | pulsar_subscription_delayed | Gauge | The total message batches (entries) 
are delayed for dispatching. |
 | pulsar_storage_write_latency_le_* | Histogram | The entry rate of a 
namespace that the storage write latency is smaller with a given threshold.<br 
/> Available thresholds: <br /><ul><li>pulsar_storage_write_latency_le_0_5: <= 
0.5ms </li><li>pulsar_storage_write_latency_le_1: <= 
1ms</li><li>pulsar_storage_write_latency_le_5: <= 
5ms</li><li>pulsar_storage_write_latency_le_10: <= 
10ms</li><li>pulsar_storage_write_latency_le_20: <= 
20ms</li><li>pulsar_storage_write_latency_le_50: <= 50ms</ [...]
 | pulsar_entry_size_le_* | Histogram | The entry rate of a namespace that the 
entry size is smaller with a given threshold.<br /> Available thresholds: <br 
/><ul><li>pulsar_entry_size_le_128: <= 128 bytes 
</li><li>pulsar_entry_size_le_512: <= 512 
bytes</li><li>pulsar_entry_size_le_1_kb: <= 1 
KB</li><li>pulsar_entry_size_le_2_kb: <= 2 
KB</li><li>pulsar_entry_size_le_4_kb: <= 4 
KB</li><li>pulsar_entry_size_le_16_kb: <= 16 
KB</li><li>pulsar_entry_size_le_100_kb: <= 100 KB</li><li>pulsar_ent [...]
@@ -160,12 +161,12 @@ All the replication metrics are also labelled with 
`remoteCluster=${pulsar_remot
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_replication_rate_in | Gauge | The total message rate of the namespace 
replicating from remote cluster (messages/second). |
-| pulsar_replication_rate_out | Gauge | The total message rate of the 
namespace replicating to remote cluster (messages/second). |
-| pulsar_replication_throughput_in | Gauge | The total throughput of the 
namespace replicating from remote cluster (bytes/second). |
-| pulsar_replication_throughput_out | Gauge | The total throughput of the 
namespace replicating to remote cluster (bytes/second). |
+| pulsar_replication_rate_in | Gauge | The total message rate of the namespace 
replicating from remote cluster (message per second). |
+| pulsar_replication_rate_out | Gauge | The total message rate of the 
namespace replicating to remote cluster (message per second). |
+| pulsar_replication_throughput_in | Gauge | The total throughput of the 
namespace replicating from remote cluster (byte per second). |
+| pulsar_replication_throughput_out | Gauge | The total throughput of the 
namespace replicating to remote cluster (byte per second). |
 | pulsar_replication_backlog | Gauge | The total backlog of the namespace 
replicating to remote cluster (messages). |
-| pulsar_replication_rate_expired | Gauge | Total rate of messages expired 
(messages/second). |
+| pulsar_replication_rate_expired | Gauge | Total rate of messages expired 
(message per second). |
 | pulsar_replication_connected_count | Gauge | The count of 
replication-subscriber up and running to replicate to remote cluster. |
 | pulsar_replication_delay_in_seconds | Gauge | Time in seconds from the time 
a message was produced to the time when it is about to be replicated. |
 
@@ -185,18 +186,18 @@ All the topic metrics are labelled with the following 
labels:
 | pulsar_subscriptions_count | Gauge | The number of Pulsar subscriptions of 
the topic served by this broker. |
 | pulsar_producers_count | Gauge | The number of active producers of the topic 
connected to this broker. |
 | pulsar_consumers_count | Gauge | The number of active consumers of the topic 
connected to this broker. |
-| pulsar_rate_in | Gauge | The total message rate of the topic coming into 
this broker (messages/second). |
-| pulsar_rate_out | Gauge | The total message rate of the topic going out from 
this broker (messages/second). |
+| pulsar_rate_in | Gauge | The total message rate of the topic coming into 
this broker (message per second). |
+| pulsar_rate_out | Gauge | The total message rate of the topic going out from 
this broker (message per second). |
 | pulsar_publish_rate_limit_times | Gauge | The number of times the publish 
rate limit is triggered. |
-| pulsar_throughput_in | Gauge | The total throughput of the topic coming into 
this broker (bytes/second). |
-| pulsar_throughput_out | Gauge | The total throughput of the topic going out 
from this broker (bytes/second). |
+| pulsar_throughput_in | Gauge | The total throughput of the topic coming into 
this broker (byte per second). |
+| pulsar_throughput_out | Gauge | The total throughput of the topic going out 
from this broker (byte per second). |
 | pulsar_storage_size | Gauge | The total storage size of the topics in this 
topic owned by this broker (bytes). |
 | pulsar_storage_logical_size | Gauge | The storage size of topics in the 
namespace owned by the broker without replicas (in bytes). |
 | pulsar_storage_backlog_size | Gauge | The total backlog size of the topics 
of this topic owned by this broker (messages). |
 | pulsar_storage_offloaded_size | Gauge | The total amount of the data in this 
topic offloaded to the tiered storage (bytes). |
 | pulsar_storage_backlog_quota_limit | Gauge | The total amount of the data in 
this topic that limit the backlog quota (bytes). |
-| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this topic (message batches / second). |
-| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this topic (message batches / second). |
+| pulsar_storage_write_rate | Gauge | The total message batches (entries) 
written to the storage for this topic (message batch per second). |
+| pulsar_storage_read_rate | Gauge | The total message batches (entries) read 
from the storage for this topic (message batch per second). |
 | pulsar_subscription_delayed | Gauge | The total message batches (entries) 
are delayed for dispatching. |
 | pulsar_storage_write_latency_le_* | Histogram | The entry rate of a topic 
that the storage write latency is smaller with a given threshold.<br /> 
Available thresholds: <br /><ul><li>pulsar_storage_write_latency_le_0_5: <= 
0.5ms </li><li>pulsar_storage_write_latency_le_1: <= 
1ms</li><li>pulsar_storage_write_latency_le_5: <= 
5ms</li><li>pulsar_storage_write_latency_le_10: <= 
10ms</li><li>pulsar_storage_write_latency_le_20: <= 
20ms</li><li>pulsar_storage_write_latency_le_50: <= 50ms</li>< [...]
 | pulsar_entry_size_le_* | Histogram | The entry rate of a topic that the 
entry size is smaller with a given threshold.<br /> Available thresholds: <br 
/><ul><li>pulsar_entry_size_le_128: <= 128 bytes 
</li><li>pulsar_entry_size_le_512: <= 512 
bytes</li><li>pulsar_entry_size_le_1_kb: <= 1 
KB</li><li>pulsar_entry_size_le_2_kb: <= 2 
KB</li><li>pulsar_entry_size_le_4_kb: <= 4 
KB</li><li>pulsar_entry_size_le_16_kb: <= 16 
KB</li><li>pulsar_entry_size_le_100_kb: <= 100 KB</li><li>pulsar_entry_s [...]
@@ -222,10 +223,10 @@ All the replication metrics are labelled with 
`remoteCluster=${pulsar_remote_clu
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_replication_rate_in | Gauge | The total message rate of the topic 
replicating from remote cluster (messages/second). |
-| pulsar_replication_rate_out | Gauge | The total message rate of the topic 
replicating to remote cluster (messages/second). |
-| pulsar_replication_throughput_in | Gauge | The total throughput of the topic 
replicating from remote cluster (bytes/second). |
-| pulsar_replication_throughput_out | Gauge | The total throughput of the 
topic replicating to remote cluster (bytes/second). |
+| pulsar_replication_rate_in | Gauge | The total message rate of the topic 
replicating from remote cluster (message per second). |
+| pulsar_replication_rate_out | Gauge | The total message rate of the topic 
replicating to remote cluster (message per second). |
+| pulsar_replication_throughput_in | Gauge | The total throughput of the topic 
replicating from remote cluster (byte per second). |
+| pulsar_replication_throughput_out | Gauge | The total throughput of the 
topic replicating to remote cluster (byte per second). |
 | pulsar_replication_backlog | Gauge | The total backlog of the topic 
replicating to remote cluster (messages). |
 
 #### Topic lookup metrics
@@ -268,8 +269,8 @@ All the managedLedger metrics are labelled with the 
following labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_ml_AddEntryBytesRate | Gauge | The bytes/s rate of messages added |
-| pulsar_ml_AddEntryWithReplicasBytesRate | Gauge | The bytes/s rate of 
messages added with replicas |
+| pulsar_ml_AddEntryBytesRate | Gauge | The B/s rate of messages added |
+| pulsar_ml_AddEntryWithReplicasBytesRate | Gauge | The B/s rate of messages 
added with replicas |
 | pulsar_ml_AddEntryErrors | Gauge | The number of addEntry requests that 
failed |
 | pulsar_ml_AddEntryLatencyBuckets | Histogram | The latency of adding a 
ledger entry with a given quantile (threshold), including time spent on waiting 
in queue on the broker side.<br /> Available quantile: <br /><ul><li> 
quantile="0.0_0.5" is AddEntryLatency between (0.0ms, 0.5ms]</li> 
<li>quantile="0.5_1.0" is AddEntryLatency between (0.5ms, 
1.0ms]</li><li>quantile="1.0_5.0" is AddEntryLatency between (1ms, 
5ms]</li><li>quantile="5.0_10.0" is AddEntryLatency between (5ms, 10ms]</li><l 
[...]
 | pulsar_ml_AddEntryLatencyBuckets_OVERFLOW | Gauge | The number of times the 
AddEntryLatency is longer than 1 second |
@@ -283,7 +284,7 @@ All the managedLedger metrics are labelled with the 
following labels:
 | pulsar_ml_LedgerAddEntryLatencyBuckets_OVERFLOW | Gauge | The number of 
times the LedgerAddEntryLatency is longer than 1 second |
 | pulsar_ml_MarkDeleteRate | Gauge | The rate of mark-delete ops/s |
 | pulsar_ml_NumberOfMessagesInBacklog | Gauge | The number of backlog messages 
for all the consumers |
-| pulsar_ml_ReadEntriesBytesRate | Gauge | The bytes/s rate of messages read |
+| pulsar_ml_ReadEntriesBytesRate | Gauge | The B/s rate of messages read |
 | pulsar_ml_ReadEntriesErrors | Gauge | The number of readEntries requests 
that failed |
 | pulsar_ml_ReadEntriesRate | Gauge | The msg/s rate of messages read |
 | pulsar_ml_ReadEntriesSucceeded | Gauge | The number of readEntries requests 
that succeeded |
@@ -354,13 +355,13 @@ All the bundle metrics are labelled with the following 
labels:
 
 | Name | Type | Description |
 | --- | --- | --- |
-| pulsar_bundle_msg_rate_in | Gauge | The total message rate coming into the 
topics in this bundle  (messages/second). |
-| pulsar_bundle_msg_rate_out | Gauge | The total message rate going out from 
the topics in this bundle  (messages/second).  |
+| pulsar_bundle_msg_rate_in | Gauge | The total message rate coming into the 
topics in this bundle  (message per second). |
+| pulsar_bundle_msg_rate_out | Gauge | The total message rate going out from 
the topics in this bundle  (message per second).  |
 | pulsar_bundle_topics_count | Gauge | The topic count in this bundle.  |
 | pulsar_bundle_consumer_count | Gauge | The consumer count of the topics in 
this bundle. |
 | pulsar_bundle_producer_count | Gauge | The producer count of the topics in 
this bundle. |
-| pulsar_bundle_msg_throughput_in | Gauge | The total throughput coming into 
the topics in this bundle (bytes/second). |
-| pulsar_bundle_msg_throughput_out | Gauge | The total throughput going out 
from the topics in this bundle (bytes/second). |
+| pulsar_bundle_msg_throughput_in | Gauge | The total throughput coming into 
the topics in this bundle (byte per second). |
+| pulsar_bundle_msg_throughput_out | Gauge | The total throughput going out 
from the topics in this bundle (byte per second). |
 
 ### Subscription metrics
 
@@ -378,11 +379,11 @@ All the subscription metrics are labelled with the 
following labels:
 | pulsar_subscription_back_log | Gauge | The total backlog of a subscription 
(entries). |
 | pulsar_subscription_back_log_no_delayed | Gauge | The backlog of a 
subscription that do not contain the delay messages (entries). |
 | pulsar_subscription_delayed | Gauge | The total number of messages are 
delayed to be dispatched for a subscription (messages). |
-| pulsar_subscription_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (messages/second). |
+| pulsar_subscription_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (message per second). |
 | pulsar_subscription_unacked_messages | Gauge | The total number of 
unacknowledged messages of a subscription (messages). |
 | pulsar_subscription_blocked_on_unacked_messages | Gauge | Indicate whether a 
subscription is blocked on unacknowledged messages or not. <br /> <ul><li>1 
means the subscription is blocked on waiting unacknowledged messages to be 
acked.</li><li>0 means the subscription is not blocked on waiting 
unacknowledged messages to be acked.</li></ul> |
-| pulsar_subscription_msg_rate_out | Gauge | The total message dispatch rate 
for a subscription (messages/second). |
-| pulsar_subscription_msg_throughput_out | Gauge | The total message dispatch 
throughput for a subscription (bytes/second). |
+| pulsar_subscription_msg_rate_out | Gauge | The total message dispatch rate 
for a subscription (message per second). |
+| pulsar_subscription_msg_throughput_out | Gauge | The total message dispatch 
throughput for a subscription (byte per second). |
 
 ### Consumer metrics
 
@@ -399,11 +400,11 @@ All the consumer metrics are labelled with the following 
labels:
 
 | Name | Type | Description |
 |---|---|---|
-| pulsar_consumer_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (messages/second). |
+| pulsar_consumer_msg_rate_redeliver | Gauge | The total message rate for 
message being redelivered (message per second). |
 | pulsar_consumer_unacked_messages | Gauge | The total number of 
unacknowledged messages of a consumer (messages). |
 | pulsar_consumer_blocked_on_unacked_messages | Gauge | Indicate whether a 
consumer is blocked on unacknowledged messages or not. <br /> <ul><li>1 means 
the consumer is blocked on waiting unacknowledged messages to be 
acked.</li><li>0 means the consumer is not blocked on waiting unacknowledged 
messages to be acked.</li></ul> |
-| pulsar_consumer_msg_rate_out | Gauge | The total message dispatch rate for a 
consumer (messages/second). |
-| pulsar_consumer_msg_throughput_out | Gauge | The total message dispatch 
throughput for a consumer (bytes/second). |
+| pulsar_consumer_msg_rate_out | Gauge | The total message dispatch rate for a 
consumer (message per second). |
+| pulsar_consumer_msg_throughput_out | Gauge | The total message dispatch 
throughput for a consumer (byte per second). |
 | pulsar_consumer_available_permits | Gauge | The available permits for for a 
consumer. |
 
 ### Managed ledger bookie client metrics
@@ -511,6 +512,27 @@ All the schema metrics are labelled with the following 
labels:
 | pulsar_schema_get_ops_latency | Summary | Latency of successful operations 
to get schemas. |
 | pulsar_schema_put_ops_latency | Summary | Latency of successful operations 
to send schemas. |
 
+### Offload metrics
+
+All the offload metrics are labelled with the following labels:
+
+- *cluster*: `cluster=${pulsar_cluster}`. `${pulsar_cluster}` is the cluster 
name that you configured in `broker.conf`.
+- *namespace*: `namespace=${pulsar_namespace}`. `${pulsar_namespace}` is the 
namespace name.
+- *topic*: `topic=${pulsar_topic}`. `${pulsar_topic}` is the topic name.
+
+| Name                                           | Type    | Description       
                                                              |
+|------------------------------------------------|---------|---------------------------------------------------------------------------------|
+| brk_ledgeroffloader_offload_error              | Counter | The number of 
failed operations to offload.                                     |
+| brk_ledgeroffloader_offload_rate               | Gauge   | The rate of 
offloading(byte per second).                                        |
+| brk_ledgeroffloader_read_offload_error         | Counter | The number of 
failed operations to read offload ledgers.                        |
+| brk_ledgeroffloader_read_offload_rate          | Gauge   | The rate of 
reading entries from offload ledgers(byte per second).              |
+| brk_ledgeroffloader_write_storage_error        | Counter | The number of 
failed operations to write to storage.                            |
+| brk_ledgeroffloader_read_offload_index_latency | Summary | The latency of 
reading index from offload ledgers.                              |
+| brk_ledgeroffloader_read_offload_data_latency  | Summary | The latency of 
reading data from offload ledgers.                               |
+| brk_ledgeroffloader_read_ledger_latency        | Summary | The latency of 
reading entries from BookKeeper.                                 |
+| brk_ledgeroffloader_delete_offload_ops         | Counter | The total number 
of successful and failed operations to delete offload ledgers. |
+
+
 ## Pulsar Functions
 
 All the Pulsar Functions metrics are labelled with the following labels:
diff --git a/site2/website-next/docs/tiered-storage-aliyun.md 
b/site2/website-next/docs/tiered-storage-aliyun.md
index bcebe39ae9..48db44aebc 100644
--- a/site2/website-next/docs/tiered-storage-aliyun.md
+++ b/site2/website-next/docs/tiered-storage-aliyun.md
@@ -23,8 +23,6 @@ This example uses Pulsar 2.8.0.
 2. Download and untar the Pulsar offloaders package, then copy the Pulsar 
offloaders as `offloaders` in the Pulsar directory, see 
[here](https://pulsar.apache.org/docs/en/standalone/#install-tiered-storage-offloaders-optional).
 
    **Output**
-   
-   As shown from the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support [AWS 
S3](https://aws.amazon.com/s3/), [GCS](https://cloud.google.com/storage/), 
[Azure](https://portal.azure.com/#home), and [Aliyun 
OSS](https://www.aliyun.com/product/oss) for long-term storage.
 
    ```
    
diff --git a/site2/website-next/docs/tiered-storage-aws.md 
b/site2/website-next/docs/tiered-storage-aws.md
index d7442fc13f..8f86d4c1e5 100644
--- a/site2/website-next/docs/tiered-storage-aws.md
+++ b/site2/website-next/docs/tiered-storage-aws.md
@@ -53,8 +53,6 @@ This example uses Pulsar 2.5.1.
 
    **Output**
 
-   As shown from the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support [AWS 
S3](https://aws.amazon.com/s3/) and [GCS](https://cloud.google.com/storage/) 
for long term storage. 
-
    ```
    
    tiered-storage-file-system-2.5.1.nar
diff --git a/site2/website-next/docs/tiered-storage-azure.md 
b/site2/website-next/docs/tiered-storage-azure.md
index 654ae2bd7b..8a2d7b3a23 100644
--- a/site2/website-next/docs/tiered-storage-azure.md
+++ b/site2/website-next/docs/tiered-storage-azure.md
@@ -53,8 +53,6 @@ This example uses Pulsar 2.6.2.
 
    **Output**
 
-   As shown from the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support [AWS 
S3](https://aws.amazon.com/s3/),  [GCS](https://cloud.google.com/storage/) and 
[Azure](https://portal.azure.com/#home) for long term storage. 
-
    ```
    
    tiered-storage-file-system-2.6.2.nar
diff --git a/site2/website-next/docs/tiered-storage-gcs.md 
b/site2/website-next/docs/tiered-storage-gcs.md
index a344ae0c0b..c87b62c6ec 100644
--- a/site2/website-next/docs/tiered-storage-gcs.md
+++ b/site2/website-next/docs/tiered-storage-gcs.md
@@ -61,8 +61,6 @@ This example uses Pulsar 2.5.1.
 
    **Output**
 
-   As shown in the output, Pulsar uses [Apache 
jclouds](https://jclouds.apache.org) to support GCS and AWS S3 for long term 
storage. 
-
    ```
    
    tiered-storage-file-system-2.5.1.nar
diff --git a/site2/website-next/docs/tiered-storage-overview.md 
b/site2/website-next/docs/tiered-storage-overview.md
index 1b595d5f61..b9e71e0483 100644
--- a/site2/website-next/docs/tiered-storage-overview.md
+++ b/site2/website-next/docs/tiered-storage-overview.md
@@ -6,7 +6,7 @@ sidebar_label: "Overview"
 
 Pulsar's **Tiered Storage** feature allows older backlog data to be moved from 
BookKeeper to long term and cheaper storage, while still allowing clients to 
access the backlog as if nothing has changed. 
 
-* Tiered storage uses [Apache jclouds](https://jclouds.apache.org) to support 
[Amazon S3](https://aws.amazon.com/s3/) and [GCS (Google Cloud 
Storage)](https://cloud.google.com/storage/) for long term storage. 
+* Tiered storage uses [Apache jclouds](https://jclouds.apache.org) to support 
[Amazon S3](https://aws.amazon.com/s3/), [GCS (Google Cloud 
Storage)](https://cloud.google.com/storage/), 
[Azure](https://azure.microsoft.com/en-us/services/storage/blobs/) and [Aliyun 
OSS](https://www.aliyun.com/product/oss) for long term storage. 
 
     With jclouds, it is easy to add support for more [cloud storage 
providers](https://jclouds.apache.org/reference/providers/#blobstore-providers) 
in the future.
 
@@ -14,6 +14,8 @@ Pulsar's **Tiered Storage** feature allows older backlog data 
to be moved from B
 
     For more information about how to use the AWS S3 offloader with Pulsar, 
see [here](tiered-storage-aws).
     For more information about how to use the GCS offloader with Pulsar, see 
[here](tiered-storage-gcs).
+    For more information about how to use the Azure offloader with Pulsar, see 
[here](tiered-storage-azure).
+    For more information about how to use the Aliyun OSS offloader with 
Pulsar, see [here](tiered-storage-aliyun).
 
     :::
 
@@ -48,3 +50,5 @@ Before offloading ledgers to long term storage, you need to 
configure buckets, c
 After offloading ledgers to long term storage, you can still query data in the 
offloaded ledgers with Pulsar SQL.
 
 For more information about tiered storage for Pulsar topics, see 
[here](https://github.com/apache/pulsar/wiki/PIP-17:-Tiered-storage-for-Pulsar-topics).
+
+For more information about offload metrics, see 
[here](reference-metrics.md#offload-metrics).
\ No newline at end of file
diff --git 
a/site2/website-next/versioned_docs/version-2.1.0-incubating/about.md 
b/site2/website-next/versioned_docs/version-2.1.0-incubating/about.md
index a73cda8f30..6ed04e8705 100644
--- a/site2/website-next/versioned_docs/version-2.1.0-incubating/about.md
+++ b/site2/website-next/versioned_docs/version-2.1.0-incubating/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" 
url="/docs/2.1.0-incubating/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.1.0-incubating/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.1.0-incubating/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" 
url="/docs/2.1.0-incubating/deploy-aws/" />
+    <BlockLink title="Pulsar for Developers" 
url="/docs/2.1.0-incubating/develop-tools/" />
+    <BlockLink title="How To" url="/docs/2.1.0-incubating/functions-develop/" 
/>
+    <BlockLink title="References" 
url="/docs/2.1.0-incubating/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git 
a/site2/website-next/versioned_docs/version-2.1.1-incubating/about.md 
b/site2/website-next/versioned_docs/version-2.1.1-incubating/about.md
index a3ec7ed37a..6455a7d43e 100644
--- a/site2/website-next/versioned_docs/version-2.1.1-incubating/about.md
+++ b/site2/website-next/versioned_docs/version-2.1.1-incubating/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" 
url="/docs/2.1.1-incubating/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.1.1-incubating/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.1.1-incubating/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" 
url="/docs/2.1.1-incubating/deploy-aws/" />
+    <BlockLink title="Pulsar for Developers" 
url="/docs/2.1.1-incubating/develop-tools/" />
+    <BlockLink title="How To" url="/docs/2.1.1-incubating/functions-develop/" 
/>
+    <BlockLink title="References" 
url="/docs/2.1.1-incubating/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.10.0/about.md 
b/site2/website-next/versioned_docs/version-2.10.0/about.md
index 41357a8d0c..478ac8dd05 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/concepts-overview/" />
     <BlockLink title="Get Started" url="/docs/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/deploy-aws/" />
+    <BlockLink title="Pulsar for Developers" url="/docs/develop-tools/" />
+    <BlockLink title="How To" url="/docs/functions-develop/" />
+    <BlockLink title="References" url="/docs/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git 
a/site2/website-next/versioned_docs/version-2.10.0/client-libraries-cpp.md 
b/site2/website-next/versioned_docs/version-2.10.0/client-libraries-cpp.md
index 2d52e868e0..8a2d4977a9 100644
--- a/site2/website-next/versioned_docs/version-2.10.0/client-libraries-cpp.md
+++ b/site2/website-next/versioned_docs/version-2.10.0/client-libraries-cpp.md
@@ -152,7 +152,7 @@ $ rpm -ivh apache-pulsar-client*.rpm
 
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 
 ```bash
 
diff --git a/site2/website-next/versioned_docs/version-2.2.0/about.md 
b/site2/website-next/versioned_docs/version-2.2.0/about.md
index e2d0fa146d..a3260581d8 100644
--- a/site2/website-next/versioned_docs/version-2.2.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.2.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.2.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.2.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.2.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.2.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.2.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.2.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.2.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.2.1/about.md 
b/site2/website-next/versioned_docs/version-2.2.1/about.md
index 998c67640b..881e351e26 100644
--- a/site2/website-next/versioned_docs/version-2.2.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.2.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.2.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.2.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.2.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.2.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.2.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.2.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.2.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
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 48f826701c..99755ab88a 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
@@ -151,7 +151,7 @@ $ rpm -ivh apache-pulsar-client*.rpm
 
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 
 ```bash
 
diff --git a/site2/website-next/versioned_docs/version-2.3.0/about.md 
b/site2/website-next/versioned_docs/version-2.3.0/about.md
index 9e74c5c8b4..71062573c5 100644
--- a/site2/website-next/versioned_docs/version-2.3.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.3.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.3.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.3.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.3.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.3.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.3.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.3.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.3.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.3.1/about.md 
b/site2/website-next/versioned_docs/version-2.3.1/about.md
index 6ea5b62764..8b346d606b 100644
--- a/site2/website-next/versioned_docs/version-2.3.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.3.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.3.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.3.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.3.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.3.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.3.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.3.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.3.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.3.2/about.md 
b/site2/website-next/versioned_docs/version-2.3.2/about.md
index 98e3aa67dc..2876cb6d15 100644
--- a/site2/website-next/versioned_docs/version-2.3.2/about.md
+++ b/site2/website-next/versioned_docs/version-2.3.2/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.3.2/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.3.2/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.3.2/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.3.2/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.3.2/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.3.2/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.3.2/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
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 48f826701c..99755ab88a 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
@@ -151,7 +151,7 @@ $ rpm -ivh apache-pulsar-client*.rpm
 
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 
 ```bash
 
diff --git a/site2/website-next/versioned_docs/version-2.4.0/about.md 
b/site2/website-next/versioned_docs/version-2.4.0/about.md
index e3e576f8c0..8fc201f8af 100644
--- a/site2/website-next/versioned_docs/version-2.4.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.4.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.4.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.4.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.4.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.4.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.4.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.4.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.4.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
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 48f826701c..99755ab88a 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
@@ -151,7 +151,7 @@ $ rpm -ivh apache-pulsar-client*.rpm
 
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 
 ```bash
 
diff --git a/site2/website-next/versioned_docs/version-2.4.1/about.md 
b/site2/website-next/versioned_docs/version-2.4.1/about.md
index 4f5be7f059..cbe39aca26 100644
--- a/site2/website-next/versioned_docs/version-2.4.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.4.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.4.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.4.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.4.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.4.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.4.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.4.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.4.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
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 48f826701c..99755ab88a 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
@@ -151,7 +151,7 @@ $ rpm -ivh apache-pulsar-client*.rpm
 
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 
 ```bash
 
diff --git a/site2/website-next/versioned_docs/version-2.4.2/about.md 
b/site2/website-next/versioned_docs/version-2.4.2/about.md
index e3d9b720d8..aeecbb9860 100644
--- a/site2/website-next/versioned_docs/version-2.4.2/about.md
+++ b/site2/website-next/versioned_docs/version-2.4.2/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.4.2/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.4.2/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.4.2/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.4.2/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.4.2/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.4.2/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.4.2/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
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 48f826701c..99755ab88a 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
@@ -151,7 +151,7 @@ $ rpm -ivh apache-pulsar-client*.rpm
 
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 
 ```bash
 
diff --git a/site2/website-next/versioned_docs/version-2.5.0/about.md 
b/site2/website-next/versioned_docs/version-2.5.0/about.md
index cf0dbf5036..4932af33bb 100644
--- a/site2/website-next/versioned_docs/version-2.5.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.5.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.5.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.5.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.5.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.5.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.5.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.5.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.5.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.5.1/about.md 
b/site2/website-next/versioned_docs/version-2.5.1/about.md
index cd0de81eb7..bf4f4d3266 100644
--- a/site2/website-next/versioned_docs/version-2.5.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.5.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.5.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.5.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.5.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.5.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.5.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.5.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.5.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.5.2/about.md 
b/site2/website-next/versioned_docs/version-2.5.2/about.md
index 61017ff6d4..abad1cf710 100644
--- a/site2/website-next/versioned_docs/version-2.5.2/about.md
+++ b/site2/website-next/versioned_docs/version-2.5.2/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.5.2/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.5.2/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.5.2/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.5.2/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.5.2/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.5.2/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.5.2/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.6.0/about.md 
b/site2/website-next/versioned_docs/version-2.6.0/about.md
index d62344cef7..1f7832daa1 100644
--- a/site2/website-next/versioned_docs/version-2.6.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.6.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.6.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.6.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.6.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.6.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.6.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.6.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.6.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.6.1/about.md 
b/site2/website-next/versioned_docs/version-2.6.1/about.md
index 8235a15244..9c75dda205 100644
--- a/site2/website-next/versioned_docs/version-2.6.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.6.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.6.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.6.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.6.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.6.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.6.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.6.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.6.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.6.2/about.md 
b/site2/website-next/versioned_docs/version-2.6.2/about.md
index 34a0c06c5f..16d2724049 100644
--- a/site2/website-next/versioned_docs/version-2.6.2/about.md
+++ b/site2/website-next/versioned_docs/version-2.6.2/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.6.2/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.6.2/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.6.2/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.6.2/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.6.2/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.6.2/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.6.2/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.6.3/about.md 
b/site2/website-next/versioned_docs/version-2.6.3/about.md
index 314be8dc97..372119007a 100644
--- a/site2/website-next/versioned_docs/version-2.6.3/about.md
+++ b/site2/website-next/versioned_docs/version-2.6.3/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.6.3/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.6.3/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.6.3/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.6.3/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.6.3/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.6.3/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.6.3/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.6.4/about.md 
b/site2/website-next/versioned_docs/version-2.6.4/about.md
index 80e922ce56..fe6edb3c6b 100644
--- a/site2/website-next/versioned_docs/version-2.6.4/about.md
+++ b/site2/website-next/versioned_docs/version-2.6.4/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.6.4/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.6.4/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.6.4/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.6.4/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.6.4/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.6.4/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.6.4/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.7.0/about.md 
b/site2/website-next/versioned_docs/version-2.7.0/about.md
index 16c1c52b29..152835d929 100644
--- a/site2/website-next/versioned_docs/version-2.7.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.7.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.7.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.7.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.7.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.7.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.7.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.7.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.7.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.7.1/about.md 
b/site2/website-next/versioned_docs/version-2.7.1/about.md
index e957621ded..5fced32a1c 100644
--- a/site2/website-next/versioned_docs/version-2.7.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.7.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.7.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.7.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.7.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.7.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.7.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.7.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.7.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.7.2/about.md 
b/site2/website-next/versioned_docs/version-2.7.2/about.md
index bf62876e2a..01f344b17b 100644
--- a/site2/website-next/versioned_docs/version-2.7.2/about.md
+++ b/site2/website-next/versioned_docs/version-2.7.2/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.7.2/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.7.2/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.7.2/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.7.2/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.7.2/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.7.2/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.7.2/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.7.3/about.md 
b/site2/website-next/versioned_docs/version-2.7.3/about.md
index a86ce0599c..8800ed6035 100644
--- a/site2/website-next/versioned_docs/version-2.7.3/about.md
+++ b/site2/website-next/versioned_docs/version-2.7.3/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.7.3/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.7.3/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.7.3/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.7.3/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.7.3/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.7.3/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.7.3/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.7.4/about.md 
b/site2/website-next/versioned_docs/version-2.7.4/about.md
index 27fc264572..5486b67bb4 100644
--- a/site2/website-next/versioned_docs/version-2.7.4/about.md
+++ b/site2/website-next/versioned_docs/version-2.7.4/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.7.4/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.7.4/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.7.4/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.7.4/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.7.4/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.7.4/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.7.4/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.8.0/about.md 
b/site2/website-next/versioned_docs/version-2.8.0/about.md
index 14b3bd1175..1eafb414c2 100644
--- a/site2/website-next/versioned_docs/version-2.8.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.8.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.8.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.8.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.8.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.8.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.8.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.8.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.8.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.8.1/about.md 
b/site2/website-next/versioned_docs/version-2.8.1/about.md
index ac353c3057..7190af6346 100644
--- a/site2/website-next/versioned_docs/version-2.8.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.8.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.8.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.8.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.8.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.8.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.8.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.8.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.8.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.8.2/about.md 
b/site2/website-next/versioned_docs/version-2.8.2/about.md
index e595ae8e30..2b86e7273a 100644
--- a/site2/website-next/versioned_docs/version-2.8.2/about.md
+++ b/site2/website-next/versioned_docs/version-2.8.2/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.8.2/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.8.2/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.8.2/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.8.2/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.8.2/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.8.2/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.8.2/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.8.3/about.md 
b/site2/website-next/versioned_docs/version-2.8.3/about.md
index 230a364975..729460195c 100644
--- a/site2/website-next/versioned_docs/version-2.8.3/about.md
+++ b/site2/website-next/versioned_docs/version-2.8.3/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.8.3/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.8.3/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.8.3/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.8.3/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.8.3/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.8.3/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.8.3/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.9.0/about.md 
b/site2/website-next/versioned_docs/version-2.9.0/about.md
index 3c0a87657d..cfe2622c1d 100644
--- a/site2/website-next/versioned_docs/version-2.9.0/about.md
+++ b/site2/website-next/versioned_docs/version-2.9.0/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.9.0/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.9.0/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.9.0/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.9.0/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.9.0/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.9.0/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.9.0/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.9.1/about.md 
b/site2/website-next/versioned_docs/version-2.9.1/about.md
index 94d5530361..12b01eef73 100644
--- a/site2/website-next/versioned_docs/version-2.9.1/about.md
+++ b/site2/website-next/versioned_docs/version-2.9.1/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.9.1/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.9.1/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.9.1/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.9.1/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.9.1/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.9.1/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.9.1/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website-next/versioned_docs/version-2.9.2/about.md 
b/site2/website-next/versioned_docs/version-2.9.2/about.md
index ae1066b67b..219912ac65 100644
--- a/site2/website-next/versioned_docs/version-2.9.2/about.md
+++ b/site2/website-next/versioned_docs/version-2.9.2/about.md
@@ -19,9 +19,12 @@ If you’re an experienced coder, review this page to learn 
the easiest way to a
 
 ## Get Started Now
 <BlockLinks>
+    <BlockLink title="About Pulsar" url="/docs/2.9.2/concepts-overview/" />
     <BlockLink title="Get Started" 
url="/docs/2.9.2/getting-started-standalone/" />
-    <BlockLink title="Pulsar Basics" url="/docs/2.9.2/" />
-    <BlockLink title="Ecosystem" url='/ecosystem/' />
+    <BlockLink title="Install, Deploy, Upgrade" url="/docs/2.9.2/deploy-aws/" 
/>
+    <BlockLink title="Pulsar for Developers" url="/docs/2.9.2/develop-tools/" 
/>
+    <BlockLink title="How To" url="/docs/2.9.2/functions-develop/" />
+    <BlockLink title="References" url="/docs/2.9.2/reference-terminology/" />
 </BlockLinks>
 
 ## Navigation
diff --git a/site2/website/release-notes.md b/site2/website/release-notes.md
index 4e42d7443c..a2ad73728b 100644
--- a/site2/website/release-notes.md
+++ b/site2/website/release-notes.md
@@ -1026,7 +1026,7 @@ It also includes fixes for some breaking changes 
introduced in 2.9.0.
 - Cancel scheduled tasks when deleting ManagedLedgerImpl 
[#12565](https://github.com/apache/pulsar/pull/12565)
 - Add git branch information for PulsarVersion 
[#12541](https://github.com/apache/pulsar/pull/12541)
 - Websocket should pass the encryption context to consumers 
[#12539](https://github.com/apache/pulsar/pull/12539)
-- The count of topics on the bundle is less than 2,skip split 
[#12527](https://github.com/apache/pulsar/pull/12527)
+- The count of topics on the bundle is less than 2, skip split 
[#12527](https://github.com/apache/pulsar/pull/12527)
 - Fix the reader skips compacted data which original ledger been removed 
[#12522](https://github.com/apache/pulsar/pull/12522)
 - Fix `messageDedup` delete inactive producer name 
[#12493](https://github.com/apache/pulsar/pull/12493)
 - Optimize the code: remove extra spaces 
[#12470](https://github.com/apache/pulsar/pull/12470)
diff --git 
a/site2/website/versioned_docs/version-2.10.0/client-libraries-cpp.md 
b/site2/website/versioned_docs/version-2.10.0/client-libraries-cpp.md
index fdf529350a..03e1b4fe41 100644
--- a/site2/website/versioned_docs/version-2.10.0/client-libraries-cpp.md
+++ b/site2/website/versioned_docs/version-2.10.0/client-libraries-cpp.md
@@ -130,7 +130,7 @@ The `libpulsarwithdeps.a` does not include library openssl 
related libraries `li
 $ rpm -ivh apache-pulsar-client*.rpm
 ```
 
-After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory,for example:
+After you install RPM successfully, Pulsar libraries are in the `/usr/lib` 
directory, for example:
 ```bash
 lrwxrwxrwx 1 root root 18 Dec 30 22:21 libpulsar.so -> libpulsar.so.2.9.1
 lrwxrwxrwx 1 root root 23 Dec 30 22:21 libpulsarnossl.so -> 
libpulsarnossl.so.2.9.1

Reply via email to