From e811e9b3eca36401bb55576621a057b1b88f774f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Tue, 29 Jun 2021 16:55:53 +0200 Subject: [PATCH 1/3] Add v5.1.0 / release-5.1 where it is missing Related to fff8d90edfa8a4bf23aa9d4fa3e1ab247b046b13 --- CONTRIBUTING.md | 2 ++ README.md | 1 + 2 files changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c6a7e73c96afd..9bf198b53dc6d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,6 +34,7 @@ Currently, we maintain six versions of TiDB documentation, each with a separate | Docs branch name | Version description | | :--- | :--- | | `master` branch | the latest development version | +| `release-5.1` branch | the 5.1 stable version | | `release-5.0` branch | the 5.0 stable version | | `release-4.0` branch | the 4.0 stable version | | `release-3.1` branch | the 3.1 stable version | @@ -51,6 +52,7 @@ Currently, we maintain six versions of TiDB documentation, each with a separate - If your changes apply to only one docs version, just submit a PR to the corresponding version branch. - 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-5.1` label: sre-bot will submit a PR to the `release-5.1` branch. - `needs-cherry-pick-5.0` label: sre-bot will submit a PR to the `release-5.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. diff --git a/README.md b/README.md index bcffc79659b5e..8981961c06f24 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ Currently, we maintain the following versions of TiDB documentation in different | Branch name | TiDB docs version | | :---------|:----------| | [`master`](https://github.com/pingcap/docs/tree/master) | The latest development version | +| [`release-5.1`](https://github.com/pingcap/docs/tree/release-5.1) | 5.1 stable version | | [`release-5.0`](https://github.com/pingcap/docs/tree/release-5.0) | 5.0 stable version | | [`release-4.0`](https://github.com/pingcap/docs/tree/release-4.0) | 4.0 stable version | | [`release-3.1`](https://github.com/pingcap/docs/tree/release-3.1) | 3.1 stable version | From f4e3215f9d5a8a03c322811cc04e55b1be039c7b Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 1 Jul 2021 10:19:04 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8981961c06f24..3049740008c1b 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Currently, we maintain the following versions of TiDB documentation in different | Branch name | TiDB docs version | | :---------|:----------| | [`master`](https://github.com/pingcap/docs/tree/master) | The latest development version | -| [`release-5.1`](https://github.com/pingcap/docs/tree/release-5.1) | 5.1 stable version | +| [`release-5.1`](https://github.com/pingcap/docs/tree/release-5.1) | 5.1 version | | [`release-5.0`](https://github.com/pingcap/docs/tree/release-5.0) | 5.0 stable version | | [`release-4.0`](https://github.com/pingcap/docs/tree/release-4.0) | 4.0 stable version | | [`release-3.1`](https://github.com/pingcap/docs/tree/release-3.1) | 3.1 stable version | From 5c49f7d32e63d4f6e4df71e62e6b3e0adecbe3ed Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 1 Jul 2021 10:19:22 +0800 Subject: [PATCH 3/3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9bf198b53dc6d..476b6d6d559e2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,7 +34,7 @@ Currently, we maintain six versions of TiDB documentation, each with a separate | Docs branch name | Version description | | :--- | :--- | | `master` branch | the latest development version | -| `release-5.1` branch | the 5.1 stable version | +| `release-5.1` branch | the 5.1 version | | `release-5.0` branch | the 5.0 stable version | | `release-4.0` branch | the 4.0 stable version | | `release-3.1` branch | the 3.1 stable version |