Merge remote-tracking branch 'upstream/master' into 6.1.3-RN

.gitignore

@@ -6,6 +6,7 @@
 .idea/
 .vscode/
 *.iml
+uml/
 out
 gen
 .DS_Store

TOC-tidb-cloud.md

@@ -180,6 +180,7 @@
 - Integrations
   - [Datadog](/tidb-cloud/monitor-datadog-integration.md)
   - [Prometheus and Grafana](/tidb-cloud/monitor-prometheus-and-grafana-integration.md)
+  - [ProxySQL](/develop/dev-guide-proxysql-integration.md)
   - Terraform
     - [Terraform Integration Overview](/tidb-cloud/terraform-tidbcloud-provider-overview.md)
     - [Get TiDB Cloud Terraform Provider](/tidb-cloud/terraform-get-tidbcloud-provider.md)

TOC.md

@@ -83,7 +83,7 @@
   - Third-Party Support
     - [Third-Party Tools Supported by TiDB](/develop/dev-guide-third-party-support.md)
     - [Known Incompatibility Issues with Third-Party Tools](/develop/dev-guide-third-party-tools-compatibility.md)
-    - [Integrate with ProxySQL](/develop/dev-guide-proxysql-integration.md)
+    - [ProxySQL Integration Guide](/develop/dev-guide-proxysql-integration.md)
 - Deploy
   - [Software and Hardware Requirements](/hardware-and-software-requirements.md)
   - [Environment Configuration Checklist](/check-before-deployment.md)
@@ -135,9 +135,29 @@
     - [Use TiUP (Recommended)](/scale-tidb-using-tiup.md)
     - [Use TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/stable/scale-a-tidb-cluster)
   - Backup and Restore
-    - [Use BR to Back Up Cluster Data](/br-usage-backup-for-maintain.md)
-    - [Use BR to Restore Cluster Data](/br-usage-restore-for-maintain.md)
-    - [BR Use Cases](/backup-and-restore-use-cases-for-maintain.md)
+    - [Overview](/br/backup-and-restore-overview.md)
+    - Architecture
+      - [Architecture Overview](/br/backup-and-restore-design.md)
+      - [Snapshot Backup and Restore Architecture](/br/br-snapshot-architecture.md)
+      - [Log Backup and PITR Architecture](/br/br-log-architecture.md)
+    - Use BR
+      - [Use Overview](/br/br-use-overview.md)
+      - [Snapshot Backup and Restore Guide](/br/br-snapshot-guide.md)
+      - [Log Backup and PITR Guide](/br/br-pitr-guide.md)
+      - [Use Cases](/br/backup-and-restore-use-cases.md)
+      - [Backup Storages](/br/backup-and-restore-storages.md)
+    - BR CLI Manuals
+      - [Overview](/br/use-br-command-line-tool.md)
+      - [Snapshot Backup and Restore Command Manual](/br/br-snapshot-manual.md)
+      - [Log Backup and PITR Command Manual](/br/br-pitr-manual.md)
+    - References
+      - BR Features
+        - [Backup Auto-Tune](/br/br-auto-tune.md)
+        - [Batch Create Table](/br/br-batch-create-table.md)
+      - [Back up and Restore Data Using Dumpling and TiDB Lightning](/backup-and-restore-using-dumpling-lightning.md)
+      - [Back Up and Restore RawKV](/br/rawkv-backup-and-restore.md)
+      - [Incremental Backup and Restore](/br/br-incremental-guide.md)
+      - [External Storages](/br/external-storage.md)
   - [Configure Time Zone](/configure-time-zone.md)
   - [Daily Checklist](/daily-check.md)
   - [Maintain TiFlash](/tiflash/maintain-tiflash.md)
@@ -153,6 +173,7 @@
   - [TiDB Cluster Alert Rules](/alert-rules.md)
   - [TiFlash Alert Rules](/tiflash/tiflash-alert-rules.md)
   - [Customize Configurations of Monitoring Servers](/tiup/customized-montior-in-tiup-environment.md)
+  - [BR Monitoring and Alert](/br/br-monitoring-and-alert.md)
 - Troubleshoot
   - [TiDB Troubleshooting Map](/tidb-troubleshooting-map.md)
   - [Identify Slow Queries](/identify-slow-queries.md)
@@ -470,32 +491,6 @@
       - [FAQ](/dm/dm-faq.md)
       - [Handle Errors](/dm/dm-error-handling.md)
     - [Release Notes](/dm/dm-release-notes.md)
