From 55c7993e9b12302276a4ba1807538d401f5eb01d Mon Sep 17 00:00:00 2001 From: howieyuen Date: Thu, 19 Aug 2021 20:50:01 +0800 Subject: [PATCH] [zh]sync contribution files for 1.22(Part-1) --- .../new-content/blogs-case-studies.md | 12 +++---- .../docs/contribute/new-content/open-a-pr.md | 33 ++++++++++--------- .../docs/contribute/new-content/overview.md | 8 ++--- .../zh/docs/contribute/participate/_index.md | 8 ++--- .../contribute/participate/pr-wranglers.md | 8 ++--- .../participate/roles-and-responsibilities.md | 8 ++--- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/content/zh/docs/contribute/new-content/blogs-case-studies.md b/content/zh/docs/contribute/new-content/blogs-case-studies.md index a9f5d3f91c..71ebf83930 100644 --- a/content/zh/docs/contribute/new-content/blogs-case-studies.md +++ b/content/zh/docs/contribute/new-content/blogs-case-studies.md @@ -101,7 +101,7 @@ Kubernetes 博客用于项目发布新功能特性、社区报告以及其他一 - 博客文章应该是原创内容。 - 官方博客的目的不是将某第三方已发表的内容重新作为新内容发表。 - - 博客的[授权协议](https://github.com/kubernetes/website/blob/master/LICENSE) + - 博客的[授权协议](https://github.com/kubernetes/website/blob/main/LICENSE) 的确允许出于商业目的来使用博客内容；但并不是所有可以商用的内容都适合在这里发表。 - 博客文章的内容应该在一段时间内不过期。 - 考虑到项目的开发速度，我们希望读者看到的是不必更新就能保持长期准确的内容。 @@ -144,7 +144,7 @@ SIG Docs [博客子项目](https://github.com/kubernetes/community/tree/master/s 要提交博文，你可以遵从以下指南： - [发起一个包含博文的 PR](/zh/docs/contribute/new-content/open-a-pr/#fork-the-repo)。 - 新博文要创建于 [`content/en/blog/_posts`](https://github.com/kubernetes/website/tree/master/content/en/blog/_posts) 目录下。 + 新博文要创建于 [`content/en/blog/_posts`](https://github.com/kubernetes/website/tree/main/content/en/blog/_posts) 目录下。 - 确保你的博文遵从合适的命名规范，并带有下面的引言（元数据）信息： @@ -205,7 +205,7 @@ Case studies highlight how organizations are using Kubernetes to solve 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. Have a look at the source for the -[existing case studies](https://github.com/kubernetes/website/tree/master/content/en/case-studies). +[existing case studies](https://github.com/kubernetes/website/tree/main/content/en/case-studies). 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. --> @@ -216,7 +216,7 @@ Kubernetes 市场化团队和 {{< glossary_tooltip text="CNCF" term_id="cncf" >} 会与你一起工作，撰写所有的案例分析。 请查看 -[现有案例分析](https://github.com/kubernetes/website/tree/master/content/en/case-studies) +[现有案例分析](https://github.com/kubernetes/website/tree/main/content/en/case-studies) 的源码。 参考[案例分析指南](https://github.com/cncf/foundation/blob/master/case-study-guidelines.md) diff --git a/content/zh/docs/contribute/new-content/open-a-pr.md b/content/zh/docs/contribute/new-content/open-a-pr.md index ee5a2fa503..7d2919b713 100644 --- a/content/zh/docs/contribute/new-content/open-a-pr.md +++ b/content/zh/docs/contribute/new-content/open-a-pr.md @@ -222,9 +222,9 @@ Make sure you have [git](https://git-scm.com/book/en/v2/Getting-Started-Installi upstream https://github.com/kubernetes/website.git (push) ``` -6. 从你的克隆副本取回 `origin/master` 分支，从 `kubernetes/website` 取回 `upstream/master`： +6. 从你的克隆副本取回 `origin/master` 分支，从 `kubernetes/website` 取回 `upstream/main`： ```bash git fetch origin @@ -236,10 +236,11 @@ Make sure you have [git](https://git-scm.com/book/en/v2/Getting-Started-Installi 这样可以确保你本地的仓库在开始工作前是最新的。 {{< note >}} - 此工作流程与 [Kubernetes 社区 GitHub 工作流](https://github.com/kubernetes/community/blob/master/contributors/guide/github-workflow.md)有所不同。在推送你的变更到你的远程派生副本库之前，你不需要将你本地的 `master` 与 `upstream/master` 合并。 + 此工作流程与 [Kubernetes 社区 GitHub 工作流](https://github.com/kubernetes/community/blob/master/contributors/guide/github-workflow.md)有所不同。 + 在推送你的变更到你的远程派生副本库之前，你不需要将你本地的 `main` 与 `upstream/main` 合并。 {{< /note >}} 2. 基于第一步中选定的分支，创建新分支。 - 下面的例子假定基础分支是 `upstream/master`： + 下面的例子假定基础分支是 `upstream/main`： ```bash - git checkout -b upstream/master + git checkout -b upstream/main ``` -1. 安装 [`website/netlify.toml`](https://raw.githubusercontent.com/kubernetes/website/master/netlify.toml) +1. 安装 [`website/netlify.toml`](https://raw.githubusercontent.com/kubernetes/website/main/netlify.toml) 文件中指定的 [Hugo](https://gohugo.io/getting-started/installing/) 版本。 2. 启动一个终端窗口，进入 Kubernetes 网站仓库目录，启动 Hugo 服务器： @@ -651,13 +652,13 @@ If another contributor commits changes to the same file in another PR, it can cr git push --force-with-lease origin ``` -2. 从 `kubernetes/website` 的 `upstream/master` 分支取回更改，然后重设本地分支的基线： +2. 从 `kubernetes/website` 的 `upstream/main` 分支取回更改，然后重设本地分支的基线： ```bash git fetch upstream - git rebase upstream/master + git rebase upstream/main ``` ## 为贡献者提供的工具 `kubernetes/website` 仓库的 -[文档贡献者工具](https://github.com/kubernetes/website/tree/master/content/en/docs/doc-contributor-tools) +[文档贡献者工具](https://github.com/kubernetes/website/tree/main/content/en/docs/doc-contributor-tools) 目录中包含了一些工具，能够助你的贡献过程更为顺畅。 diff --git a/content/zh/docs/contribute/participate/_index.md b/content/zh/docs/contribute/participate/_index.md index 1fcab79b2a..ba6ab0c738 100644 --- a/content/zh/docs/contribute/participate/_index.md +++ b/content/zh/docs/contribute/participate/_index.md @@ -136,14 +136,14 @@ Kubernetes 项目使用名为 prow 的自动化工具来自动处理 GitHub issu 这两个插件使用位于 `kubernetes/website` 仓库顶层的 -[OWNERS](https://github.com/kubernetes/website/blob/master/OWNERS) 文件和 -[OWNERS_ALIASES](https://github.com/kubernetes/website/blob/master/OWNERS_ALIASES) +[OWNERS](https://github.com/kubernetes/website/blob/main/OWNERS) 文件和 +[OWNERS_ALIASES](https://github.com/kubernetes/website/blob/main/OWNERS_ALIASES) 文件来控制 prow 在仓库范围的工作方式。 - [未签署 CLA，不可合并的 PR](https://github.com/kubernetes/website/pulls?q=is%3Aopen+is%3Apr+label%3A%22cncf-cla%3A+no%22+-label%3A%22do-not-merge%2Fwork-in-progress%22+-label%3A%22do-not-merge%2Fhold%22+label%3Alanguage%2Fen)： 提醒贡献者签署 CLA。如果机器人和审阅者都已经提醒他们，请关闭 PR，并提醒他们在签署 CLA 后可以重新提交。 @@ -105,11 +105,11 @@ These queries exclude localization PRs. All queries are against the main branch - [已有 LGTM标签，需要 Docs 团队批准](https://github.com/kubernetes/website/pulls?q=is%3Aopen+is%3Apr+-label%3Ado-not-merge%2Fwork-in-progress+-label%3Ado-not-merge%2Fhold+label%3Alanguage%2Fen+label%3Algtm+)： 列举需要 `/approve` 评论来合并的 PR。 -- [快速批阅](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)： +- [快速批阅](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)： 列举针对主分支的、没有明确合并障碍的 PR。 在浏览 PR 时，可以将 "XS" 尺寸标签更改为 "S"、"M"、"L"、"XL"、"XXL"。 -- [非主分支的 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 @`. 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%3Amain): 如果 PR 针对 `dev-` 分支，则表示它适用于即将发布的版本。 请添加带有 `/assign @<负责人的 github 账号>`，将其指派给 [发行版本负责人](https://github.com/kubernetes/sig-release/tree/master/release-team#kubernetes-release-team-roles)。 diff --git a/content/zh/docs/contribute/participate/roles-and-responsibilities.md b/content/zh/docs/contribute/participate/roles-and-responsibilities.md index 51b4399857..2b91550a60 100644 --- a/content/zh/docs/contribute/participate/roles-and-responsibilities.md +++ b/content/zh/docs/contribute/participate/roles-and-responsibilities.md @@ -269,7 +269,7 @@ To apply: 1. 发起 PR，将你的 GitHub 用户名添加到 `kubernetes/website` 仓库中 - [OWNERS_ALIASES](https://github.com/kubernetes/website/blob/master/OWNERS) + [OWNERS_ALIASES](https://github.com/kubernetes/website/blob/main/OWNERS) 文件的特定节。 {{< note >}} @@ -383,7 +383,7 @@ When you meet the [requirements](https://github.com/kubernetes/community/blob/ma