This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/apisix-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 9b27a6f Deploy to GitHub pages
9b27a6f is described below
commit 9b27a6f910553165e7e2fc6dc7861ada971ac5c1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 12 13:15:44 2020 +0000
Deploy to GitHub pages
---
contribute/release/index.html | 10 ++---
zh/contribute/2fa/index.html | 30 ++++++++------
zh/contribute/contributor/index.html | 77 ++++++++++++++++++++----------------
zh/contribute/index.xml | 35 +++++++++++-----
zh/contribute/security/index.html | 12 +++---
zh/downloads/index.html | 33 +++++++---------
zh/index.xml | 37 ++++++++++++-----
7 files changed, 140 insertions(+), 94 deletions(-)
diff --git a/contribute/release/index.html b/contribute/release/index.html
index 095b236..a4f67ca 100644
--- a/contribute/release/index.html
+++ b/contribute/release/index.html
@@ -334,14 +334,14 @@ GnuPG-2.x：
<span style="color:#a6e22e">GnuPG</span> <span
style="color:#a6e22e">needs</span> <span style="color:#a6e22e">to</span> <span
style="color:#a6e22e">construct</span> <span style="color:#a6e22e">a</span>
<span style="color:#a6e22e">user</span> <span style="color:#a6e22e">ID</span>
<span style="color:#a6e22e">to</span> <span
style="color:#a6e22e">identify</span> <span style="color:#a6e22e">your</span>
<span style="color:#a6e22e">key</span>.
-<span style="color:#a6e22e">Real</span> <span
style="color:#a6e22e">name</span>: <span
style="color:#960050;background-color:#1e0010">$</span>{<span
style="color:#a6e22e">输入用户名</span>}
-<span style="color:#a6e22e">Email</span> <span
style="color:#a6e22e">address</span>: <span
style="color:#960050;background-color:#1e0010">$</span>{<span
style="color:#a6e22e">输入邮件地址</span>}
-<span style="color:#a6e22e">Comment</span>: <span
style="color:#960050;background-color:#1e0010">$</span>{<span
style="color:#a6e22e">输入注释</span>}
+<span style="color:#a6e22e">Real</span> <span
style="color:#a6e22e">name</span>: <span
style="color:#960050;background-color:#1e0010">$</span>{<span
style="color:#a6e22e">Enter</span> <span style="color:#a6e22e">your</span>
<span style="color:#a6e22e">username</span>}
+<span style="color:#a6e22e">Email</span> <span
style="color:#a6e22e">address</span>: <span
style="color:#960050;background-color:#1e0010">$</span>{<span
style="color:#a6e22e">Enter</span> <span style="color:#a6e22e">your</span>
<span style="color:#a6e22e">email</span> <span
style="color:#a6e22e">address</span>}
+<span style="color:#a6e22e">Comment</span>: <span
style="color:#960050;background-color:#1e0010">$</span>{<span
style="color:#a6e22e">Enter</span> <span style="color:#a6e22e">comments</span>}
<span style="color:#a6e22e">You</span> <span
style="color:#a6e22e">selected</span> <span style="color:#a6e22e">this</span>
<span style="color:#a6e22e">USER</span><span
style="color:#f92672">-</span><span style="color:#a6e22e">ID</span>:
- <span style="color:#e6db74">"${输入的用户名} (${输入的注释})
&lt;${输入的邮件地址}>"</span>
+ <span style="color:#e6db74">"${Entered username} (${Entered comments})
&lt;${Entered email address}>"</span>
<span style="color:#a6e22e">Change</span> (<span
style="color:#a6e22e">N</span>)<span style="color:#a6e22e">ame</span>, (<span
style="color:#a6e22e">C</span>)<span style="color:#a6e22e">omment</span>,
(<span style="color:#a6e22e">E</span>)<span style="color:#a6e22e">mail</span>
<span style="color:#a6e22e">or</span> (<span
style="color:#a6e22e">O</span>)<span style="color:#a6e22e">kay</span><span
style="color:#f92672">/</span>(<span style="color:#a6e22e">Q</span>)<span
style="color:#a6e22 [...]
-<span style="color:#a6e22e">You</span> <span style="color:#a6e22e">need</span>
<span style="color:#a6e22e">a</span> <span
style="color:#a6e22e">Passphrase</span> <span style="color:#a6e22e">to</span>
<span style="color:#a6e22e">protect</span> <span
style="color:#a6e22e">your</span> <span style="color:#a6e22e">secret</span>
<span style="color:#a6e22e">key</span>. <span
style="color:#960050;background-color:#1e0010">#</span> <span
style="color:#a6e22e">输入密码</span>
+<span style="color:#a6e22e">You</span> <span style="color:#a6e22e">need</span>
<span style="color:#a6e22e">a</span> <span
style="color:#a6e22e">Passphrase</span> <span style="color:#a6e22e">to</span>
<span style="color:#a6e22e">protect</span> <span
style="color:#a6e22e">your</span> <span style="color:#a6e22e">secret</span>
<span style="color:#a6e22e">key</span>. <span
style="color:#960050;background-color:#1e0010">#</span> <span
style="color:#a6e22e">Enter</span> <span style="color:#a6e2 [...]
</code></pre></td></tr></table>
</div>
</div>
diff --git a/zh/contribute/2fa/index.html b/zh/contribute/2fa/index.html
index 464b125..eae49ce 100644
--- a/zh/contribute/2fa/index.html
+++ b/zh/contribute/2fa/index.html
@@ -4,8 +4,14 @@
<meta property="og:title" content="两步验证" />
-<meta property="og:description" content="Two-factor authentication(2FA) Two
factor authentication (2FA) refers to the authentication method that combines
both passport and an object (credit card, SMS phone, token or biomarkers as
fingerprint) to identify a user. To ensure the security of the committer’s
account, we need you to enable 2FA to sign in and contribute codes on GitHub.
More details, please refer to 2FA.
-Note:If you do not enable 2FA, you will be removed from the project and unable
to access our repositories and the fork from our private repository." />
+<meta property="og:description" content=" 两步验证（2FA）
两步验证（2FA）是一种更加安全的用户认证手段，在除了使用用户名和密码之外，还需要使用其他材料（如信用卡、手机短信、令牌、指纹等生物特征）验证用户身份。为了确保提交者账户的安全性，您需要在
GitHub 上启用 2FA 来登录和提交贡献。更多的细节，请参考 2FA。
+注意：如果您没有启用 2FA，您将会被从项目中移除，亦无法访问我们的仓库、fork 我们的私有仓库。
+在 GitHub 上启用 2FA 具体操作细节，请参考 Enable Two Factor Authentication with TOTP。
+在启用 2FA 之后，您需要使用用户名/密码 + 验证码，来登陆 GitHub。
+提示： 如果您无法通过页面上的链接下载 APP，您可以在应用商店中搜索下载 Google Authenticator。
+如何提交代码 在启用 2FA 之后，您需要生成私有访问令牌（Private Access Token）来进行 Git 提交之类的操作。此时，您将使用用户名
+ 令牌来提交代码，而不是原先的用户名 + 密码。
+具体操作细节，请参考 Create a Private Token.
+ " />
<meta property="og:type" content="article" />
<meta property="og:url" content="https://apisix.apache.org/zh/contribute/2fa/";
/>
<meta property="article:published_time" content="2020-03-29T11:46:04+08:00" />
@@ -226,18 +232,18 @@ Note:If you do not enable 2FA, you will be removed from
the project and unable t
</div>
</div>
<div>
-<h2 class="title">Two-factor authentication(2FA)</h2>
-<p>Two factor authentication (2FA) refers to the authentication method that
combines both passport and an object (credit card, SMS phone, token or
biomarkers as fingerprint) to identify a user. To ensure the security of the
committer’s account, we need you to enable 2FA to sign in and contribute codes
on GitHub. More details, please refer to <a
href="https://help.github.com/articles/requiring-two-factor-authentication-in-your-organization/";
target="_blank">2FA</a>.</p>
-<p><strong>Note:</strong>If you do not enable 2FA, you will be removed from
the project and unable to access our repositories and the fork from our private
repository.</p>
+<h2 class="title">两步验证（2FA）</h2>
+<p>两步验证（2FA）是一种更加安全的用户认证手段，在除了使用用户名和密码之外，还需要使用其他材料（如信用卡、手机短信、令牌、指纹等生物特征）验证用户身份。为了确保提交者账户的安全性，您需要在
GitHub 上启用 2FA 来登录和提交贡献。更多的细节，请参考 <a
href="https://help.github.com/articles/requiring-two-factor-authentication-in-your-organization/";
target="_blank">2FA</a>。</p>
+<p><strong>注意：</strong>如果您没有启用 2FA，您将会被从项目中移除，亦无法访问我们的仓库、fork 我们的私有仓库。</p>
<br />
-<h2 class="title">Enable 2FA on GitHub</h2>
-<p>For detailed operations, please refer to <a
href="https://help.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication";
target="_blank">Enable Two Factor Authentication with TOTP</a>.</p>
-<p>After enabling 2FA, you need to sign in GitHub with the way of
username/password + mobile phone authentication code.</p>
-<p><strong>Tips:</strong> If you cannot download the APP through the page
link, you can search and download the Google Authenticator in APP Store.</p>
+<h2 class="title">在 GitHub 上启用 2FA</h2>
+<p>具体操作细节，请参考 <a
href="https://help.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication";
target="_blank">Enable Two Factor Authentication with TOTP</a>。</p>
+<p>在启用 2FA 之后，您需要使用用户名/密码 + 验证码，来登陆 GitHub。</p>
+<p><strong>提示：</strong> 如果您无法通过页面上的链接下载 APP，您可以在应用商店中搜索下载 Google
Authenticator。</p>
<br />
-<h2 class="title">How to Submit Codes</h2>
-<p>After enabling 2FA, you need to generate a private access Token to perform
operations such as git submit and so on. At this time, you will use username +
private access Token in replace of username + password to submit codes.</p>
-<p>For detailed operations, please refer to <a
href="https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line";
target="_blank">Create a Private Token</a>.</p>
+<h2 class="title">如何提交代码</h2>
+<p>在启用 2FA 之后，您需要生成私有访问令牌（Private Access Token）来进行 Git 提交之类的操作。此时，您将使用用户名 +
令牌来提交代码，而不是原先的用户名 + 密码。</p>
+<p>具体操作细节，请参考 <a
href="https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line";
target="_blank">Create a Private Token</a>.</p>
</div>
</div>
diff --git a/zh/contribute/contributor/index.html
b/zh/contribute/contributor/index.html
index 18d8aed..50f10b2 100644
--- a/zh/contribute/contributor/index.html
+++ b/zh/contribute/contributor/index.html
@@ -4,11 +4,20 @@
<meta property="og:title" content="贡献者指南" />
-<meta property="og:description" content="Please fee free to report bugs,
submit suggestions, or submit PRs according to this guide.
-Submit an issue 1. Before submitting your issues, please go through a
comprehensive search to make sure the problem cannot be solved just by
searching.
-2. Check the Issue List to make sure the problem is not repeated.
-3. Create a new issue and choose the type of issue.
-4. Define the issue with a clear and descriptive title." />
+<meta property="og:description" content="请按照这份指南，报告 bugs、提出建议或提交 PR，不必拘谨。
+提交 Issue 1. 在提交 Issue 之前，请充分利用搜索，确保问题无法通过搜索结果解决。
+2. 检查 Issue 列表 确保没有重复的问题
+3. 创建一个新的 Issue 并选择恰当的 Issue 类型。
+4. 用一个清晰准确的描述性标题来描述您的 Issue。
+5. 根据模板，填写必要的信息。
+6. 为您的 Issue 选择恰当的标签。
+7. 请关注您的 Issue，您可能需要在讨论中提供更多的信息。
+开发者流程
+Fork 代码仓库 请 Fork 一份 Apache APISIX 的代码仓库到您自己的仓库中，然后设定恰当的上游分支。
+1 2 git remote add upstream https://github.com/apache/incubator-apisix.git
选择一个 Issue
+1. 请选择您的目标 Issue。如果您希望报告一个新发现的 Issue 或者一个新的功能增强，请先创建 Issue 并设定恰当的标签。
+2. 在选择一个有价值的 Issue 之后，请回复一个截止时间来表明您正在尝试解决它。
+3. 在 团队页面 选择一个导师，他将会及时对您的 Issue 和 PR 做出反馈。" />
<meta property="og:type" content="article" />
<meta property="og:url"
content="https://apisix.apache.org/zh/contribute/contributor/"; />
<meta property="article:published_time" content="2020-03-29T11:46:04+08:00" />
@@ -229,21 +238,21 @@ Submit an issue 1. Before submitting your issues, please
go through a comprehens
</div>
</div>
<div>
- <p>Please fee free to report bugs, submit suggestions, or submit PRs
according to this guide.</p>
+ <p>请按照这份指南，报告 bugs、提出建议或提交 PR，不必拘谨。</p>
<br />
- <h2 class="title">Submit an issue</h2>
- <p>1. Before submitting your issues, please go through a comprehensive
search to make sure the problem cannot be solved just by searching.</p>
- <p>2. Check the <a href="https://github.com/apache/incubator-apisix/issues";
target="_blank">Issue List</a> to make sure the problem is not repeated.</p>
- <p>3. Create a new issue and choose the type of issue.</p>
- <p>4. Define the issue with a clear and descriptive title.</p>
- <p>5. Fill in necessary information according to the template.</p>
- <p>6. Choose a label after issue created.</p>
- <p>7. Please pay attention to your issue, you may need provide more
information during discussion.</p>
+ <h2 class="title">提交 Issue</h2>
+ <p>1. 在提交 Issue 之前，请充分利用搜索，确保问题无法通过搜索结果解决。</p>
+ <p>2. 检查 <a href="https://github.com/apache/incubator-apisix/issues";
target="_blank">Issue 列表</a> 确保没有重复的问题</p>
+ <p>3. 创建一个新的 Issue 并选择恰当的 Issue 类型。</p>
+ <p>4. 用一个清晰准确的描述性标题来描述您的 Issue。</p>
+ <p>5. 根据模板，填写必要的信息。</p>
+ <p>6. 为您的 Issue 选择恰当的标签。</p>
+ <p>7. 请关注您的 Issue，您可能需要在讨论中提供更多的信息。</p>
<br />
- <h2 class="title">Developer Flow</h2>
+ <h2 class="title">开发者流程</h2>
<p></p>
- <h3 class="subtitle">Fork repo</h3>
- <p>Fork the Apache APISIX repo to your own repo to work, then setting proper
upstream.</p>
+ <h3 class="subtitle">Fork 代码仓库</h3>
+ <p>请 Fork 一份 Apache APISIX 的代码仓库到您自己的仓库中，然后设定恰当的上游分支。</p>
<br />
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
<table
style="border-spacing:0;padding:0;margin:0;border:0;width:auto;overflow:auto;display:block;"><tr><td
style="vertical-align:top;padding:0;margin:0;border:0;">
@@ -256,15 +265,15 @@ Submit an issue 1. Before submitting your issues, please
go through a comprehens
</div>
</div>
<br />
- <h3 class="subtitle">Choose an issue</h3>
+ <h3 class="subtitle">选择一个 Issue</h3>
<p></p>
- <p>1. Please choose your target issue. If it is a new issue discovered or a
new function enhancement to offer, please create an issue and set the right
label for it.</p>
- <p>2. After choosing the relevant issue, please reply with a deadline to
indicate that you are working on it.</p>
- <p>3. Find a mentor from <a href="/team">the Team page</a> and your mentor
will give you feedback about your PR or issue in time.</p>
+ <p>1. 请选择您的目标 Issue。如果您希望报告一个新发现的 Issue 或者一个新的功能增强，请先创建 Issue 并设定恰当的标签。</p>
+ <p>2. 在选择一个有价值的 Issue 之后，请回复一个截止时间来表明您正在尝试解决它。</p>
+ <p>3. 在 <a href="/team">团队页面</a> 选择一个导师，他将会及时对您的 Issue 和 PR 做出反馈。</p>
<br />
- <h3 class="subtitle">Create your branch</h3>
+ <h3 class="subtitle">创建您的分支</h3>
<p></p>
- <p>Switch to your forked master branch, pull codes from upstream, then
create a new branch.</p>
+ <p>切换到您已经 fork 的 master 分支，从上游拉取代码，然后创建一个新的分支。</p>
<br />
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
<table
style="border-spacing:0;padding:0;margin:0;border:0;width:auto;overflow:auto;display:block;"><tr><td
style="vertical-align:top;padding:0;margin:0;border:0;">
@@ -281,12 +290,12 @@ Submit an issue 1. Before submitting your issues, please
go through a comprehens
</div>
</div>
<p></p>
- <p><strong>Notice:</strong> We will merge PR using squash, commit logs will
be different form upstream if you use one older branch.</p>
+ <p><strong>注意：</strong> 我们将会使用 squash 合并 PR，较老的分支上的提交记录可能会与上游不同。</p>
<br />
<h3 class="subtitle">Coding</h3>
<p></p>
- <p>1. Please obey the Code of Conduct during the process of development and
finish the check before submitting the pull request.</p>
- <p>2. Then push codes to your fork repo.</p>
+ <p>1. 请在开发过程中遵守行为准则，并在提交 Pull Request 之前完成检查。</p>
+ <p>2. 然后将您的代码推送到您 fork 的仓库中。</p>
<br />
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
<table
style="border-spacing:0;padding:0;margin:0;border:0;width:auto;overflow:auto;display:block;"><tr><td
style="vertical-align:top;padding:0;margin:0;border:0;">
@@ -303,15 +312,15 @@ Submit an issue 1. Before submitting your issues, please
go through a comprehens
</div>
</div>
<br />
- <h3 class="subtitle">Submit PR</h3>
+ <h3 class="subtitle">提交 PR</h3>
<p></p>
- <p>1. Send a pull request to the master branch.</p>
- <p>2. The mentor will do codes review before discussing some details
(including the design, the implementation and the performance) with you.</p>
- <p>3. Then congratulate to you to be an official contributor of Apache
APISIX.</p>
+ <p>1. 向 master 分支发送一个 pull request。</p>
+ <p>2. 导师会复查您的代码，并与您讨论一些细节问题，包括设计、实现、性能等。</p>
+ <p>3. 祝贺您成为 Apache APISIX 的一名正式贡献者。</p>
<br />
- <h3 class="subtitle">Delete branch</h3>
+ <h3 class="subtitle">删除分支</h3>
<p></p>
- <p>You can delete the remote branch (origin/IssueNo) and the local branch
(IssueNo) associated with the remote branch (origin/IssueNo) after the mentor
merged the PR into the master branch.</p>
+ <p>在导师将您的 PR 合并到 master
分支之后，您可以删除远程分支（origin/IssueNo）及与之关联的本地分支（IssueNo）。</p>
<br />
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
<table
style="border-spacing:0;padding:0;margin:0;border:0;width:auto;overflow:auto;display:block;"><tr><td
style="vertical-align:top;padding:0;margin:0;border:0;">
@@ -328,9 +337,9 @@ Submit an issue 1. Before submitting your issues, please go
through a comprehens
</div>
</div>
<br />
- <h3 class="subtitle">Notice</h3>
+ <h3 class="subtitle">提示</h3>
<p></p>
- <p>Please note that in order to show your ID in the contributor list, please
DO NOT forget to set the configurations below:</p>
+ <p>请注意，为了让您的 ID 显示在贡献者列表中，请不要忘记进行下面的设置：</p>
<br />
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
<table
style="border-spacing:0;padding:0;margin:0;border:0;width:auto;overflow:auto;display:block;"><tr><td
style="vertical-align:top;padding:0;margin:0;border:0;">
diff --git a/zh/contribute/index.xml b/zh/contribute/index.xml
index 0ac05ac..b6b145d 100644
--- a/zh/contribute/index.xml
+++ b/zh/contribute/index.xml
@@ -16,8 +16,14 @@
<pubDate>Sun, 29 Mar 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.apache.org/zh/contribute/2fa/</guid>
- <description>Two-factor authentication(2FA) Two factor authentication
(2FA) refers to the authentication method that combines both passport and an
object (credit card, SMS phone, token or biomarkers as fingerprint) to identify
a user. To ensure the security of the committer’s account, we need you to
enable 2FA to sign in and contribute codes on GitHub. More details, please
refer to 2FA.
-Note:If you do not enable 2FA, you will be removed from the project and unable
to access our repositories and the fork from our private
repository.</description>
+ <description> 两步验证（2FA）
两步验证（2FA）是一种更加安全的用户认证手段，在除了使用用户名和密码之外，还需要使用其他材料（如信用卡、手机短信、令牌、指纹等生物特征）验证用户身份。为了确保提交者账户的安全性，您需要在
GitHub 上启用 2FA 来登录和提交贡献。更多的细节，请参考 2FA。
+注意：如果您没有启用 2FA，您将会被从项目中移除，亦无法访问我们的仓库、fork 我们的私有仓库。
+在 GitHub 上启用 2FA 具体操作细节，请参考 Enable Two Factor Authentication with TOTP。
+在启用 2FA 之后，您需要使用用户名/密码 + 验证码，来登陆 GitHub。
+提示： 如果您无法通过页面上的链接下载 APP，您可以在应用商店中搜索下载 Google Authenticator。
+如何提交代码 在启用 2FA 之后，您需要生成私有访问令牌（Private Access Token）来进行 Git 提交之类的操作。此时，您将使用用户名
+ 令牌来提交代码，而不是原先的用户名 + 密码。
+具体操作细节，请参考 Create a Private Token.
+ </description>
</item>
<item>
@@ -63,11 +69,20 @@ Note:If you do not enable 2FA, you will be removed from the
project and unable t
<pubDate>Sun, 29 Mar 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.apache.org/zh/contribute/contributor/</guid>
- <description>Please fee free to report bugs, submit suggestions, or
submit PRs according to this guide.
-Submit an issue 1. Before submitting your issues, please go through a
comprehensive search to make sure the problem cannot be solved just by
searching.
-2. Check the Issue List to make sure the problem is not repeated.
-3. Create a new issue and choose the type of issue.
-4. Define the issue with a clear and descriptive title.</description>
+ <description>请按照这份指南，报告 bugs、提出建议或提交 PR，不必拘谨。
+提交 Issue 1. 在提交 Issue 之前，请充分利用搜索，确保问题无法通过搜索结果解决。
+2. 检查 Issue 列表 确保没有重复的问题
+3. 创建一个新的 Issue 并选择恰当的 Issue 类型。
+4. 用一个清晰准确的描述性标题来描述您的 Issue。
+5. 根据模板，填写必要的信息。
+6. 为您的 Issue 选择恰当的标签。
+7. 请关注您的 Issue，您可能需要在讨论中提供更多的信息。
+开发者流程
+Fork 代码仓库 请 Fork 一份 Apache APISIX 的代码仓库到您自己的仓库中，然后设定恰当的上游分支。
+1 2 git remote add upstream https://github.com/apache/incubator-apisix.git
选择一个 Issue
+1. 请选择您的目标 Issue。如果您希望报告一个新发现的 Issue 或者一个新的功能增强，请先创建 Issue 并设定恰当的标签。
+2. 在选择一个有价值的 Issue 之后，请回复一个截止时间来表明您正在尝试解决它。
+3. 在 团队页面 选择一个导师，他将会及时对您的 Issue 和 PR 做出反馈。</description>
</item>
<item>
@@ -76,8 +91,10 @@ Submit an issue 1. Before submitting your issues, please go
through a comprehens
<pubDate>Thu, 16 Jan 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.apache.org/zh/contribute/security/</guid>
- <description>The Apache Software Foundation takes a rigorous stance on
eliminating security issues in its software projects. Apache APISIX is also
very concerned Security issues related to its features and functionality.
-If you have apprehensions regarding APISIX’s security or you discover
vulnerability or potential threat, don’t hesitate to get in touch with the
Apache Security Team by dropping a mail at secur...@apache.org. Please specify
the project name as APISIX and its product name APISIX or APISIX-Dashboard in
the email and provide a description of the relevant problem or potential
threat.</description>
+ <description>Apache 软件基金会采取严格的立场来消除软件项目中的安全问题，Apache APISIX
同样非常重视与其特性和功能相关的安全问题。
+如果您对 APISIX 的安全性感到担忧，或者发现了漏洞或潜在的威胁，请立即通过电子邮箱 secur...@apache.org 与 Apache
安全团队联系。请在邮件中指明项目名称 APISIX 及产品名称 APISIX 或
APISIX-Dashboard，并提供相关问题或潜在威胁的描述。我们建议您同时给出复现问题的方法。Apache 安全团队及 APISIX
社区将会在调查分析后与您联系。
+请您注意：在通过安全邮件报告安全问题前，请不要在公开场合披露相关问题。
+ </description>
</item>
<item>
diff --git a/zh/contribute/security/index.html
b/zh/contribute/security/index.html
index aa8a645..27a188c 100644
--- a/zh/contribute/security/index.html
+++ b/zh/contribute/security/index.html
@@ -4,8 +4,10 @@
<meta property="og:title" content="安全" />
-<meta property="og:description" content="The Apache Software Foundation takes
a rigorous stance on eliminating security issues in its software projects.
Apache APISIX is also very concerned Security issues related to its features
and functionality.
-If you have apprehensions regarding APISIX’s security or you discover
vulnerability or potential threat, don’t hesitate to get in touch with the
Apache Security Team by dropping a mail at secur...@apache.org. Please specify
the project name as APISIX and its product name APISIX or APISIX-Dashboard in
the email and provide a description of the relevant problem or potential
threat." />
+<meta property="og:description" content="Apache
软件基金会采取严格的立场来消除软件项目中的安全问题，Apache APISIX 同样非常重视与其特性和功能相关的安全问题。
+如果您对 APISIX 的安全性感到担忧，或者发现了漏洞或潜在的威胁，请立即通过电子邮箱 secur...@apache.org 与 Apache
安全团队联系。请在邮件中指明项目名称 APISIX 及产品名称 APISIX 或
APISIX-Dashboard，并提供相关问题或潜在威胁的描述。我们建议您同时给出复现问题的方法。Apache 安全团队及 APISIX
社区将会在调查分析后与您联系。
+请您注意：在通过安全邮件报告安全问题前，请不要在公开场合披露相关问题。
+ " />
<meta property="og:type" content="article" />
<meta property="og:url"
content="https://apisix.apache.org/zh/contribute/security/"; />
<meta property="article:published_time" content="2020-01-16T11:46:04+08:00" />
@@ -226,11 +228,11 @@ If you have apprehensions regarding APISIX’s security or
you discover vulnerab
</div>
</div>
<div class="security">
- <p>The Apache Software Foundation takes a rigorous stance on eliminating
security issues in its software projects. Apache APISIX is also very concerned
Security issues related to its features and functionality.</p>
+ <p>Apache 软件基金会采取严格的立场来消除软件项目中的安全问题，Apache APISIX 同样非常重视与其特性和功能相关的安全问题。</p>
- <p>If you have apprehensions regarding APISIX’s security or you discover
vulnerability or potential threat, don’t hesitate to get in touch with the
Apache Security Team by dropping a mail at <a
href="mailto:secur...@apache.org";>secur...@apache.org</a>. Please specify the
project name as APISIX and its product name APISIX or APISIX-Dashboard in the
email and provide a description of the relevant problem or potential threat.
You are also urged to recommend the way to reproduce and replic [...]
+ <p>如果您对 APISIX 的安全性感到担忧，或者发现了漏洞或潜在的威胁，请立即通过电子邮箱 <a
href="mailto:secur...@apache.org";>secur...@apache.org</a> 与 Apache
安全团队联系。请在邮件中指明项目名称 APISIX 及产品名称 APISIX 或
APISIX-Dashboard，并提供相关问题或潜在威胁的描述。我们建议您同时给出复现问题的方法。Apache 安全团队及 APISIX
社区将会在调查分析后与您联系。</p>
- <p>Please pay attention to report the security issue on the security email
before disclosing it on public domain.</p>
+ <p>请您注意：在通过安全邮件报告安全问题前，请不要在公开场合披露相关问题。</p>
</div>
</div>
diff --git a/zh/downloads/index.html b/zh/downloads/index.html
index 3dfd70e..bb67200 100644
--- a/zh/downloads/index.html
+++ b/zh/downloads/index.html
@@ -4,7 +4,7 @@
<meta property="og:title" content="下载" />
-<meta property="og:description" content="Releases Apache APISIX is released as
source code tarballs. The downloads are distributed via mirror sites and should
be checked for tampering using GPG or SHA-512. Version Release date Source
download 0.9 2019-11-24 源码 ( asc sha512 ) 1.0 2020-01-15 源码 ( asc sha512 )
1.1 2020-02-24 源码 ( asc sha512 ) 1.2 2020-04-20 源码 ( asc sha512 ) 1.3
2020-05-24 源码 ( asc sha512 ) 1." />
+<meta property="og:description" content="发行版本 Apache APISIX
以源码包的形式发行，通过镜像站分发下载。为保证内容没有被篡改，需要使用 GPG 或 SHA-512 校验。 版本 发行时间 源码下载 0.9
2019-11-24 源码 ( asc sha512 ) 1.0 2020-01-15 源码 ( asc sha512 ) 1.1
2020-02-24 源码 ( asc sha512 ) 1.2 2020-04-20 源码 ( asc sha512 ) 1.3
2020-05-24 源码 ( asc sha512 ) 1.4 2020-06-29 源码 ( asc sha512 ) 1.4.1
2020-07-20 源码 ( asc sha512 ) 1." />
<meta property="og:type" content="article" />
<meta property="og:url" content="https://apisix.apache.org/zh/downloads/"; />
<meta property="article:published_time" content="2019-11-26T23:48:02+08:00" />
@@ -226,16 +226,15 @@
</div>
<div class="downloads">
<section>
- <h2 class="title">Releases</h2>
+ <h2 class="title">发行版本</h2>
<p class="description">
- Apache APISIX is released as source code tarballs. The downloads are
distributed via mirror sites and should be
- checked for tampering using GPG or SHA-512.
+ Apache APISIX 以源码包的形式发行，通过镜像站分发下载。为保证内容没有被篡改，需要使用 GPG 或 SHA-512 校验。
</p>
<div class="table-container" role="table" aria-label="Destinations">
<div class="flex-table header" role="rowgroup">
- <div class="flex-row first" role="columnheader">Version</div>
- <div class="flex-row" role="columnheader">Release date</div>
- <div class="flex-row" role="columnheader">Source download</div>
+ <div class="flex-row first" role="columnheader">版本</div>
+ <div class="flex-row" role="columnheader">发行时间</div>
+ <div class="flex-row" role="columnheader">源码下载</div>
</div>
<div class="flex-table row" role="rowgroup">
<div class="flex-row first" role="cell"><span class="flag-icon
flag-icon-gb"></span>0.9</div>
@@ -348,13 +347,10 @@
</div>
</section>
<section>
- <h2 class="title">Verify the releases</h2>
- <a href="https://www.apache.org/dist/incubator/apisix/KEYS";>PGP signatures
KEYS</a>
+ <h2 class="title">校验发行版本</h2>
+ <a href="https://www.apache.org/dist/incubator/apisix/KEYS";>PGP 签名密钥</a>
<p>
- It is essential that you verify the integrity of the downloaded files
using the PGP or SHA signatures. The PGP
- signatures can be verified using GPG or PGP. Please download the KEYS as
well as the asc signature files for
- relevant distribution. It is recommended to get these files from the
main distribution directory and not from the
- mirrors.
+ 使用 PGP 或 SHA 签名检验下载文件的完整性非常重要。PGP 签名可用 GPG 或 PGP 验证。请下载密钥以及对应版本的 acs
签名文件，我们建议您从主发布目录而不是镜像中获取这些文件。
</p>
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
@@ -369,7 +365,7 @@
</div>
<p>
- or
+ 或者
</p>
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
@@ -384,7 +380,7 @@
</div>
<p>
- or
+ 或者
</p>
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
@@ -399,8 +395,7 @@
</div>
<p>
- To verify the binaries/sources you can download the relevant asc files
for it from main distribution directory and
- follow the below guide.
+ 要验证二进制文件或源代码，您可以从主发布目录下载相关的 asc 文件，并根据下面的指南操作。
</p>
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
@@ -415,7 +410,7 @@
</div>
<p>
- or
+ 或者
</p>
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
@@ -430,7 +425,7 @@
</div>
<p>
- or
+ 或者
</p>
<div class="highlight"><div
style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4">
diff --git a/zh/index.xml b/zh/index.xml
index 9b5366a..d122bd5 100644
--- a/zh/index.xml
+++ b/zh/index.xml
@@ -16,8 +16,14 @@
<pubDate>Sun, 29 Mar 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.apache.org/zh/contribute/2fa/</guid>
- <description>Two-factor authentication(2FA) Two factor authentication
(2FA) refers to the authentication method that combines both passport and an
object (credit card, SMS phone, token or biomarkers as fingerprint) to identify
a user. To ensure the security of the committer’s account, we need you to
enable 2FA to sign in and contribute codes on GitHub. More details, please
refer to 2FA.
-Note:If you do not enable 2FA, you will be removed from the project and unable
to access our repositories and the fork from our private
repository.</description>
+ <description> 两步验证（2FA）
两步验证（2FA）是一种更加安全的用户认证手段，在除了使用用户名和密码之外，还需要使用其他材料（如信用卡、手机短信、令牌、指纹等生物特征）验证用户身份。为了确保提交者账户的安全性，您需要在
GitHub 上启用 2FA 来登录和提交贡献。更多的细节，请参考 2FA。
+注意：如果您没有启用 2FA，您将会被从项目中移除，亦无法访问我们的仓库、fork 我们的私有仓库。
+在 GitHub 上启用 2FA 具体操作细节，请参考 Enable Two Factor Authentication with TOTP。
+在启用 2FA 之后，您需要使用用户名/密码 + 验证码，来登陆 GitHub。
+提示： 如果您无法通过页面上的链接下载 APP，您可以在应用商店中搜索下载 Google Authenticator。
+如何提交代码 在启用 2FA 之后，您需要生成私有访问令牌（Private Access Token）来进行 Git 提交之类的操作。此时，您将使用用户名
+ 令牌来提交代码，而不是原先的用户名 + 密码。
+具体操作细节，请参考 Create a Private Token.
+ </description>
</item>
<item>
@@ -72,11 +78,20 @@ Note:If you do not enable 2FA, you will be removed from the
project and unable t
<pubDate>Sun, 29 Mar 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.apache.org/zh/contribute/contributor/</guid>
- <description>Please fee free to report bugs, submit suggestions, or
submit PRs according to this guide.
-Submit an issue 1. Before submitting your issues, please go through a
comprehensive search to make sure the problem cannot be solved just by
searching.
-2. Check the Issue List to make sure the problem is not repeated.
-3. Create a new issue and choose the type of issue.
-4. Define the issue with a clear and descriptive title.</description>
+ <description>请按照这份指南，报告 bugs、提出建议或提交 PR，不必拘谨。
+提交 Issue 1. 在提交 Issue 之前，请充分利用搜索，确保问题无法通过搜索结果解决。
+2. 检查 Issue 列表 确保没有重复的问题
+3. 创建一个新的 Issue 并选择恰当的 Issue 类型。
+4. 用一个清晰准确的描述性标题来描述您的 Issue。
+5. 根据模板，填写必要的信息。
+6. 为您的 Issue 选择恰当的标签。
+7. 请关注您的 Issue，您可能需要在讨论中提供更多的信息。
+开发者流程
+Fork 代码仓库 请 Fork 一份 Apache APISIX 的代码仓库到您自己的仓库中，然后设定恰当的上游分支。
+1 2 git remote add upstream https://github.com/apache/incubator-apisix.git
选择一个 Issue
+1. 请选择您的目标 Issue。如果您希望报告一个新发现的 Issue 或者一个新的功能增强，请先创建 Issue 并设定恰当的标签。
+2. 在选择一个有价值的 Issue 之后，请回复一个截止时间来表明您正在尝试解决它。
+3. 在 团队页面 选择一个导师，他将会及时对您的 Issue 和 PR 做出反馈。</description>
</item>
<item>
@@ -85,8 +100,10 @@ Submit an issue 1. Before submitting your issues, please go
through a comprehens
<pubDate>Thu, 16 Jan 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.apache.org/zh/contribute/security/</guid>
- <description>The Apache Software Foundation takes a rigorous stance on
eliminating security issues in its software projects. Apache APISIX is also
very concerned Security issues related to its features and functionality.
-If you have apprehensions regarding APISIX’s security or you discover
vulnerability or potential threat, don’t hesitate to get in touch with the
Apache Security Team by dropping a mail at secur...@apache.org. Please specify
the project name as APISIX and its product name APISIX or APISIX-Dashboard in
the email and provide a description of the relevant problem or potential
threat.</description>
+ <description>Apache 软件基金会采取严格的立场来消除软件项目中的安全问题，Apache APISIX
同样非常重视与其特性和功能相关的安全问题。
+如果您对 APISIX 的安全性感到担忧，或者发现了漏洞或潜在的威胁，请立即通过电子邮箱 secur...@apache.org 与 Apache
安全团队联系。请在邮件中指明项目名称 APISIX 及产品名称 APISIX 或
APISIX-Dashboard，并提供相关问题或潜在威胁的描述。我们建议您同时给出复现问题的方法。Apache 安全团队及 APISIX
社区将会在调查分析后与您联系。
+请您注意：在通过安全邮件报告安全问题前，请不要在公开场合披露相关问题。
+ </description>
</item>
<item>
@@ -111,7 +128,7 @@ GnuPG-2.x可使用：
<pubDate>Tue, 26 Nov 2019 23:48:02 +0800</pubDate>
<guid>https://apisix.apache.org/zh/downloads/</guid>
- <description>Releases Apache APISIX is released as source code tarballs.
The downloads are distributed via mirror sites and should be checked for
tampering using GPG or SHA-512. Version Release date Source download 0.9
2019-11-24 源码 ( asc sha512 ) 1.0 2020-01-15 源码 ( asc sha512 ) 1.1
2020-02-24 源码 ( asc sha512 ) 1.2 2020-04-20 源码 ( asc sha512 ) 1.3
2020-05-24 源码 ( asc sha512 ) 1.</description>
+ <description>发行版本 Apache APISIX 以源码包的形式发行，通过镜像站分发下载。为保证内容没有被篡改，需要使用 GPG
或 SHA-512 校验。 版本 发行时间 源码下载 0.9 2019-11-24 源码 ( asc sha512 ) 1.0 2020-01-15
源码 ( asc sha512 ) 1.1 2020-02-24 源码 ( asc sha512 ) 1.2 2020-04-20 源码 ( asc
sha512 ) 1.3 2020-05-24 源码 ( asc sha512 ) 1.4 2020-06-29 源码 ( asc sha512 )
1.4.1 2020-07-20 源码 ( asc sha512 ) 1.</description>
</item>
</channel>
