You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by gi...@apache.org on 2020/06/19 08:30:20 UTC
[incubator-apisix-website] branch asf-site updated: Deploy to
GitHub pages
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/incubator-apisix-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new d75f531 Deploy to GitHub pages
d75f531 is described below
commit d75f531945e9c4ab34dd66c2fc9bbad009b32f6c
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Fri Jun 19 08:30:09 2020 +0000
Deploy to GitHub pages
---
contribute/index.xml | 13 ++--
contribute/release/index.html | 147 ++++++++++++++++++---------------------
index.xml | 13 ++--
zh/contribute/release/index.html | 12 ++--
4 files changed, 82 insertions(+), 103 deletions(-)
diff --git a/contribute/index.xml b/contribute/index.xml
index 6532df2..5205762 100644
--- a/contribute/index.xml
+++ b/contribute/index.xml
@@ -77,14 +77,11 @@ If you have apprehensions regarding APISIX’s security or you discover vulnerab
<pubDate>Tue, 07 Jan 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.incubator.apache.org/contribute/release/</guid>
- <description>GPG 设置 安装 GPG 在 GnuPG 官网下载安装包。 GnuPG 的 1.x 版本和 2.x 版本的命令有细微差别，下列说明以 GnuPG-2.1.23 版本为例。
-安装完成后，执行以下命令查看版本号。
-1 2 gpg --version 创建 Key 安装完成后，执行以下命令创建key。
-GnuPG-2.x可使用：
-1 2 gpg --full-gen-key GnuPG-1.x可使用：
-1 2 gpg --gen-key 根据提示完成key：
-注意：请使用Apache mail生成GPG的Key。
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 gpg (GnuPG) 2.</description>
+ <description>GPG Settings Install GPG Download GnuPG from https://gnupg.org/download/index.html. There are differences between the 1.x and 2.x versions of the GnuPG commands, and the following descriptions are based on the GnuPG 2.x versions.
+After the installation is complete, execute the following command to check the version.
+1 2 gpg --version Create Key Execute the following command to create the key:
+GnuPG-2.x：
+1 2 gpg --full-gen-key GnuPG-1.</description>
</item>
</channel>
diff --git a/contribute/release/index.html b/contribute/release/index.html
index deb07fd..00b7cb8 100644
--- a/contribute/release/index.html
+++ b/contribute/release/index.html
@@ -4,14 +4,11 @@
<meta property="og:title" content="Release Guide" />
-<meta property="og:description" content="GPG 设置 安装 GPG 在 GnuPG 官网下载安装包。 GnuPG 的 1.x 版本和 2.x 版本的命令有细微差别，下列说明以 GnuPG-2.1.23 版本为例。
-安装完成后，执行以下命令查看版本号。
-1 2 gpg --version 创建 Key 安装完成后，执行以下命令创建key。
-GnuPG-2.x可使用：
-1 2 gpg --full-gen-key GnuPG-1.x可使用：
-1 2 gpg --gen-key 根据提示完成key：
-注意：请使用Apache mail生成GPG的Key。
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 gpg (GnuPG) 2." />
+<meta property="og:description" content="GPG Settings Install GPG Download GnuPG from https://gnupg.org/download/index.html. There are differences between the 1.x and 2.x versions of the GnuPG commands, and the following descriptions are based on the GnuPG 2.x versions.
+After the installation is complete, execute the following command to check the version.
+1 2 gpg --version Create Key Execute the following command to create the key:
+GnuPG-2.x：
+1 2 gpg --full-gen-key GnuPG-1." />
<meta property="og:type" content="article" />
<meta property="og:url" content="https://apisix.incubator.apache.org/contribute/release/" />
<meta property="article:published_time" content="2020-01-07T11:46:04+08:00" />
@@ -233,11 +230,11 @@ GnuPG-2.x可使用：
</div>
<div class="release-guide">
<section>
- <h2 class="title">GPG 设置</h2>
+ <h2 class="title">GPG Settings</h2>
<br />
- <h3 class="subtitle">安装 GPG</h3>
- <p>在 GnuPG 官网下载安装包。 GnuPG 的 1.x 版本和 2.x 版本的命令有细微差别，下列说明以 GnuPG-2.1.23 版本为例。</p>
- <p>安装完成后，执行以下命令查看版本号。</p>
+ <h3 class="subtitle">Install GPG</h3>
+ <p>Download GnuPG from https://gnupg.org/download/index.html. There are differences between the 1.x and 2.x versions of the GnuPG commands, and the following descriptions are based on the GnuPG 2.x versions.</p>
+ <p>After the installation is complete, execute the following command to check the version.</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -248,9 +245,9 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <h3 class="subtitle">创建 Key</h3>
- <p>安装完成后，执行以下命令创建key。</p>
- <p>GnuPG-2.x可使用：</p>
+ <h3 class="subtitle">Create Key</h3>
+ <p>Execute the following command to create the key:</p>
+ <p>GnuPG-2.x：</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -261,7 +258,7 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <p>GnuPG-1.x可使用：</p>
+ <p>GnuPG-1.x：</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -272,8 +269,8 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <p>根据提示完成key：</p>
- <p class="warning">注意：请使用Apache mail生成GPG的Key。</p>
+ <p>Follow the instructions to generate key：</p>
+ <p class="warning">Note: Please use Apache email address to generate the GPG Key.</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 1
@@ -348,7 +345,7 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <h3 class="subtitle">查看生成的key</h3>
+ <h3 class="subtitle">View the generated key:</h3>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -359,7 +356,7 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <p>执行结果：</p>
+ <p>The example result：</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -369,22 +366,20 @@ GnuPG-2.x可使用：
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">5
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">6
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">7
-</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">8
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#75715e">// 笔者本地电脑
-</span><span style="color:#75715e"></span> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">list</span><span style="color:#f92672">-</span><span style="color:#a6e22e">keys</span>
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">list</span><span style="color:#f92672">-</span><span style="color:#a6e22e">keys</span>
<span style="color:#f92672">/</span><span style="color:#a6e22e">home</span><span style="color:#f92672">/</span><span style="color:#a6e22e">resty</span><span style="color:#f92672">/</span>.<span style="color:#a6e22e">gnupg</span><span style="color:#f92672">/</span><span style="color:#a6e22e">pubring</span>.<span style="color:#a6e22e">gpg</span>
<span style="color:#f92672">------------------------------</span>
- <span style="color:#a6e22e">pub</span> <span style="color:#ae81ff">4096</span><span style="color:#a6e22e">R</span><span style="color:#f92672">/</span><span style="color:#ae81ff">30</span><span style="color:#a6e22e">B5FD72</span> <span style="color:#ae81ff">2020</span><span style="color:#f92672">-</span><span style="color:#ae81ff">01</span><span style="color:#f92672">-</span><span style="color:#ae81ff">02</span>
+ <span style="color:#a6e22e">pub</span> <span style="color:#ae81ff">4096</span><span style="color:#a6e22e">R</span><span style="color:#f92672">/</span><span style="color:#ae81ff">30</span><span style="color:#a6e22e">B5FD72</span> <span style="color:#ae81ff">2020</span><span style="color:#f92672">-</span><span style="color:#ae81ff">01</span><span style="color:#f92672">-</span><span style="color:#ae81ff">02</span>
<span style="color:#a6e22e">uid</span> <span style="color:#a6e22e">Yuansheng</span> <span style="color:#a6e22e">Wang</span> <<span style="color:#a6e22e">membphis</span><span style="color:#960050;background-color:#1e0010">@</span><span style="color:#a6e22e">apache</span>.<span style="color:#a6e22e">org</span>>
<span style="color:#a6e22e">sub</span> <span style="color:#ae81ff">4096</span><span style="color:#a6e22e">R</span><span style="color:#f92672">/</span><span style="color:#ae81ff">3</span><span style="color:#a6e22e">D2F913D</span> <span style="color:#ae81ff">2020</span><span style="color:#f92672">-</span><span style="color:#ae81ff">01</span><span style="color:#f92672">-</span><span style="color:#ae81ff">02</span>
</code></pre></td></tr></table>
</div>
</div>
- <p>其中 30B5FD72 为公钥 ID。</p>
- <h3 class="subtitle">将公钥同步到服务器</h3>
- <p>命令如下：</p>
+ <p>And `30B5FD72` is the ID of pub key</p>
+ <h3 class="subtitle">Synchronizing the public key to the server</h3>
+ <p>The steps are as follows:</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -393,15 +388,15 @@ GnuPG-2.x可使用：
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">4
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#75715e">// 最后参数是上面生成的公钥 ID。
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#75715e">// The last parameter is the public key ID generated above
</span><span style="color:#75715e"></span> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">keyserver</span> <span style="color:#a6e22e">hkp</span>:<span style="color:#75715e">//pool.sks-keyservers.net --send-key 30B5FD72
</span><span style="color:#75715e"></span> <span style="color:#a6e22e">gpg</span>: <span style="color:#a6e22e">sending</span> <span style="color:#a6e22e">key</span> <span style="color:#ae81ff">30</span><span style="color:#a6e22e">B5FD72</span> <span style="color:#a6e22e">to</span> <span style="color:#a6e22e">hkp</span> <span style="color:#a6e22e">server</span> <span style="color:#a6e22e">pool</span>.<span style="color:#a6e22e">sks</span><span style="color:#f92672">-</span><span style= [...]
</code></pre></td></tr></table>
</div>
</div>
- <p>pool.sks-keyservers.net为随意挑选的<a href="https://sks-keyservers.net/status/" target="_blank">公钥服务器</a>，每个服务器之间是自动同步的，选任意一个即可。</p>
- <h3 class="subtitle">id.apache.org 中录入 Key Fingerprint</h3>
- <p>获取 Key Fingerprint</p>
+ <p>pool.sks-keyservers.net is one of <a href="https://sks-keyservers.net/status/" target="_blank">pub key servers,</a>the pub key will be automatically synchronized between each server, just choose any one.</p>
+ <h3 class="subtitle">Add `Key Fingerprint` to id.apache.org </h3>
+ <p>get Key Fingerprint</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -415,7 +410,7 @@ GnuPG-2.x可使用：
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">9
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">注意下方</span> <span style="color:#a6e22e">Key</span> <span style="color:#a6e22e">fingerprint</span> <span style="color:#a6e22e">部分</span>
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">Note</span> <span style="color:#a6e22e">the</span> <span style="color:#e6db74">`Key fingerprint`</span> <span style="color:#a6e22e">section</span> <span style="color:#a6e22e">below</span>.
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">list</span><span style="color:#f92672">-</span><span style="color:#a6e22e">keys</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">fingerprint</span>
<span style="color:#f92672">/</span><span style="color:#a6e22e">home</span><span style="color:#f92672">/</span><span style="color:#a6e22e">resty</span><span style="color:#f92672">/</span>.<span style="color:#a6e22e">gnupg</span><span style="color:#f92672">/</span><span style="color:#a6e22e">pubring</span>.<span style="color:#a6e22e">gpg</span>
<span style="color:#f92672">------------------------------</span>
@@ -426,21 +421,19 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <h3 class="subtitle">登录 id.apache.org 填写 Key Fingerprint</h3>
- <p>点击左下角的 Submit changes... 按钮提交保存。</p>
- <h3 class="subtitle">Apache svn 中添加自己的 GPG 公钥</h3>
- <p>下载 svn 目录</p>
+ <h3 class="subtitle">Login id.apache.org and submit Key Fingerprint</h3>
+ <h3 class="subtitle">Add your GPG key to Apache svn</h3>
+ <p>download APISIX svn</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">2
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">svn</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">username</span>=<span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">用户名</span>} <span style="color:#a6e22e"> [...]
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">svn</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">username</span>=<span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">username</span>} <span style="color:#a6e [...]
</span><span style="color:#75715e"></span> </code></pre></td></tr></table>
</div>
</div>
- <p>进入 apisix 目录并查看其中文件:</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -449,24 +442,24 @@ GnuPG-2.x可使用：
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">4
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">cd</span> <span style="color:#a6e22e">apisix</span>
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">cd</span> <span style="color:#a6e22e">apisix</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">ls</span>
<span style="color:#a6e22e">KEYS</span>
</code></pre></td></tr></table>
</div>
</div>
- <p>导出公钥到追加到 KEYS 文件：</p>
+ <p>Export the public key and append to the KEYS file.</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">2
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">a</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">export</span> <span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">GPG用户名</spa [...]
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">a</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">export</span> <span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">GPG</span> [...]
</code></pre></td></tr></table>
</div>
</div>
- <p>提交修改后的 KEYS 文件，把公钥信息保存到 svn 服务器：</p>
+ <p>Commit the modified KEYS file, saving the public key to the svn server.</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">1
@@ -479,9 +472,9 @@ GnuPG-2.x可使用：
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">8
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">svn</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">username</span>=<span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">用户名</span>} <span style="color:#a6e22e"> [...]
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">svn</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">username</span>=<span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">username</span>} <span style="color:#a6e [...]
<span style="color:#a6e22e">Authentication</span> <span style="color:#a6e22e">realm</span>: <<span style="color:#a6e22e">https</span>:<span style="color:#75715e">//dist.apache.org:443> ASF Committers
-</span><span style="color:#75715e"></span> <span style="color:#a6e22e">Password</span> <span style="color:#66d9ef">for</span> <span style="color:#960050;background-color:#1e0010">'</span><span style="color:#a6e22e">membphis</span><span style="color:#960050;background-color:#1e0010">'</span>: <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">输入密码</span>
+</span><span style="color:#75715e"></span> <span style="color:#a6e22e">Password</span> <span style="color:#66d9ef">for</span> <span style="color:#960050;background-color:#1e0010">'</span><span style="color:#a6e22e">membphis</span><span style="color:#960050;background-color:#1e0010">'</span>: <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">input</span> <span style="color:#a6e22e">password</span>
<span style="color:#a6e22e">Store</span> <span style="color:#a6e22e">password</span> <span style="color:#a6e22e">unencrypted</span> (<span style="color:#a6e22e">yes</span><span style="color:#f92672">/</span><span style="color:#a6e22e">no</span>)<span style="color:#960050;background-color:#1e0010">?</span> <span style="color:#a6e22e">yes</span>
<span style="color:#a6e22e">Sending</span> <span style="color:#a6e22e">KEYS</span>
<span style="color:#a6e22e">Transmitting</span> <span style="color:#a6e22e">file</span> <span style="color:#a6e22e">data</span> .
@@ -489,8 +482,8 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <h3 class="subtitle">制作安装包并上传到 Apache svn</h3>
- <p>每个安装包都有版本，这里以准备 1.0-rc1 版本为例。在制作安装包之前，先确保在 github 上已经准备好分支 v1.0。</p>
+ <h3 class="subtitle">Make source code package and upload to Apache SVN</h3>
+ <p>Here's an example of preparing a 1.0-rc1 version. Before you make package, make sure you have branch v1.0 ready on github.</p>
<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;">
<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f"> 1
@@ -547,41 +540,33 @@ GnuPG-2.x可使用：
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">52
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">53
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">54
-</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">55
-</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">56
-</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">57
-</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">58
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">进入</span> <span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">svn</span> <span style="color:#a6e22e">的</span> <span style="color:#a6e22e">apisix</span> <span style="color:#a6e22e">目录</span><span style="color:#960050;background-color:#1e0010">，</s [...]
- <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">ls</span>
- <span style="color:#a6e22e">KEYS</span>
-
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">新建版本号目录并进入</span><span style="color:#960050;background-color:#1e0010">，</span><span style="color:#a6e22e">比如</span><span style="color:#960050;background-color:#1e0010">：</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
- <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">mkdir</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span> <span style="color:#f92672">&&</span> <span style="color:#a6e22e">cd</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">Create</span> <span style="color:#a6e22e">a</span> <span style="color:#a6e22e">new</span> <span style="color:#a6e22e">version</span> <span style="color:#a6e22e">number</span> <span style="color:#a6e22e">directory</span> <span style="color:#a6e22e">and</span> <span [...]
+ <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">mkdir</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span> <span style="color:#f92672">&&</span> <span style="color:#a6e22e">cd</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">下载安装包</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">download</span> <span style="color:#a6e22e">repo</span>
<span style="color:#a6e22e">git</span> <span style="color:#a6e22e">clone</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">b</span> <span style="color:#a6e22e">v1</span><span style="color:#ae81ff">.0</span> <span style="color:#a6e22e">git</span><span style="color:#960050;background-color:#1e0010">@</span><span style="color:#a6e22e">github</span>.<span style="color:#a6e22e">com</span>:<span style="color:#a6e22e">apache</span><span style="color:#f92672">/</span><sp [...]
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">检查版本号</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">check</span> <span style="color:#a6e22e">version</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">cd</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">incubating</span> <span style="color:#f92672">&&</span> .<span style="color:#f92672">/</span><span style="color:#a6e22e">uti [...]
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">删除</span> .<span style="color:#a6e22e">git</span> <span style="color:#a6e22e">文件夹</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">delete</span> .<span style="color:#a6e22e">git</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">rm</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">rf</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">incubating</span><span style="color:#f92672">/</span>.<spa [...]
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">制作压缩包</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">make</span> <span style="color:#a6e22e">tar</span> <span style="color:#f92672">package</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">tar</span> <span style="color:#a6e22e">zcvf</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span><span style="color:#f92672">-</span><span style="color:#a6e22e">incubating</span> [...]
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">制作签名</span><span style="color:#960050;background-color:#1e0010">（</span><span style="color:#a6e22e">这步会弹出对话框</span><span style="color:#960050;background-color:#1e0010">，</span><span style="color:#a6e22e">提示你输入生成</span> <span style="color:#a6e22e">gpg</span> <span style="color:#a6e22e">时录入的密码</span><span style="color:#960050;background-color:#1e0010">）</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">Signature</span> (<span style="color:#a6e22e">this</span> <span style="color:#a6e22e">brings</span> <span style="color:#a6e22e">up</span> <span style="color:#a6e22e">a</span> <span style="color:#a6e22e">dialog</span> <span style="color:#a6e22e">box</span> <span style="color:#a6e22e">that</span> <span style="color:#a6e22e">prompts</span> <span style="color:#a6e22e">you</span> <span style="color:# [...]
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">armor</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">detach</span><span style="color:#f92672">-</span><span style="color:#a6e22e">sign</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span>< [...]
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">生成</span> <span style="color:#a6e22e">sha512</span> <span style="color:#a6e22e">校验文件</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">Generate</span> <span style="color:#a6e22e">sha512</span> <span style="color:#a6e22e">checksum</span> <span style="color:#a6e22e">file</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">shasum</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">a512</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span><span style="color:#f92672">-</span><span [...]
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">删除</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span><span style="color:#f92672">-</span><span style="color:#a6e22e">incubating</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">remove</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span><span style="color:#f92672">-</span><span style="color:#a6e22e">incubating</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">rm</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">rf</span> <span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">incubating</span>
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">后退到</span> <span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">svn</span> <span style="color:#a6e22e">的</span> <span style="color:#a6e22e">apisix</span> <span style="color:#a6e22e">根目录</span><span style="color:#960050;background-color:#1e0010">，</span><span style="color:#a6e22e">并确认文件目录</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">check</span> <span style="color:#a6e22e">files</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">cd</span> .. <span style="color:#f92672">&&</span> <span style="color:#a6e22e">tree</span>
.
<span style="color:#960050;background-color:#1e0010">├──</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
@@ -592,7 +577,7 @@ GnuPG-2.x可使用：
<span style="color:#ae81ff">1</span> <span style="color:#a6e22e">directory</span>, <span style="color:#ae81ff">4</span> <span style="color:#a6e22e">files</span>
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">添加新文件到</span> <span style="color:#a6e22e">svn</span>
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">add</span> <span style="color:#a6e22e">files</span> <span style="color:#a6e22e">to</span> <span style="color:#a6e22e">SVN</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">svn</span> <span style="color:#a6e22e">add</span> <span style="color:#f92672">*</span>
<span style="color:#a6e22e">A</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
<span style="color:#a6e22e">A</span> (<span style="color:#a6e22e">bin</span>) <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span><span style="color:#f92672">/</span><span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1< [...]
@@ -602,8 +587,8 @@ GnuPG-2.x可使用：
<span style="color:#a6e22e">svn</span>: <span style="color:#a6e22e">E200009</span>: <span style="color:#a6e22e">Could</span> <span style="color:#a6e22e">not</span> <span style="color:#a6e22e">add</span> <span style="color:#a6e22e">all</span> <span style="color:#a6e22e">targets</span> <span style="color:#a6e22e">because</span> <span style="color:#a6e22e">some</span> <span style="color:#a6e22e">targets</span> <span style="color:#a6e22e">are</span> <span style="color:#a6e22e">already</s [...]
<span style="color:#a6e22e">svn</span>: <span style="color:#a6e22e">E200009</span>: <span style="color:#a6e22e">Illegal</span> <span style="color:#a6e22e">target</span> <span style="color:#66d9ef">for</span> <span style="color:#a6e22e">the</span> <span style="color:#a6e22e">requested</span> <span style="color:#a6e22e">operation</span>
- <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">提交修改到</span> <span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">svn</span> <span style="color:#a6e22e">服务器</span>
- <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">svn</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">username</span>=<span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">用户名</span>} <span style="color:#a6e22e">commit</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">m</span> <span style="color:#e6db74">"release 1.0-rc [...]
+ <span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">commit</span> <span style="color:#a6e22e">to</span> <span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">SVN</span>
+ <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">svn</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">username</span>=<span style="color:#960050;background-color:#1e0010">$</span>{<span style="color:#a6e22e">Apache</span> <span style="color:#a6e22e">username</span>} <span style="color:#a6e22e">commit</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">m</span> <span style="color:#e6db74">"release 1 [...]
<span style="color:#a6e22e">Adding</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
<span style="color:#a6e22e">Adding</span> (<span style="color:#a6e22e">bin</span>) <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span><span style="color:#f92672">/</span><span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e" [...]
<span style="color:#a6e22e">Adding</span> (<span style="color:#a6e22e">bin</span>) <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span><span style="color:#f92672">/</span><span style="color:#a6e22e">apache</span><span style="color:#f92672">-</span><span style="color:#a6e22e">apisix</span><span style="color:#f92672">-</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e" [...]
@@ -613,20 +598,20 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <h3 class="subtitle">发投票邮件</h3>
- <p><a href="https://lists.apache.org/thread.html/4d45dcbeecd0bb70f8010db3d075a5624817a5783beee66f392ae5e0%40%3Cdev.apisix.apache.org%3E">点击此处查看参考邮件</a> 主要参考内容：邮件发送人（apache 邮箱）、邮件标题、邮件正文（主要是修改版本号和链接地址）。</p>
- <h3 class="subtitle">统计投票结果</h3>
- <p><a href="https://lists.apache.org/thread.html/r8c6e14ea1a0c79b5dfb1dba0e1b6bc919a4797a0c4664f8add3b045c%40%3Cdev.apisix.apache.org%3E">点击此处查看参考邮件</a> 发起投票邮件后需要等待72小时，然后统计投票结果并发送一封 result 邮件到 dev@apisix.apache.org。</p>
- <h3 class="subtitle">再次发起投票邮件</h3>
- <p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3cCABZgMXH7e-CfxXBr5fuPsEAsfMXU4jGs4L7EM2qz+zTcHP=u1w@mail.gmail.com%3e">点击此处查看参考邮件</a> 在 general@incubator.apache.org 发起投票邮件，同时需要将在 dev@apisix.apache.org 邮件列表中的统计结果附加到此封邮件，主要参考内容：邮件发送人（apache 邮箱）、邮件标题、邮件正文（主要是修改版本号和链接地址）。</p>
- <h3 class="subtitle">再次统计投票结果</h3>
- <p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3cCABZgMXFAL247-9u4ehaBxrEzHKjYkzhH2iZuiU2jdTx7zG4bzw@mail.gmail.com%3e">点击此处查看参考邮件</a> 发起投票邮件后需要等待72小时，然后统计投票结果并发送一封 result 邮件到 general@incubator.apache.org。</p>
- <h3 class="subtitle">发 announce 邮件</h3>
- <p><a href="https://lists.apache.org/thread.html/r67093ed9a5fbe106dc5066c283f225544f5ae14248df061019d1062e%40%3Cgeneral.incubator.apache.org%3E">点击此处查看参考邮件</a> 在 dev@apisix.apache.org 和 general@incubator.apache.org 两个邮件列表发起 announce 邮件</p>
- <h3 class="subtitle">移动安装包到 release 目录下</h3>
- <p>将RC版本的安装包修改为正式版以后移动到 <a href="https://dist.apache.org/repos/dist/release/incubator/apisix/">此地址</a></p>
- <h3 class="subtitle">更新下载信息</h3>
- <p>更新<a href="http://apisix.apache.org/downloads/">此地址</a> 的下载信息，源码在 https://github.com/apache/incubator-apisix-website</p>
+ <h3 class="subtitle">Send vote thread to dev mailinglist</h3>
+ <p><a href="https://lists.apache.org/thread.html/4d45dcbeecd0bb70f8010db3d075a5624817a5783beee66f392ae5e0%40%3Cdev.apisix.apache.org%3E">Click here to view the reference email</a>There is a minimum wait of 72 hours before statistical voting results. If you get -1 vote, you need to solve the problem before you can continue. </p>
+ <h3 class="subtitle">Send vote result thread to dev mailinglist</h3>
+ <p><a href="https://lists.apache.org/thread.html/r8c6e14ea1a0c79b5dfb1dba0e1b6bc919a4797a0c4664f8add3b045c%40%3Cdev.apisix.apache.org%3E">Click here to view the reference email</a> at least 3 `+1` votes is required, then send the vote result to dev@apisix.apache.org. </p>
+ <h3 class="subtitle">Send vote thread to the incubator mailing list</h3>
+ <p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3cCABZgMXH7e-CfxXBr5fuPsEAsfMXU4jGs4L7EM2qz+zTcHP=u1w@mail.gmail.com%3e">Click here to view the reference email</a> send vote thread to general@incubator.apache.org and add link of vote result of dev@apisix.apache.org in this new thread.</p>
+ <h3 class="subtitle">Send vote result</h3>
+ <p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3cCABZgMXFAL247-9u4ehaBxrEzHKjYkzhH2iZuiU2jdTx7zG4bzw@mail.gmail.com%3e">Click here to view the reference email</a> There is a minimum wait of 72 hours before statistical voting results, and You need at least 3 binding `+1` votes from IPMCs(If there are less than 3 binding votes, the result email cannot be sent), then you can sent the result to general@incubator.apache.org. </p>
+ <h3 class="subtitle">send announce</h3>
+ <p><a href="https://lists.apache.org/thread.html/r67093ed9a5fbe106dc5066c283f225544f5ae14248df061019d1062e%40%3Cgeneral.incubator.apache.org%3E">Click here to view the reference email</a> send announce email to dev@apisix.apache.org and general@incubator.apache.org </p>
+ <h3 class="subtitle">move package from dev to dist</h3>
+ <p>Remove `rc` from the package name, and move to <a href="https://dist.apache.org/repos/dist/release/incubator/apisix/"></a></p>
+ <h3 class="subtitle">update download page</h3>
+ <p>update <a href="http://apisix.apache.org/downloads/"> address </a>, source repo is https://github.com/apache/incubator-apisix-website</p>
</section>
</div>
diff --git a/index.xml b/index.xml
index 07eaa0a..6518366 100644
--- a/index.xml
+++ b/index.xml
@@ -86,14 +86,11 @@ If you have apprehensions regarding APISIX’s security or you discover vulnerab
<pubDate>Tue, 07 Jan 2020 11:46:04 +0800</pubDate>
<guid>https://apisix.incubator.apache.org/contribute/release/</guid>
- <description>GPG 设置 安装 GPG 在 GnuPG 官网下载安装包。 GnuPG 的 1.x 版本和 2.x 版本的命令有细微差别，下列说明以 GnuPG-2.1.23 版本为例。
-安装完成后，执行以下命令查看版本号。
-1 2 gpg --version 创建 Key 安装完成后，执行以下命令创建key。
-GnuPG-2.x可使用：
-1 2 gpg --full-gen-key GnuPG-1.x可使用：
-1 2 gpg --gen-key 根据提示完成key：
-注意：请使用Apache mail生成GPG的Key。
-1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 gpg (GnuPG) 2.</description>
+ <description>GPG Settings Install GPG Download GnuPG from https://gnupg.org/download/index.html. There are differences between the 1.x and 2.x versions of the GnuPG commands, and the following descriptions are based on the GnuPG 2.x versions.
+After the installation is complete, execute the following command to check the version.
+1 2 gpg --version Create Key Execute the following command to create the key:
+GnuPG-2.x：
+1 2 gpg --full-gen-key GnuPG-1.</description>
</item>
<item>
diff --git a/zh/contribute/release/index.html b/zh/contribute/release/index.html
index c134509..4bdd43e 100644
--- a/zh/contribute/release/index.html
+++ b/zh/contribute/release/index.html
@@ -376,7 +376,7 @@ GnuPG-2.x可使用：
</span><span style="color:#75715e"></span> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">gpg</span> <span style="color:#f92672">--</span><span style="color:#a6e22e">list</span><span style="color:#f92672">-</span><span style="color:#a6e22e">keys</span>
<span style="color:#f92672">/</span><span style="color:#a6e22e">home</span><span style="color:#f92672">/</span><span style="color:#a6e22e">resty</span><span style="color:#f92672">/</span>.<span style="color:#a6e22e">gnupg</span><span style="color:#f92672">/</span><span style="color:#a6e22e">pubring</span>.<span style="color:#a6e22e">gpg</span>
<span style="color:#f92672">------------------------------</span>
- <span style="color:#a6e22e">pub</span> <span style="color:#ae81ff">4096</span><span style="color:#a6e22e">R</span><span style="color:#f92672">/</span><span style="color:#ae81ff">30</span><span style="color:#a6e22e">B5FD72</span> <span style="color:#ae81ff">2020</span><span style="color:#f92672">-</span><span style="color:#ae81ff">01</span><span style="color:#f92672">-</span><span style="color:#ae81ff">02</span>
+ <span style="color:#a6e22e">pub</span> <span style="color:#ae81ff">4096</span><span style="color:#a6e22e">R</span><span style="color:#f92672">/</span><span style="color:#ae81ff">30</span><span style="color:#a6e22e">B5FD72</span> <span style="color:#ae81ff">2020</span><span style="color:#f92672">-</span><span style="color:#ae81ff">01</span><span style="color:#f92672">-</span><span style="color:#ae81ff">02</span>
<span style="color:#a6e22e">uid</span> <span style="color:#a6e22e">Yuansheng</span> <span style="color:#a6e22e">Wang</span> <<span style="color:#a6e22e">membphis</span><span style="color:#960050;background-color:#1e0010">@</span><span style="color:#a6e22e">apache</span>.<span style="color:#a6e22e">org</span>>
<span style="color:#a6e22e">sub</span> <span style="color:#ae81ff">4096</span><span style="color:#a6e22e">R</span><span style="color:#f92672">/</span><span style="color:#ae81ff">3</span><span style="color:#a6e22e">D2F913D</span> <span style="color:#ae81ff">2020</span><span style="color:#f92672">-</span><span style="color:#ae81ff">01</span><span style="color:#f92672">-</span><span style="color:#ae81ff">02</span>
</code></pre></td></tr></table>
@@ -449,7 +449,7 @@ GnuPG-2.x可使用：
</span><span style="margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f">4
</span></code></pre></td>
<td style="vertical-align:top;padding:0;margin:0;border:0;">
-<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">cd</span> <span style="color:#a6e22e">apisix</span>
+<pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-go" data-lang="go"> <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">cd</span> <span style="color:#a6e22e">apisix</span>
<span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">ls</span>
<span style="color:#a6e22e">KEYS</span>
</code></pre></td></tr></table>
@@ -558,7 +558,7 @@ GnuPG-2.x可使用：
<span style="color:#a6e22e">KEYS</span>
<span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">新建版本号目录并进入</span><span style="color:#960050;background-color:#1e0010">，</span><span style="color:#a6e22e">比如</span><span style="color:#960050;background-color:#1e0010">：</span><span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
- <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">mkdir</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span> <span style="color:#f92672">&&</span> <span style="color:#a6e22e">cd</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
+ <span style="color:#960050;background-color:#1e0010">$</span> <span style="color:#a6e22e">mkdir</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span> <span style="color:#f92672">&&</span> <span style="color:#a6e22e">cd</span> <span style="color:#ae81ff">1.0</span><span style="color:#f92672">-</span><span style="color:#a6e22e">rc1</span>
<span style="color:#960050;background-color:#1e0010">#</span> <span style="color:#a6e22e">下载安装包</span>
<span style="color:#a6e22e">git</span> <span style="color:#a6e22e">clone</span> <span style="color:#f92672">-</span><span style="color:#a6e22e">b</span> <span style="color:#a6e22e">v1</span><span style="color:#ae81ff">.0</span> <span style="color:#a6e22e">git</span><span style="color:#960050;background-color:#1e0010">@</span><span style="color:#a6e22e">github</span>.<span style="color:#a6e22e">com</span>:<span style="color:#a6e22e">apache</span><span style="color:#f92672">/</span><sp [...]
@@ -613,13 +613,13 @@ GnuPG-2.x可使用：
</code></pre></td></tr></table>
</div>
</div>
- <h3 class="subtitle">发投票邮件</h3>
+ <h3 class="subtitle">发投票邮件到 dev 邮件列表</h3>
<p><a href="https://lists.apache.org/thread.html/4d45dcbeecd0bb70f8010db3d075a5624817a5783beee66f392ae5e0%40%3Cdev.apisix.apache.org%3E">点击此处查看参考邮件</a> 主要参考内容：邮件发送人（apache 邮箱）、邮件标题、邮件正文（主要是修改版本号和链接地址）。</p>
<h3 class="subtitle">统计投票结果</h3>
<p><a href="https://lists.apache.org/thread.html/r8c6e14ea1a0c79b5dfb1dba0e1b6bc919a4797a0c4664f8add3b045c%40%3Cdev.apisix.apache.org%3E">点击此处查看参考邮件</a> 发起投票邮件后需要等待72小时，然后统计投票结果并发送一封 result 邮件到 dev@apisix.apache.org。</p>
- <h3 class="subtitle">再次发起投票邮件</h3>
+ <h3 class="subtitle">发起投票邮件到孵化器邮件列表</h3>
<p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3cCABZgMXH7e-CfxXBr5fuPsEAsfMXU4jGs4L7EM2qz+zTcHP=u1w@mail.gmail.com%3e">点击此处查看参考邮件</a> 在 general@incubator.apache.org 发起投票邮件，同时需要将在 dev@apisix.apache.org 邮件列表中的统计结果附加到此封邮件，主要参考内容：邮件发送人（apache 邮箱）、邮件标题、邮件正文（主要是修改版本号和链接地址）。</p>
- <h3 class="subtitle">再次统计投票结果</h3>
+ <h3 class="subtitle">统计孵化器的投票结果</h3>
<p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3cCABZgMXFAL247-9u4ehaBxrEzHKjYkzhH2iZuiU2jdTx7zG4bzw@mail.gmail.com%3e">点击此处查看参考邮件</a> 发起投票邮件后需要等待72小时，然后统计投票结果并发送一封 result 邮件到 general@incubator.apache.org。</p>
<h3 class="subtitle">发 announce 邮件</h3>
<p><a href="https://lists.apache.org/thread.html/r67093ed9a5fbe106dc5066c283f225544f5ae14248df061019d1062e%40%3Cgeneral.incubator.apache.org%3E">点击此处查看参考邮件</a> 在 dev@apisix.apache.org 和 general@incubator.apache.org 两个邮件列表发起 announce 邮件</p>