-  - Backup & Restore (BR)
-    - [BR Overview](/br/backup-and-restore-overview.md)
-    - [Deploy and Use BR](/br/br-deployment.md)
-    - [Use BR to Back Up Cluster Data](/br/br-usage-backup.md)
-    - [Use BR to Restore Cluster Data](/br/br-usage-restore.md)
-    - [BR Use Cases](/br/backup-and-restore-use-cases.md)
-    - BR Features
-      - [Auto Tune](/br/br-auto-tune.md)
-      - [Batch Create Table](/br/br-batch-create-table.md)
-    - References
-      - [BR Design Principles](/br/backup-and-restore-design.md)
-      - [BR Command-line](/br/use-br-command-line-tool.md)
-      - [External Storages](/br/backup-and-restore-storages.md)
-      - [Back Up and Restore Data on Amazon S3 Using BR](/br/backup-storage-S3.md)
-      - [Back Up and Restore Data on Azure Blob Storage Using BR](/br/backup-storage-azblob.md)
-      - [Back Up and Restore Data on Google Cloud Storage Using BR](/br/backup-storage-gcs.md)
-      - [Back Up and Restore RawKV](/br/rawkv-backup-and-restore.md)
-      - [Back up and Restore Data Using Dumpling and TiDB Lightning](/backup-and-restore-using-dumpling-lightning.md)
-      - [BR FAQs](/br/backup-and-restore-faq.md)
-  - Point-in-Time Recovery
-    - [PITR Overview](/br/point-in-time-recovery.md)
-    - [Use PITR via CLI](/br/br-log-command-line.md)
-    - [Usage Scenarios](/br/pitr-usage.md)
-    - [Monitoring and Alert](/br/pitr-monitoring-and-alert.md)
-    - [Troubleshooting](/br/pitr-troubleshoot.md)
-    - [Known Issues](/br/pitr-known-issues.md)
   - TiDB Binlog
     - [Overview](/tidb-binlog/tidb-binlog-overview.md)
     - [Quick Start](/tidb-binlog/get-started-with-tidb-binlog.md)
@@ -895,6 +890,7 @@
   - [Cluster Management FAQs](/faq/manage-cluster-faq.md)
   - [High Availability FAQs](/faq/high-availability-faq.md)
   - [High Reliability FAQs](/faq/high-reliability-faq.md)
+  - [Backup and Restore FAQs](/faq/backup-and-restore-faq.md)
 - Release Notes
   - [All Releases](/releases/release-notes.md)
   - [Release Timeline](/releases/release-timeline.md)

_docHome.md

@@ -41,7 +41,15 @@ Get the power of a cloud-native, distributed SQL database built for real-time an
 
 <DocHomeSection label="TiDB" anchor="tidb" id="tidb">
 
-TiDB is an open-source, distributed, NewSQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. It is MySQL compatible and features horizontal scalability, strong consistency, and high availability. You can deploy TiDB on premises or in the cloud.
+<!-- Localization note for TiDB:
+
+- English: use distributed SQL, and start to emphasize HTAP
+- Chinese: can keep "NewSQL" and emphasize one-stop real-time HTAP ("一栈式实时 HTAP")
+- Japanese: use NewSQL because it is well-recognized
+
+-->
+
+TiDB is an open-source distributed SQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. It is MySQL compatible and features horizontal scalability, strong consistency, and high availability. You can deploy TiDB on premises or in the cloud.
 
 <DocHomeCardContainer>
 

_index.md

@@ -5,7 +5,15 @@ hide_sidebar: true
 hide_commit: true
 ---
 
-<LearningPathContainer platform="tidb" title="TiDB" subTitle="TiDB is an open-source NewSQL database that supports Hybrid Transactional and Analytical Processing (HTAP) workloads. Find the guide, samples, and references you need to use 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.">
+
+<!-- Localization note for TiDB:
+
+- English: use distributed SQL, and start to emphasize HTAP
+- Chinese: can keep "NewSQL" and emphasize one-stop real-time HTAP ("一栈式实时 HTAP")
+- Japanese: use NewSQL because it is well-recognized
+
+-->
 
 <LearningPath label="Learn" icon="cloud1">
 

auto-increment.md

@@ -32,7 +32,7 @@ For performance reasons, `AUTO_INCREMENT` numbers are allocated in a batch of va
 
 > **Note:**
 >
-> If you want the `AUTO_INCREMENT` numbers to be monotonic on all TiDB servers and your TiDB version is v6.4.0 or later, you can enable the [MySQL compatibility mode](#mysql-compatibility-mode) which is an experimental feature introduced in v6.4.0.
+> If you want the `AUTO_INCREMENT` numbers to be monotonic on all TiDB servers and your TiDB version is v6.5.0 or later, it is recommended to enable the [MySQL compatibility mode](#mysql-compatibility-mode).
 
 The following is a basic example of `AUTO_INCREMENT`:
 
@@ -355,10 +355,6 @@ The value (ID) implicitly assigned to auto-increment columns satisfies the follo
 
 TiDB v6.4.0 introduces a centralized auto-increment ID allocating service. In each request, an auto-increment ID is allocated from this service instead of caching data in TiDB instances.
 
-> **Warning:**
->
-> This is still an experimental feature. It is **NOT** recommended that you use it in the production environment.
-
 Currently, the centralized allocating service is in the TiDB process and works like DDL Owner. One TiDB instance allocates IDs as the primary node and other TiDB instances work as secondary nodes. To ensure high availability, when the primary instance fails, TiDB starts automatic failover.
 
 To use the MySQL compatibility mode, you can set `AUTO_ID_CACHE` to `1` when creating a table: