Skip to content

Commit 6935724

Browse files
authored
feature/v2: change branch of tidb-operator (#2976)
1 parent 1e97c77 commit 6935724

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/ISSUE_TEMPLATE/question.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Before submitting your question, make sure you have:
1313
- Searched existing Stack Overflow questions.
1414
- Googled your question.
1515
- Read the documentation:
16-
- [TiDB Operator (en)](https://github.com/pingcap/docs-tidb-operator/tree/master/en)
17-
- [TiDB Operator (zh)](https://github.com/pingcap/docs-tidb-operator/tree/master/zh)
16+
- [TiDB Operator (en)](https://docs.pingcap.com/tidb-in-kubernetes/dev/)
17+
- [TiDB Operator (zh)](https://docs.pingcap.com/zh/tidb-in-kubernetes/dev/)
1818
<!-- Searched the open and closed [GitHub issues](https://github.com/pingcap/docs-tidb-operator/issues?q=is%3Aissue).-->
1919

2020
Now, please describe your question here:

.github/pull_request_template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
<!--Tick the checkbox(es) below to choose the TiDB Operator version(s) that your changes apply to.-->
1414

15-
- [ ] master (the latest development version for v1.x)
16-
- [ ] feature/v2 (the latest development version for v2.x)
15+
- [ ] main (the latest development version for v2.x)
1716
- [ ] v2.0 (TiDB Operator 2.0 versions)
17+
- [ ] release-1.x (the latest development version for v1.x)
1818
- [ ] v1.6 (TiDB Operator 1.6 versions)
1919
- [ ] v1.5 (TiDB Operator 1.5 versions)
2020
- [ ] v1.4 (TiDB Operator 1.4 versions)

.github/workflows/dispatch.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ name: Trigger docs site update
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
- release-*
8+
- '!release-1.x'
89

910
jobs:
1011
trigger:

.github/workflows/media.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: Upload media files to Qiniu when they change
22
on:
33
push:
44
branches:
5-
- master
6-
- feature/v2
5+
- main
76
- release-*
87
paths:
98
- media/**

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ This repository stores all the source files of [TiDB on Kubernetes documentation
44

55
Currently, the official documentation supports two languages:
66

7-
- `en`: [documentation in English](https://docs.pingcap.com/tidb-in-kubernetes/stable)
8-
- `zh`: [documentation in Chinese](https://docs.pingcap.com/zh/tidb-in-kubernetes/stable)
7+
- `en`: [documentation in English](https://docs.pingcap.com/tidb-in-kubernetes/stable/)
8+
- `zh`: [documentation in Chinese](https://docs.pingcap.com/zh/tidb-in-kubernetes/stable/)
99

1010
You can use Google Translate to view the documentation in different languages. For example:
1111

12-
- `fr`: [documentation in French](https://translate.google.com/translate?hl=en&sl=en&tl=fr&u=https%3A%2F%2Fgithub.com%2Fpingcap%2Fdocs-tidb-operator%2Fblob%2Fmaster%2Fen%2FTOC.md)
13-
- `ja`: [documentation in Japanese](https://translate.google.com/translate?hl=en&sl=en&tl=ja&u=https://github.com/pingcap/docs-tidb-operator/blob/master/en/TOC.md)
14-
- `ko`: [documentation in Korean](https://translate.google.com/translate?hl=en&sl=en&tl=ko&u=https%3A%2F%2Fgithub.com%2Fpingcap%2Fdocs-tidb-operator%2Fblob%2Fmaster%2Fen%2FTOC.md)
12+
- `fr`: [documentation in French](https://translate.google.com/translate?hl=en&sl=en&tl=fr&u=https%3A%2F%2Fgithub.com%2Fpingcap%2Fdocs-tidb-operator%2Fblob%2Ffeature/v2%2Fen%2FTOC.md)
13+
- `ja`: [documentation in Japanese](https://translate.google.com/translate?hl=en&sl=en&tl=ja&u=https://github.com/pingcap/docs-tidb-operator/blob/feature/v2/en/TOC.md)
14+
- `ko`: [documentation in Korean](https://translate.google.com/translate?hl=en&sl=en&tl=ko&u=https%3A%2F%2Fgithub.com%2Fpingcap%2Fdocs-tidb-operator%2Fblob%2Ffeature/v2%2Fen%2FTOC.md)
1515

1616
## Documentation versions
1717

1818
Currently, we maintain the following versions for TiDB on Kubernetes documentation, each with a separate branch:
1919

2020
| Branch name | Version description |
2121
| :--- | :-- |
22-
| `master` | the latest development version for v1.x |
23-
| `feature/v2` | the latest development version for v2.x |
22+
| `main` | the latest development version for v2.x |
2423
| `release-2.0` | the 2.0 version |
24+
| `release-1.x` | the latest development version for v1.x |
2525
| `release-1.6` | the 1.6 version (latest stable) |
2626
| `release-1.5` | the 1.5 version |
2727
| `release-1.4` | the 1.4 version |

0 commit comments

Comments
 (0)