You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
- The official blog is not for repurposing existing content from a third party as new content.
104
-
- The [license](https://github.com/kubernetes/website/blob/master/LICENSE) for the blog allows commercial use of the content for commercial purposes, just not the other way around.
104
+
- The [license](https://github.com/kubernetes/website/blob/main/LICENSE) for the blog allows commercial use of the content for commercial purposes, just not the other way around.
105
105
- Blog posts should aim to be future proof
106
106
- Given the development velocity of the project, we want evergreen content that won't require updates to stay accurate for the reader.
107
107
- It can be a better choice to add a tutorial or update official documentation than to write a high level overview as a blog post.
108
108
- Consider concentrating the long technical content as a call to action of the blog post, and focus on the problem space or why readers should care.
@@ -144,7 +144,7 @@ SIG Docs [博客子项目](https://github.com/kubernetes/community/tree/master/s
144
144
145
145
要提交博文,你可以遵从以下指南:
146
146
<!--
147
-
- [Open a pull request](/docs/contribute/new-content/open-a-pr/#fork-the-repo) with a new blog post. New blog posts go under the [`content/en/blog/_posts`](https://github.com/kubernetes/website/tree/master/content/en/blog/_posts) directory.
147
+
- [Open a pull request](/docs/contribute/new-content/open-a-pr/#fork-the-repo) with a new blog post. New blog posts go under the [`content/en/blog/_posts`](https://github.com/kubernetes/website/tree/main/content/en/blog/_posts) directory.
148
148
149
149
- Ensure that your blog post follows the correct naming conventions and the following frontmatter (metadata) information:
150
150
@@ -153,7 +153,7 @@ SIG Docs [博客子项目](https://github.com/kubernetes/community/tree/master/s
@@ -205,7 +205,7 @@ Case studies highlight how organizations are using Kubernetes to solve
205
205
real-world problems. The Kubernetes marketing team and members of the {{< glossary_tooltip text="CNCF" term_id="cncf" >}} collaborate with you on all case studies.
206
206
207
207
Have a look at the source for the
208
-
[existing case studies](https://github.com/kubernetes/website/tree/master/content/en/case-studies).
208
+
[existing case studies](https://github.com/kubernetes/website/tree/main/content/en/case-studies).
209
209
210
210
Refer to the [case study guidelines](https://github.com/cncf/foundation/blob/master/case-study-guidelines.md) and submit your request as outlined in the guidelines.
@@ -236,19 +236,20 @@ Make sure you have [git](https://git-scm.com/book/en/v2/Getting-Started-Installi
236
236
这样可以确保你本地的仓库在开始工作前是最新的。
237
237
238
238
<!--
239
-
This workflow is different than the [Kubernetes Community GitHub Workflow](https://github.com/kubernetes/community/blob/master/contributors/guide/github-workflow.md). You do not need to merge your local copy of `master` with `upstream/master` before pushing updates to your fork.
239
+
This workflow is different than the [Kubernetes Community GitHub Workflow](https://github.com/kubernetes/community/blob/master/contributors/guide/github-workflow.md). You do not need to merge your local copy of `main` with `upstream/main` before pushing updates to your fork.
- For improvements to existing content, use `upstream/master`.
251
-
- For new content about existing features, use `upstream/master`.
251
+
- For improvements to existing content, use `upstream/main`.
252
+
- For new content about existing features, use `upstream/main`.
252
253
- For localized content, use the localization's conventions. For more information, see [localizing Kubernetes documentation](/docs/contribute/localization/).
253
254
- For new features in an upcoming Kubernetes release, use the feature branch. For more information, see [documenting for a release](/docs/contribute/new-content/new-features/).
254
255
- For long-running efforts that multiple SIG Docs contributors collaborate on,
@@ -261,8 +262,8 @@ Make sure you have [git](https://git-scm.com/book/en/v2/Getting-Started-Installi
@@ -273,13 +274,13 @@ Make sure you have [git](https://git-scm.com/book/en/v2/Getting-Started-Installi
273
274
如果你在选择分支上需要帮助,请在 `#sig-docs` Slack 频道提问。
274
275
275
276
<!--
276
-
2. Create a new branch based on the branch identified in step 1. This example assumes the base branch is `upstream/master`:
277
+
2. Create a new branch based on the branch identified in step 1. This example assumes the base branch is `upstream/main`:
277
278
-->
278
279
2. 基于第一步中选定的分支,创建新分支。
279
-
下面的例子假定基础分支是 `upstream/master`:
280
+
下面的例子假定基础分支是 `upstream/main`:
280
281
281
282
```bash
282
-
git checkout -b <my_new_branch> upstream/master
283
+
git checkout -b <my_new_branch> upstream/main
283
284
```
284
285
<!--
285
286
3. Make your changes using a text editor.
@@ -471,10 +472,10 @@ Alternately, install and use the `hugo` command on your computer:
471
472
另一种方式是,在你的本地计算机上安装并使用 `hugo` 命令:
472
473
473
474
<!--
474
-
1. Install the [Hugo](https://gohugo.io/getting-started/installing/) version specified in [`website/netlify.toml`](https://raw.githubusercontent.com/kubernetes/website/master/netlify.toml).
475
+
1. Install the [Hugo](https://gohugo.io/getting-started/installing/) version specified in [`website/netlify.toml`](https://raw.githubusercontent.com/kubernetes/website/main/netlify.toml).
475
476
2. In a terminal, go to your Kubernetes website repository and start the Hugo server:
Copy file name to clipboardExpand all lines: content/zh/docs/contribute/new-content/overview.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -74,7 +74,7 @@ When opening a pull request, you need to know in advance which branch to base yo
74
74
75
75
Scenario | Branch
76
76
:---------|:------------
77
-
Existing or new English language content for the current release | `master`
77
+
Existing or new English language content for the current release | `main`
78
78
Content for a feature change release | The branch which corresponds to the major and minor version the feature change is in, using the pattern `dev-release-<version>`. For example, if a feature changes in the `{{< latest-version >}}` release, then add documentation changes to the ``dev-{{< release-branch >}}`` branch.
79
79
Content in other languages (localizations) | Use the localization's convention. See the [Localization branching strategy](/docs/contribute/localization/#branching-strategy) for more information.
80
80
@@ -86,7 +86,7 @@ If you're still not sure which branch to choose, ask in `#sig-docs` on Slack.
@@ -111,12 +111,12 @@ Limit pull requests to one language per PR. If you need to make an identical cha
111
111
112
112
<!--
113
113
## Tools for contributors
114
-
The [doc contributors tools](https://github.com/kubernetes/website/tree/master/content/en/docs/doc-contributor-tools) directory in the `kubernetes/website` repository contains tools to help your contribution journey go more smoothly.
114
+
The [doc contributors tools](https://github.com/kubernetes/website/tree/main/content/en/docs/doc-contributor-tools) directory in the `kubernetes/website` repository contains tools to help your contribution journey go more smoothly.
Copy file name to clipboardExpand all lines: content/zh/docs/contribute/participate/pr-wranglers.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -89,8 +89,8 @@ These queries exclude localization PRs. All queries are against the main branch
89
89
Lists PRs that need an LGTM from a member. If the PR needs technical review, loop in one of the reviewers suggested by the bot. If the content needs work, add suggestions and feedback in-line.
Lists PRs that need an `/approve` comment to merge.
92
-
- [Quick Wins](https://github.com/kubernetes/website/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+base%3Amaster+-label%3A%22do-not-merge%2Fwork-in-progress%22+-label%3A%22do-not-merge%2Fhold%22+label%3A%22cncf-cla%3A+yes%22+label%3A%22size%2FXS%22+label%3A%22language%2Fen%22): Lists PRs against the main branch with no clear blockers. (change "XS" in the size label as you work through the PRs [XS, S, M, L, XL, XXL]).
93
-
- [Not against the main branch](https://github.com/kubernetes/website/pulls?q=is%3Aopen+is%3Apr+label%3Alanguage%2Fen+-base%3Amaster): If the PR is against a `dev-` branch, it's for an upcoming release. Assign the [docs release manager](https://github.com/kubernetes/sig-release/tree/master/release-team#kubernetes-release-team-roles) using: `/assign @<manager's_github-username>`. If the PR is against an old branch, help the author figure out whether it's targeted against the best branch.
92
+
- [Quick Wins](https://github.com/kubernetes/website/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+base%3Amain+-label%3A%22do-not-merge%2Fwork-in-progress%22+-label%3A%22do-not-merge%2Fhold%22+label%3A%22cncf-cla%3A+yes%22+label%3A%22size%2FXS%22+label%3A%22language%2Fen%22): Lists PRs against the main branch with no clear blockers. (change "XS" in the size label as you work through the PRs [XS, S, M, L, XL, XXL]).
93
+
- [Not against the primary branch](https://github.com/kubernetes/website/pulls?q=is%3Aopen+is%3Apr+label%3Alanguage%2Fen+-base%3Amain): If the PR is against a `dev-` branch, it's for an upcoming release. Assign the [docs release manager](https://github.com/kubernetes/sig-release/tree/master/release-team#kubernetes-release-team-roles) using: `/assign @<manager's_github-username>`. If the PR is against an old branch, help the author figure out whether it's targeted against the best branch.
-[非主分支的 PR](https://github.com/kubernetes/website/pulls?q=is%3Aopen+is%3Apr+label%3Alanguage%2Fen+-base%3Amaster): If the PR is against a `dev-` branch, it's for an upcoming release. Assign the [docs release manager](https://github.com/kubernetes/sig-release/tree/master/release-team#kubernetes-release-team-roles) using: `/assign @<manager's_github-username>`. If the PR is against an old branch, help the author figure out whether it's targeted against the best branch.
0 commit comments