From 129b40cd3237604d5779aa4cbdc94faaef4bed4c Mon Sep 17 00:00:00 2001
From: yikeke <yikeke@pingcap.com>
Date: Tue, 3 Mar 2020 20:12:39 +0800
Subject: [PATCH 1/5] .github: update pull request template

---
 .github/pull_request_template.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 0dd56a1ee434..64db2718136c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -4,18 +4,27 @@
 
 <!--Tell us what you did and why. This is important to help reviewers and community members understand your PR.-->
 
-### What is the related PR or file link(s)? <!--Required-->
+### Which TiDB version(s) do your changes apply to? <!--Required-->
+
+<!--Tick the checkbox(es) below to choose the TiDB version(s) that your changes apply to.-->
+
+- [ ] master (the latest development version)
+- [ ] v4.0 (TiDB 4.0 versions)
+- [ ] v3.1 (TiDB 3.1 versions)
+- [ ] v3.0 (TiDB 3.0 versions)
+- [ ] v2.1 (TiDB 2.1 versions)
+
+### What is the related PR or file link(s)? <!--Optional-->
 
 <!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->
 
-- Reference link(s):<!--Give links here-->
-- This PR is to align with:<!--Give links here-->
-- [ ] N/A (not applicable)
+- This PR is translated from:<!--Give links here-->
+- Other reference link(s):<!--Give links here-->
 
 **Important Notice:**
 
 **If your changes apply to multiple TiDB documentation versions**, to trigger the bot to cherry-pick this PR to other release branches, make sure you add labels such as:
 
-- **needs-cherry-pick-3.0**
 - **needs-cherry-pick-3.1**
+- **needs-cherry-pick-3.0**
 - **needs-cherry-pick-2.1**

From 85c17e51d14ed6a9ac2ff4d231eb037967569828 Mon Sep 17 00:00:00 2001
From: yikeke <yikeke@pingcap.com>
Date: Tue, 3 Mar 2020 20:14:25 +0800
Subject: [PATCH 2/5] Update pull_request_template.md

---
 .github/pull_request_template.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 64db2718136c..cdd0a7aabc2b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,10 +1,10 @@
 <!--Thanks for your contribution to TiDB documentation. See [CONTRIBUTING](https://github.com/pingcap/community/blob/master/CONTRIBUTING.md) before filing this pull request (PR).-->
 
-### What is changed, added or deleted? <!--Required-->
+### What is changed, added or deleted? <Required>
 
 <!--Tell us what you did and why. This is important to help reviewers and community members understand your PR.-->
 
-### Which TiDB version(s) do your changes apply to? <!--Required-->
+### Which TiDB version(s) do your changes apply to? <Required>
 
 <!--Tick the checkbox(es) below to choose the TiDB version(s) that your changes apply to.-->
 
@@ -14,7 +14,7 @@
 - [ ] v3.0 (TiDB 3.0 versions)
 - [ ] v2.1 (TiDB 2.1 versions)
 
-### What is the related PR or file link(s)? <!--Optional-->
+### What is the related PR or file link(s)? <Optional>
 
 <!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->
 

From 86df4c42da6eee0f3caf28e9613149aeb6b2cac0 Mon Sep 17 00:00:00 2001
From: yikeke <yikeke@pingcap.com>
Date: Tue, 3 Mar 2020 20:15:28 +0800
Subject: [PATCH 3/5] Update pull_request_template.md

---
 .github/pull_request_template.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index cdd0a7aabc2b..a2fed0d570af 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,10 +1,11 @@
 <!--Thanks for your contribution to TiDB documentation. See [CONTRIBUTING](https://github.com/pingcap/community/blob/master/CONTRIBUTING.md) before filing this pull request (PR).-->
 
-### What is changed, added or deleted? <Required>
+### What is changed, added or deleted? (Required)
 
 <!--Tell us what you did and why. This is important to help reviewers and community members understand your PR.-->
+Update pull request template
 
-### Which TiDB version(s) do your changes apply to? <Required>
+### Which TiDB version(s) do your changes apply to? (Required)
 
 <!--Tick the checkbox(es) below to choose the TiDB version(s) that your changes apply to.-->
 
@@ -14,7 +15,7 @@
 - [ ] v3.0 (TiDB 3.0 versions)
 - [ ] v2.1 (TiDB 2.1 versions)
 
-### What is the related PR or file link(s)? <Optional>
+### What is the related PR or file link(s)? (Optional)
 
 <!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->
 

From 082c55a39c9f2eaaf3aee98d76917049a9d361a1 Mon Sep 17 00:00:00 2001
From: yikeke <yikeke@pingcap.com>
Date: Tue, 3 Mar 2020 21:06:37 +0800
Subject: [PATCH 4/5] Update pull_request_template.md

---
 .github/pull_request_template.md | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a2fed0d570af..2857b6caf06b 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -3,29 +3,21 @@
 ### What is changed, added or deleted? (Required)
 
 <!--Tell us what you did and why. This is important to help reviewers and community members understand your PR.-->
-Update pull request template
 
 ### Which TiDB version(s) do your changes apply to? (Required)
 
 <!--Tick the checkbox(es) below to choose the TiDB version(s) that your changes apply to.-->
 
-- [ ] master (the latest development version)
-- [ ] v4.0 (TiDB 4.0 versions)
+- [ ] master (the latest development version, including v4.0 changes for now)
 - [ ] v3.1 (TiDB 3.1 versions)
 - [ ] v3.0 (TiDB 3.0 versions)
 - [ ] v2.1 (TiDB 2.1 versions)
 
+**If you select two or more versions from above**, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you **must** add corresponding labels such as **needs-cherry-pick-3.1**, **needs-cherry-pick-3.0**, and **needs-cherry-pick-2.1**.
+
 ### What is the related PR or file link(s)? (Optional)
 
 <!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->
 
 - This PR is translated from:<!--Give links here-->
 - Other reference link(s):<!--Give links here-->
-
-**Important Notice:**
-
-**If your changes apply to multiple TiDB documentation versions**, to trigger the bot to cherry-pick this PR to other release branches, make sure you add labels such as:
-
-- **needs-cherry-pick-3.1**
-- **needs-cherry-pick-3.0**
-- **needs-cherry-pick-2.1**

From c77289f48840040d2a177b9b1bd6ba4d8dfe5ee8 Mon Sep 17 00:00:00 2001
From: yikeke <yikeke@pingcap.com>
Date: Tue, 3 Mar 2020 22:21:49 +0800
Subject: [PATCH 5/5] Update pull_request_template.md

---
 .github/pull_request_template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 2857b6caf06b..abc6eb925e3a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -15,7 +15,7 @@
 
 **If you select two or more versions from above**, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you **must** add corresponding labels such as **needs-cherry-pick-3.1**, **needs-cherry-pick-3.0**, and **needs-cherry-pick-2.1**.
 
-### What is the related PR or file link(s)? (Optional)
+### What is the related PR or file link(s)?
 
 <!--Give us some reference link(s) that might help quickly review and merge your PR, for example, a file link that supports why you changed the document.-->