From 3dbe1ff518feb76a9f5044daeec3ec6eaf4d9580 Mon Sep 17 00:00:00 2001
From: Keke Yi <40977455+yikeke@users.noreply.github.com>
Date: Sat, 4 Apr 2020 11:31:43 +0800
Subject: [PATCH] *: update guiding resources (#2165)

---
 .github/pull_request_template.md |  5 +++--
 CONTRIBUTING.md                  | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index abc6eb925e3ae..2048bba0e68b2 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,12 +8,13 @@
 
 <!--Tick the checkbox(es) below to choose the TiDB version(s) that your changes apply to.-->
 
-- [ ] master (the latest development version, including v4.0 changes for now)
+- [ ] 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)
 
-**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**.
+**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-4.0**, **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)?
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c8ebf412af0ab..7ac17ee8a7a40 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -34,9 +34,10 @@ Currently, we maintain four versions of TiDB documentation, each with a separate
 | Docs branch name | Version description |
 | :--- | :--- |
 | `master` branch | the latest development version |
-| `release-3.1` branch | the 3.1 Beta version |
-| `release-3.0` branch | the latest 3.0 stable version |
-| `release-2.1` branch | the latest 2.1 stable version |
+| `release-4.0` branch | the 4.0 Beta version |
+| `release-3.1` branch | the 3.1 RC version |
+| `release-3.0` branch | the 3.0 stable version |
+| `release-2.1` branch | the 2.1 stable version |
 
 > **Note:**
 >
@@ -50,8 +51,9 @@ Currently, we maintain four versions of TiDB documentation, each with a separate
 
 - If your changes apply to multiple docs versions, you don't have to submit a PR to each branch. Instead, after you submit your PR, trigger the sre-bot to submit a PR to other version branches by adding one or several of the following labels as needed. Once the current PR is merged, sre-bot will start to work.
 
-    - `needs-cherry-pick-3.0` label: sre-bot will submit a PR to the `release-3.0` branch.
+    - `needs-cherry-pick-4.0` label: sre-bot will submit a PR to the `release-4.0` branch.
     - `needs-cherry-pick-3.1` label: sre-bot will submit a PR to the `release-3.1` branch.
+    - `needs-cherry-pick-3.0` label: sre-bot will submit a PR to the `release-3.0` branch.
     - `needs-cherry-pick-2.1` label: sre-bot will submit a PR to the `release-2.1` branch.
 
 - If most of your changes apply to multiple docs versions but some differences exist among versions, you still can use cherry-pick labels to let sre-bot create PRs to other versions. After the PR to another version is successfully submitted by sre-bot, you can make changes to that PR.