From d0b9c5267fa0a7dd2b3934fa4201122f9978142f Mon Sep 17 00:00:00 2001 From: niuxianhui Date: Fri, 22 May 2026 18:54:45 -0700 Subject: [PATCH] [fix](doc) backport 3 cross-version consistency fixes to 2.1/3.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Three small fixes flagged by the cross-version consistency audit — current/4.x already had the correction; 2.1/3.x and one EN/3.x file missed the back-port. - upgrade.md (EN 3.x): placeholder `clusterId=` should be `clusterID` (the value being assigned to `clusterId=`). All other 7 instances (EN current/4.x/2.1 and all 4 zh) already use `clusterID`. - backup-restore/backup.md (EN 3.x): the Azure example used literal credential strings `"azure.account_name" = "ak"` / `"azure.account_key" = "sk"` (stray copy-paste from the S3 ak/sk credentials block). Replace with the documented placeholder form `` / ``, matching the `.blob.core.windows.net` placeholder on the line above and the zh 3.x and all current/4.x EN+zh versions of the same example. - backup-restore/restore.md (EN+zh 2.1/3.x): the `SHOW SNAPSHOT` result-table border `+-----------------+` (17 dashes) is narrower than the 20-char data column, so the table renders broken. Widen to `+--------------------+` and trim the over-padded header cells to match — same form already used in current/4.x EN and zh. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../admin-manual/data-admin/backup-restore/restore.md | 8 ++++---- .../admin-manual/data-admin/backup-restore/restore.md | 8 ++++---- .../admin-manual/data-admin/backup-restore/restore.md | 8 ++++---- .../admin-manual/cluster-management/upgrade.md | 2 +- .../admin-manual/data-admin/backup-restore/backup.md | 4 ++-- .../admin-manual/data-admin/backup-restore/restore.md | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md index 8f53b02d5a13b..695f4a12e2b75 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md @@ -17,11 +17,11 @@ ```sql mysql> SHOW SNAPSHOT ON example_repo; - +-----------------+---------------------+--------+ - | Snapshot | Timestamp | Status | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ + | Snapshot | Timestamp | Status | + +--------------------+---------------------+--------+ | exampledb_20241225 | 2022-04-08-15-52-29 | OK | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ 1 row in set (0.15 sec) ``` diff --git a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md index 8f53b02d5a13b..695f4a12e2b75 100644 --- a/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md +++ b/i18n/zh-CN/docusaurus-plugin-content-docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md @@ -17,11 +17,11 @@ ```sql mysql> SHOW SNAPSHOT ON example_repo; - +-----------------+---------------------+--------+ - | Snapshot | Timestamp | Status | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ + | Snapshot | Timestamp | Status | + +--------------------+---------------------+--------+ | exampledb_20241225 | 2022-04-08-15-52-29 | OK | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ 1 row in set (0.15 sec) ``` diff --git a/versioned_docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md b/versioned_docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md index e797249806428..b3f4ed2d9a85c 100644 --- a/versioned_docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md +++ b/versioned_docs/version-2.1/admin-manual/data-admin/backup-restore/restore.md @@ -18,11 +18,11 @@ The following SQL statement can be used to view existing backups in the Reposito ```sql mysql> SHOW SNAPSHOT ON example_repo; - +-----------------+---------------------+--------+ - | Snapshot | Timestamp | Status | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ + | Snapshot | Timestamp | Status | + +--------------------+---------------------+--------+ | exampledb_20241225 | 2022-04-08-15-52-29 | OK | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ 1 row in set (0.15 sec) ``` diff --git a/versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md b/versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md index 9fb7472529117..20df673f82e69 100644 --- a/versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md +++ b/versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md @@ -67,7 +67,7 @@ Before upgrading, conduct metadata compatibility testing to prevent failures cau edit_log_port = 19010 ## modify clusterIP - clusterId= + clusterId= ... ``` diff --git a/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md b/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md index 027f1879e48bc..477ba29100294 100644 --- a/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md +++ b/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md @@ -49,8 +49,8 @@ ON LOCATION "s3:///azure_repo" PROPERTIES ( "azure.endpoint" = "https://.blob.core.windows.net", - "azure.account_name" = "ak", - "azure.account_key" = "sk", + "azure.account_name" = "", + "azure.account_key" = "", "provider" = "AZURE" ); ``` diff --git a/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md b/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md index 5202c36dc062b..18b3f05f8d9d3 100644 --- a/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md +++ b/versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/restore.md @@ -18,11 +18,11 @@ The following SQL statement can be used to view existing backups in the Reposito ```sql mysql> SHOW SNAPSHOT ON example_repo; - +-----------------+---------------------+--------+ - | Snapshot | Timestamp | Status | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ + | Snapshot | Timestamp | Status | + +--------------------+---------------------+--------+ | exampledb_20241225 | 2022-04-08-15-52-29 | OK | - +-----------------+---------------------+--------+ + +--------------------+---------------------+--------+ 1 row in set (0.15 sec) ```