Merge remote-tracking branch 'upstream/master'

hfxsd · Aug 26, 2024 · 03c9e2b · 03c9e2b
2 parents c3c47e2 + 582bc09
commit 03c9e2b
Show file tree

Hide file tree

Showing 6 changed files with 653 additions and 210 deletions.
diff --git a/TOC.md b/TOC.md
@@ -4,7 +4,7 @@
 - [文档中心](https://docs.pingcap.com/zh)
 - 关于 TiDB
   - [TiDB 简介](/overview.md)
-  - [TiDB 8.2 Release Notes](/releases/release-8.2.0.md)
+  - [TiDB 8.3 Release Notes](/releases/release-8.3.0.md)
   - [功能概览](/basic-features.md)
   - [与 MySQL 的兼容性](/mysql-compatibility.md)
   - [使用限制](/tidb-limitations.md)

diff --git a/basic-features.md b/basic-features.md
diff --git a/command-line-flags-for-pd-configuration.md b/command-line-flags-for-pd-configuration.md
@@ -79,7 +79,7 @@ PD 可以通过命令行参数或环境变量配置。
 ## `--name`
 
 + 当前 PD 的名字。
-+ 默认："pd"
++ 默认："pd-${hostname}"
 + 如果你需要启动多个 PD，一定要给 PD 使用不同的名字
 
 ## `--cacert`

diff --git a/releases/release-8.3.0.md b/releases/release-8.3.0.md
diff --git a/releases/release-notes.md b/releases/release-notes.md
@@ -10,6 +10,10 @@ summary: 介绍 TiDB 版本发布历史。
 
 TiDB 历史版本发布声明如下：
 
+## 8.3
+
+- [8.3.0-DMR](/releases/release-8.3.0.md): 2024-08-22
+
 ## 8.2
 
 - [8.2.0-DMR](/releases/release-8.2.0.md): 2024-07-11

diff --git a/releases/release-timeline.md b/releases/release-timeline.md
@@ -11,6 +11,7 @@ summary: 了解 TiDB 的版本发布时间线。
 
 | 版本 | 发布日期 |
 | :--- | :--- |
+| [8.3.0-DMR](/releases/release-8.3.0.md) | 2024-08-22 |
 | [7.5.3](/releases/release-7.5.3.md) | 2024-08-05 |
 | [8.2.0-DMR](/releases/release-8.2.0.md) | 2024-07-11 |
 | [6.5.10](/releases/release-6.5.10.md) | 2024-06-20 |