Sync the scaffold from pingcap/docs-staging@17e268f

Oreoxmt · Dec 31, 2024 · 91617fe · 91617fe
1 parent 9a25b62
commit 91617fe
Show file tree

Hide file tree

Showing 24 changed files with 1,680 additions and 36 deletions.
diff --git a/docs.json b/docs.json
@@ -1,44 +1,42 @@
 {
   "docs": {
     "tidb": {
-      "stable": "release-8.1",
+      "stable": "release-8.5",
       "languages": {
         "en": {
           "repo": "pingcap/docs",
           "versions": [
             "master",
+            "release-8.5",
             "release-8.4",
             "release-8.3",
-            "release-8.2",
             "release-8.1",
             "release-7.5",
             "release-7.1",
             "release-6.5",
             "release-6.1",
-            "release-5.4",
-            "release-5.3"
+            "release-5.4"
           ]
         },
         "zh": {
           "repo": "pingcap/docs-cn",
           "versions": [
             "master",
+            "release-8.5",
             "release-8.4",
             "release-8.3",
-            "release-8.2",
             "release-8.1",
             "release-7.5",
             "release-7.1",
             "release-6.5",
             "release-6.1",
-            "release-5.4",
-            "release-5.3"
+            "release-5.4"
           ]
         },
         "ja": {
           "repo": "pingcap/docs",
           "versions": [
-            "release-8.2",
+            "release-8.5",
             "release-8.1",
             "release-7.5",
             "release-7.1",
@@ -76,6 +74,7 @@
         "v6.0"
       ],
       "archived": [
+        "v8.2",
         "v8.0",
         "v7.6",
         "v7.4",
@@ -87,6 +86,7 @@
         "v6.3",
         "v6.2",
         "v6.0",
+        "v5.3",
         "v5.2",
         "v5.1",
         "v5.0",
@@ -96,25 +96,25 @@
         "v2.1"
       ],
       "searchIndex": {
-        "en": ["v8.4", "v8.1"],
-        "zh": ["v8.4", "v8.1", "v7.5", "v6.5", "v5.4"]
+        "en": ["v8.5", "v8.1"],
+        "zh": ["v8.5", "v8.1", "v7.5", "v6.5", "v5.4"]
       }
     },
     "tidb-data-migration": {
       "languages": {
         "en": {
           "repo": "pingcap/docs-dm",
           "path": "en",
-          "versions": ["release-5.3"]
+          "versions": []
         },
         "zh": {
           "repo": "pingcap/docs-dm",
           "path": "zh",
-          "versions": ["release-5.3"]
+          "versions": []
         }
       },
       "deprecated": ["v1.0"],
-      "archived": ["v2.0", "v1.0"]
+      "archived": ["v5.3", "v2.0", "v1.0"]
     },
     "tidb-in-kubernetes": {
       "stable": "release-1.6",
@@ -127,8 +127,7 @@
             "release-1.6",
             "release-1.5",
             "release-1.4",
-            "release-1.3",
-            "release-1.2"
+            "release-1.3"
           ]
         },
         "zh": {
@@ -139,13 +138,12 @@
             "release-1.6",
             "release-1.5",
             "release-1.4",
-            "release-1.3",
-            "release-1.2"
+            "release-1.3"
           ]
         }
       },
       "deprecated": ["v1.5", "1.4", "v1.3", "v1.2"],
-      "archived": ["v1.1", "v1.0"]
+      "archived": ["v1.2", "v1.1", "v1.0"]
     },
     "tidbcloud": {
       "target": "release-8.1",

diff --git a/markdown-pages/en/tidb-in-kubernetes/master/TOC.md b/markdown-pages/en/tidb-in-kubernetes/master/TOC.md
@@ -113,7 +113,7 @@
     - [Advanced StatefulSet Controller](advanced-statefulset.md)
     - [Admission Controller](enable-admission-webhook.md)
   - [Sysbench Performance Test](benchmark-sysbench.md)
-  - [API References](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md)
+  - [API References](https://github.com/pingcap/tidb-operator/blob/v1.6.1/docs/api-references/docs.md)
   - [Cheat Sheet](cheat-sheet.md)
   - [Required RBAC Rules](tidb-operator-rbac.md)
   - Tools
@@ -125,6 +125,7 @@
   - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
 - Release Notes
   - v1.6
+    - [1.6.1](releases/release-1.6.1.md)
     - [1.6 GA](releases/release-1.6.0.md)
     - [1.6.0-beta.1](releases/release-1.6.0-beta.1.md)
   - v1.5

diff --git a/markdown-pages/en/tidb-in-kubernetes/master/_index.md b/markdown-pages/en/tidb-in-kubernetes/master/_index.md
@@ -68,7 +68,7 @@ hide_commit: true
 
 <LearningPath label="Reference" icon="cloud-dev">
 
-[API Docs](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md)
+[API Docs](https://github.com/pingcap/tidb-operator/blob/v1.6.1/docs/api-references/docs.md)
 
 [Tools](https://docs.pingcap.com/tidb-in-kubernetes/dev/tidb-toolkit)
 

diff --git a/markdown-pages/en/tidb-in-kubernetes/release-1.6/TOC.md b/markdown-pages/en/tidb-in-kubernetes/release-1.6/TOC.md
@@ -113,7 +113,7 @@
     - [Advanced StatefulSet Controller](advanced-statefulset.md)
     - [Admission Controller](enable-admission-webhook.md)
   - [Sysbench Performance Test](benchmark-sysbench.md)
-  - [API References](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md)
+  - [API References](https://github.com/pingcap/tidb-operator/blob/v1.6.1/docs/api-references/docs.md)
   - [Cheat Sheet](cheat-sheet.md)
   - [Required RBAC Rules](tidb-operator-rbac.md)
   - Tools
@@ -125,6 +125,7 @@
   - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
 - Release Notes
   - v1.6
+    - [1.6.1](releases/release-1.6.1.md)
     - [1.6 GA](releases/release-1.6.0.md)
     - [1.6.0-beta.1](releases/release-1.6.0-beta.1.md)
   - v1.5

diff --git a/markdown-pages/en/tidb-in-kubernetes/release-1.6/_index.md b/markdown-pages/en/tidb-in-kubernetes/release-1.6/_index.md
@@ -67,7 +67,7 @@ hide_commit: true
 
 <LearningPath label="Reference" icon="cloud-dev">
 
-[API Docs](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md)
+[API Docs](https://github.com/pingcap/tidb-operator/blob/v1.6.1/docs/api-references/docs.md)
 
 [Tools](https://docs.pingcap.com/tidb-in-kubernetes/v1.6/tidb-toolkit)
 

diff --git a/markdown-pages/en/tidb/master/TOC.md b/markdown-pages/en/tidb/master/TOC.md
@@ -4,7 +4,7 @@
 - [Docs Home](https://docs.pingcap.com/)
 - About TiDB Self-Managed
   - [What is TiDB Self-Managed](/overview.md)
-  - [TiDB 8.4 Release Notes](/releases/release-8.4.0.md)
+  - [TiDB 8.5 Release Notes](/releases/release-8.5.0.md)
   - [Features](/basic-features.md)
   - [MySQL Compatibility](/mysql-compatibility.md)
   - [TiDB Limitations](/tidb-limitations.md)
@@ -13,8 +13,8 @@
 - Get Started
   - [Quick Start with TiDB](/quick-start-with-tidb.md)
   - [Quick Start with HTAP](/quick-start-with-htap.md)
-  - [Learn TiDB SQL](/basic-sql-operations.md)
-  - [Learn HTAP](/explore-htap.md)
+  - [Explore SQL with TiDB](/basic-sql-operations.md)
+  - [Explore HTAP](/explore-htap.md)
   - [Import Example Database](/import-example-data.md)
 - Develop
   - [Overview](/develop/dev-guide-overview.md)
@@ -1075,13 +1075,16 @@
   - [Release Timeline](/releases/release-timeline.md)
   - [TiDB Versioning](/releases/versioning.md)
   - [TiDB Installation Packages](/binary-package.md)
+  - v8.5
+    - [8.5.0](/releases/release-8.5.0.md)
   - v8.4
     - [8.4.0-DMR](/releases/release-8.4.0.md)
   - v8.3
     - [8.3.0-DMR](/releases/release-8.3.0.md)
   - v8.2
     - [8.2.0-DMR](/releases/release-8.2.0.md)
   - v8.1
+    - [8.1.2](/releases/release-8.1.2.md)
     - [8.1.1](/releases/release-8.1.1.md)
     - [8.1.0](/releases/release-8.1.0.md)
   - v8.0

diff --git a/markdown-pages/en/tidb/release-8.1/TOC.md b/markdown-pages/en/tidb/release-8.1/TOC.md
@@ -1067,6 +1067,7 @@
   - [Release Support Policy](https://www.pingcap.com/tidb-release-support-policy/)
   - [TiDB Installation Packages](/binary-package.md)
   - v8.1
+    - [8.1.2](/releases/release-8.1.2.md)
     - [8.1.1](/releases/release-8.1.1.md)
     - [8.1.0](/releases/release-8.1.0.md)
   - v8.0

diff --git a/markdown-pages/en/tidb/release-8.3/TOC.md b/markdown-pages/en/tidb/release-8.3/TOC.md
@@ -1079,6 +1079,7 @@
   - v8.2
     - [8.2.0-DMR](/releases/release-8.2.0.md)
   - v8.1
+    - [8.1.2](/releases/release-8.1.2.md)
     - [8.1.1](/releases/release-8.1.1.md)
     - [8.1.0](/releases/release-8.1.0.md)
   - v8.0

diff --git a/markdown-pages/en/tidb/release-8.4/TOC.md b/markdown-pages/en/tidb/release-8.4/TOC.md
@@ -1081,6 +1081,7 @@
   - v8.2
     - [8.2.0-DMR](/releases/release-8.2.0.md)
   - v8.1
+    - [8.1.2](/releases/release-8.1.2.md)
     - [8.1.1](/releases/release-8.1.1.md)
     - [8.1.0](/releases/release-8.1.0.md)
   - v8.0

diff --git a/markdown-pages/en/tidb/release-8.5/TOC.md b/markdown-pages/en/tidb/release-8.5/TOC.md
@@ -4,7 +4,7 @@
 - [Docs Home](https://docs.pingcap.com/)
 - About TiDB Self-Managed
   - [What is TiDB Self-Managed](/overview.md)
-  - [TiDB 8.4 Release Notes](/releases/release-8.4.0.md)
+  - [TiDB 8.5 Release Notes](/releases/release-8.5.0.md)
   - [Features](/basic-features.md)
   - [MySQL Compatibility](/mysql-compatibility.md)
   - [TiDB Limitations](/tidb-limitations.md)
@@ -13,8 +13,8 @@
 - Get Started
   - [Quick Start with TiDB](/quick-start-with-tidb.md)
   - [Quick Start with HTAP](/quick-start-with-htap.md)
-  - [Learn TiDB SQL](/basic-sql-operations.md)
-  - [Learn HTAP](/explore-htap.md)
+  - [Explore SQL with TiDB](/basic-sql-operations.md)
+  - [Explore HTAP](/explore-htap.md)
   - [Import Example Database](/import-example-data.md)
 - Develop
   - [Overview](/develop/dev-guide-overview.md)
@@ -1075,13 +1075,16 @@
   - [Release Timeline](/releases/release-timeline.md)
   - [TiDB Versioning](/releases/versioning.md)
   - [TiDB Installation Packages](/binary-package.md)
+  - v8.5
+    - [8.5.0](/releases/release-8.5.0.md)
   - v8.4
     - [8.4.0-DMR](/releases/release-8.4.0.md)
   - v8.3
     - [8.3.0-DMR](/releases/release-8.3.0.md)
   - v8.2
     - [8.2.0-DMR](/releases/release-8.2.0.md)
   - v8.1
+    - [8.1.2](/releases/release-8.1.2.md)
     - [8.1.1](/releases/release-8.1.1.md)
     - [8.1.0](/releases/release-8.1.0.md)
   - v8.0

diff --git a/markdown-pages/en/tidbcloud/master/TOC.md b/markdown-pages/en/tidbcloud/master/TOC.md
@@ -214,6 +214,12 @@
        - [Overview](/garbage-collection-overview.md)
        - [Configuration](/garbage-collection-configuration.md)
     - [Tune TiFlash Performance](/tiflash/tune-tiflash-performance.md)
+  - Optimize Resource Allocation
+    - [Overview of Resource Allocation](/tidb-cloud/optimize-resource-allocation.md)
+    - [Resource Control](/tidb-resource-control.md)
+    - TiDB Node Group
+      - [Overview of TiDB Node Group](/tidb-cloud/tidb-node-group-overview.md)
+      - [Manage TiDB Node Groups](/tidb-cloud/tidb-node-group-management.md)
   - [Upgrade a TiDB Cluster](/tidb-cloud/upgrade-tidb-cluster.md)
   - [Delete a TiDB Cluster](/tidb-cloud/delete-tidb-cluster.md)
 - Migrate or Import Data
@@ -378,6 +384,10 @@
     - [Introduction](/tidb-distributed-execution-framework.md)
     - [TiDB Global Sort](/tidb-global-sort.md)
   - Benchmarks
+    - TiDB v8.5
+      - [Performance Highlights](/tidb-cloud/v8.5-performance-highlights.md)
+      - [TPC-C Performance Test Report](/tidb-cloud/v8.5-performance-benchmarking-with-tpcc.md)
+      - [Sysbench Performance Test Report](/tidb-cloud/v8.5-performance-benchmarking-with-sysbench.md)
     - TiDB v8.1
       - [TPC-C Performance Test Report](/tidb-cloud/v8.1-performance-benchmarking-with-tpcc.md)
       - [Sysbench Performance Test Report](/tidb-cloud/v8.1-performance-benchmarking-with-sysbench.md)
@@ -741,7 +751,6 @@
     - [upgrade](/tidb-cloud/ticloud-upgrade.md)
     - [help](/tidb-cloud/ticloud-help.md)
   - [Table Filter](/table-filter.md)
-  - [Resource Control](/tidb-resource-control.md)
   - [URI Formats of External Storage Services](/external-storage-uri.md)
   - [DDL Execution Principles and Best Practices](/ddl-introduction.md)
   - [Troubleshoot Inconsistency Between Data and Indexes](/troubleshoot-data-inconsistency-errors.md)