From 9aa9ff4501666356adb2ac0a619418d2055ab561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 1 Jul 2021 04:23:26 +0200 Subject: [PATCH 1/3] This is an automated cherry-pick of #5893 Signed-off-by: ti-chi-bot --- CONTRIBUTING.md | 2 ++ README.md | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c6a7e73c96afd..476b6d6d559e2 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 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 8d79a99390339..dc3c5351a6610 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,11 @@ 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 | +<<<<<<< HEAD +======= +| [`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 | +>>>>>>> 8c36728d2 (Add v5.1.0 / release-5.1 where it is missing (#5893)) | [`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 | | [`release-3.0`](https://github.com/pingcap/docs/tree/release-3.0) | 3.0 stable version | From 4760f271abe43d5d9387520a267b64f1cc1872e8 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 1 Jul 2021 10:27:46 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index dc3c5351a6610..721ff9db043f5 100644 --- a/README.md +++ b/README.md @@ -24,11 +24,8 @@ 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 | -<<<<<<< HEAD -======= | [`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 | ->>>>>>> 8c36728d2 (Add v5.1.0 / release-5.1 where it is missing (#5893)) | [`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 | | [`release-3.0`](https://github.com/pingcap/docs/tree/release-3.0) | 3.0 stable version | From b0fb549779cf814f1419be6c11cdc2b7ea694455 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 1 Jul 2021 11:30:17 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 721ff9db043f5..d44fec403b573 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,6 @@ Currently, we maintain the following versions of TiDB documentation in different ## Contributing -[contribution-map](https://github.com/pingcap/community/tree/master/special-interest-groups/sig-docs) +[contribution-map](https://github.com/pingcap/community/tree/master/special-interest-groups/sig-docs) See [TiDB Documentation Contributing Guide](/CONTRIBUTING.md) to become a contributor! 🤓