Sync the scaffold from pingcap/docs-staging@ab43950

Oreoxmt · Jan 31, 2024 · 9872696 · 9872696
1 parent 2e8e38a
commit 9872696
Show file tree

Hide file tree

Showing 26 changed files with 3,120 additions and 28 deletions.
diff --git a/docs.json b/docs.json
@@ -7,6 +7,7 @@
           "repo": "pingcap/docs",
           "versions": [
             "master",
+            "release-7.6",
             "release-7.5",
             "release-7.4",
             "release-7.3",
@@ -25,6 +26,7 @@
           "repo": "pingcap/docs-cn",
           "versions": [
             "master",
+            "release-7.6",
             "release-7.5",
             "release-7.4",
             "release-7.3",
@@ -42,6 +44,7 @@
         "ja": {
           "repo": "pingcap/docs",
           "versions": [
+            "release-7.6",
             "release-7.5",
             "release-7.4",
             "release-7.3",
@@ -63,7 +66,7 @@
         "v5.3",
         "v5.4"
       ],
-      "dmr": ["v7.4", "v7.3", "v7.2", "v7.0", "v6.6", "v6.4", "v6.3", "v6.2", "v6.0"],
+      "dmr": ["v7.6", "v7.4", "v7.3", "v7.2", "v7.0", "v6.6", "v6.4", "v6.3", "v6.2", "v6.0"],
       "archived": ["v7.2", "v7.0", "v6.6", "v6.4", "v6.3", "v6.2", "v6.0", "v3.1", "v3.0", "v2.1"],
       "searchIndex": ["v7.5", "v7.1", "v6.5", "v6.1", "v5.4", "v5.1"]
     },
@@ -123,15 +126,21 @@
           },
           {
             "id": "v1beta1",
-            "pathname": "v1beta1",
+            "pathname": "v1beta1/billing",
             "production": "https://download.pingcap.org/tidbcloud-oas-v1beta1-billing.swagger.json",
             "preview": "https://download.pingcap.org/tidbcloud-oas-v1beta1-billing.swagger.json"
           },
+          {
+            "id": "v1beta1",
+            "pathname": "v1beta1/apikey",
+            "production": "https://download.pingcap.org/tidbcloud-oas-v1beta1-apikey.swagger.json",
+            "preview": "https://download.pingcap.org/tidbcloud-oas-v1beta1-apikey.swagger.json"
+          },
           {
             "id": "msp",
             "pathname": "msp/v1beta1",
-            "production": "https://download.pingcap.org/tidbcloud-oas-v1beta-msp.json",
-            "preview": "https://download.pingcap.org/tidbcloud-oas-v1beta-msp.json"
+            "production": "https://download.pingcap.org/tidbcloud-oas-v1beta1-msp.json",
+            "preview": "https://download.pingcap.org/tidbcloud-oas-v1beta1-msp.json"
           }
         ]
       }

diff --git a/markdown-pages/en/tidb-in-kubernetes/master/TOC.md b/markdown-pages/en/tidb-in-kubernetes/master/TOC.md
@@ -22,6 +22,7 @@
     - [Alibaba Cloud ACK](deploy-on-alibaba-cloud.md)
   - [Deploy TiDB on ARM64 Machines](deploy-cluster-on-arm64.md)
   - [Deploy TiFlash to Explore TiDB HTAP](deploy-tiflash.md)
+  - [Deploy TiProxy Load Balancer](deploy-tiproxy.md)
   - Deploy TiDB Across Multiple Kubernetes Clusters
     - [Build Multiple Interconnected AWS EKS Clusters](build-multi-aws-eks.md)
     - [Build Multiple Interconnected GKE Clusters](build-multi-gcp-gke.md)
@@ -125,6 +126,7 @@
   - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
 - Release Notes
   - v1.5
+    - [1.5.2](releases/release-1.5.2.md)
     - [1.5.1](releases/release-1.5.1.md)
     - [1.5 GA](releases/release-1.5.0.md)
     - [1.5.0-beta.1](releases/release-1.5.0-beta.1.md)

diff --git a/markdown-pages/en/tidb-in-kubernetes/release-1.5/TOC.md b/markdown-pages/en/tidb-in-kubernetes/release-1.5/TOC.md
@@ -22,6 +22,7 @@
     - [Alibaba Cloud ACK](deploy-on-alibaba-cloud.md)
   - [Deploy TiDB on ARM64 Machines](deploy-cluster-on-arm64.md)
   - [Deploy TiFlash to Explore TiDB HTAP](deploy-tiflash.md)
