This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-website.git
The following commit(s) were added to refs/heads/master by this push:
new 0c557834981 [fix](doc) backport 3 cross-version consistency fixes to
2.1/3.x (#3743)
0c557834981 is described below
commit 0c557834981ffea038a39ddd974e451a7afa841b
Author: boluor <[email protected]>
AuthorDate: Sat May 23 05:23:46 2026 -0700
[fix](doc) backport 3 cross-version consistency fixes to 2.1/3.x (#3743)
## Summary
Three small consistency fixes where the correction already landed in
current/4.x but never reached 2.1/3.x (or one EN/3.x file).
| File | Issue | Fix |
| --- | --- | --- |
|
`versioned_docs/version-3.x/admin-manual/cluster-management/upgrade.md`
| placeholder `clusterId=<a_new_clusterIP, ...>` typo (the value
assigned to `clusterId=` should be an ID, not an IP) | `clusterIP` →
`clusterID`. Matches the other 7 instances (EN current/4.x/2.1 + all 4
zh). |
|
`versioned_docs/version-3.x/admin-manual/data-admin/backup-restore/backup.md`
| Azure example used literal `"azure.account_name" = "ak"` /
`"azure.account_key" = "sk"` (looks like a stray copy-paste from the S3
ak/sk block) | replace with the documented placeholder form
`"<account_name>"` / `"<account_key>"`, matching the
`<account_name>.blob.core.windows.net` placeholder on the line above and
the zh 3.x and all current/4.x EN+zh copies of the same example. |
|
`versioned_docs/version-{2.1,3.x}/admin-manual/data-admin/backup-restore/restore.md`
+ the same zh-CN 2.1/3.x files | `SHOW SNAPSHOT` result-table border
`+-----------------+` (17 dashes) is narrower than the 20-char data
column → table renders broken | widen the rule line to
`+--------------------+` and trim the over-padded header cells. Same
form already used in current/4.x EN and zh. |
## Test plan
- [x] Verified against the current/4.x EN+zh versions of the same pages
(which already carry the correct form).
- [x] Dead-link check passes.
- [ ] CI build.
Co-authored-by: Claude Opus 4.7 (1M context) <[email protected]>
---
.../version-2.1/admin-manual/data-admin/backup-restore/restore.md | 8 ++++----
.../version-3.x/admin-manual/data-admin/backup-restore/restore.md | 8 ++++----
.../version-2.1/admin-manual/data-admin/backup-restore/restore.md | 8 ++++----
.../version-3.x/admin-manual/cluster-management/upgrade.md | 2 +-
.../version-3.x/admin-manual/data-admin/backup-restore/backup.md | 4 ++--
.../version-3.x/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 8f53b02d5a1..695f4a12e2b 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 8f53b02d5a1..695f4a12e2b 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 e7972498064..b3f4ed2d9a8 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 9fb74725291..20df673f82e 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=<a_new_clusterIP, such as 123456>
+ clusterId=<a_new_clusterID, such as 123456>
...
```
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 027f1879e48..477ba291002 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://<container_name>/azure_repo"
PROPERTIES
(
"azure.endpoint" = "https://<account_name>.blob.core.windows.net",
- "azure.account_name" = "ak",
- "azure.account_key" = "sk",
+ "azure.account_name" = "<account_name>",
+ "azure.account_key" = "<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 5202c36dc06..18b3f05f8d9 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)
```
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