+  - [Deploy TiProxy Load Balancer](deploy-tiproxy.md)
   - Deploy TiDB Across Multiple Kubernetes Clusters
     - [Build Multiple Interconnected AWS EKS Clusters](build-multi-aws-eks.md)
     - [Build Multiple Interconnected GKE Clusters](build-multi-gcp-gke.md)
@@ -76,12 +77,12 @@
     - Persistent Volumes
       - [Back Up Data](backup-to-pv-using-br.md)
       - [Restore Data](restore-from-pv-using-br.md)
-    - Snapshot Backup and Restore
-      - [Architecture](volume-snapshot-backup-restore.md)
-      - [Back Up Data Using EBS Snapshots](backup-to-aws-s3-by-snapshot.md)
-      - [Restore Data from EBS Snapshots](restore-from-aws-s3-by-snapshot.md)
-      - [Backup and Restore Performance](backup-restore-snapshot-perf.md)
-      - [FAQs](backup-restore-faq.md)
+    - Snapshot Backup and Restore across Multiple Kubernetes
+      - [BR Federation Architecture](br-federation-architecture.md)
+      - [Deploy BR Federation](deploy-br-federation.md)
+      - [Back Up Data Using EBS Snapshots](backup-by-ebs-snapshot-across-multiple-kubernetes.md)
+      - [Restore Data from EBS Snapshots](restore-from-ebs-snapshot-across-multiple-kubernetes.md)
+      - [FAQs](backup-restore-by-ebs-snapshot-faq.md)
   - Maintain
     - [Restart a TiDB Cluster](restart-a-tidb-cluster.md)
     - [Destroy a TiDB Cluster](destroy-a-tidb-cluster.md)
@@ -113,7 +114,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.5.1/docs/api-references/docs.md)
+  - [API References](https://github.com/pingcap/tidb-operator/blob/v1.5.2/docs/api-references/docs.md)
   - [Cheat Sheet](cheat-sheet.md)
   - [Required RBAC Rules](tidb-operator-rbac.md)
   - Tools
@@ -125,6 +126,7 @@
   - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
 - Release Notes
   - v1.5
+    - [1.5.2](releases/release-1.5.2.md)
     - [1.5.1](releases/release-1.5.1.md)
     - [1.5 GA](releases/release-1.5.0.md)
     - [1.5.0-beta.1](releases/release-1.5.0-beta.1.md)

diff --git a/markdown-pages/en/tidb-in-kubernetes/release-1.5/_index.md b/markdown-pages/en/tidb-in-kubernetes/release-1.5/_index.md
@@ -70,7 +70,7 @@ hide_commit: true
 
 <LearningPath label="Reference" icon="cloud-dev">
 
-[API Docs](https://github.com/pingcap/tidb-operator/blob/v1.5.1/docs/api-references/docs.md)
+[API Docs](https://github.com/pingcap/tidb-operator/blob/v1.5.2/docs/api-references/docs.md)
 
 [Tools](https://docs.pingcap.com/tidb-in-kubernetes/dev/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
   - [TiDB Introduction](/overview.md)
-  - [TiDB 7.5 Release Notes](/releases/release-7.5.0.md)
+  - [TiDB 7.6 Release Notes](/releases/release-7.6.0.md)
   - [Features](/basic-features.md)
   - [MySQL Compatibility](/mysql-compatibility.md)
   - [TiDB Limitations](/tidb-limitations.md)
@@ -718,6 +718,7 @@
       - [`ADMIN PAUSE DDL`](/sql-statements/sql-statement-admin-pause-ddl.md)
       - [`ADMIN RECOVER INDEX`](/sql-statements/sql-statement-admin-recover.md)
       - [`ADMIN RESUME DDL`](/sql-statements/sql-statement-admin-resume-ddl.md)
+      - [`ADMIN [SET|SHOW|UNSET] BDR ROLE`](/sql-statements/sql-statement-admin-bdr-role.md)
       - [`ADMIN SHOW DDL [JOBS|JOB QUERIES]`](/sql-statements/sql-statement-admin-show-ddl.md)
       - [`ADMIN SHOW TELEMETRY`](/sql-statements/sql-statement-admin-show-telemetry.md)
       - [`ALTER DATABASE`](/sql-statements/sql-statement-alter-database.md)
@@ -975,6 +976,7 @@
         - [Overview](/performance-schema/performance-schema.md)
         - [`SESSION_CONNECT_ATTRS`](/performance-schema/performance-schema-session-connect-attrs.md)
     - [Metadata Lock](/metadata-lock.md)
+    - [TiDB DDL V2](/ddl-v2.md)
   - UI
     - TiDB Dashboard
       - [Overview](/dashboard/dashboard-intro.md)
@@ -1029,6 +1031,8 @@
   - [Release Timeline](/releases/release-timeline.md)
   - [TiDB Versioning](/releases/versioning.md)
   - [TiDB Installation Packages](/binary-package.md)
+  - v7.6
+    - [7.6.0](/releases/release-7.6.0.md)
   - v7.5
     - [7.5.0](/releases/release-7.5.0.md)
   - v7.4

diff --git a/markdown-pages/en/tidb/master/_docHome.md b/markdown-pages/en/tidb/master/_docHome.md
@@ -3,6 +3,7 @@ title: PingCAP Documentation
 hide_sidebar: true
 hide_commit: true
 hide_leftNav: true
+summary: PingCAP Documentation provides how-to guides and references for using TiDB Cloud and TiDB, including data migration and application building. TiDB Cloud is a fully-managed Database-as-a-Service, offering easy access to the power of a cloud-native, distributed SQL database. TiDB is an open-source distributed SQL database with MySQL compatibility, horizontal scalability, and high availability. Developers can access documentation for application development and explore additional resources such as TiDB Playground, PingCAP Education, and community engagement opportunities.
 ---
 
 <DocHomeContainer title="PingCAP Documentation" subTitle="Explore the how-to guides and references you need to use TiDB Cloud and TiDB, migrate data, and build your applications on the database.">

diff --git a/markdown-pages/en/tidb/master/_index.md b/markdown-pages/en/tidb/master/_index.md
@@ -3,6 +3,7 @@ title: TiDB Introduction
 aliases: ["/docs/dev/", "/docs/dev/adopters/", "/tidb/dev/adopters"]
 hide_sidebar: true
 hide_commit: true
+summary: TiDB is an open-source distributed SQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. The guide provides information on features, TiFlash, development, deployment, migration, maintenance, monitoring, tuning, tools, and references. It covers everything from quick start to advanced configurations and tools for TiDB.
 ---
 
 <LearningPathContainer platform="tidb" title="TiDB" subTitle="TiDB is an open-source distributed SQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. Find the guide, samples, and references you need to use TiDB.">

diff --git a/markdown-pages/en/tidb/release-7.5/_docHome.md b/markdown-pages/en/tidb/release-7.5/_docHome.md
@@ -3,6 +3,7 @@ title: PingCAP Documentation
 hide_sidebar: true
 hide_commit: true
 hide_leftNav: true
+summary: PingCAP Documentation provides how-to guides and references for using TiDB Cloud and TiDB, including data migration and application building. TiDB Cloud is a fully-managed Database-as-a-Service, offering easy access to the power of a cloud-native, distributed SQL database. TiDB is an open-source distributed SQL database with MySQL compatibility, horizontal scalability, and high availability. Developers can access documentation for application development and explore additional resources such as TiDB Playground, PingCAP Education, and community engagement opportunities.
 ---
 
 <DocHomeContainer title="PingCAP Documentation" subTitle="Explore the how-to guides and references you need to use TiDB Cloud and TiDB, migrate data, and build your applications on the database.">

diff --git a/markdown-pages/en/tidb/release-7.5/_index.md b/markdown-pages/en/tidb/release-7.5/_index.md
@@ -2,6 +2,7 @@
 title: TiDB Introduction
 hide_sidebar: true
 hide_commit: true
+summary: TiDB is an open-source distributed SQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. The guide provides information on features, TiFlash, development, deployment, migration, maintenance, monitoring, tuning, tools, and references. It covers everything from quick start to advanced configurations and tools for TiDB.
 ---
 
 <LearningPathContainer platform="tidb" title="TiDB" subTitle="TiDB is an open-source distributed SQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. Find the guide, samples, and references you need to use TiDB.">