This is an automated email from the ASF dual-hosted git repository. juzhiyuan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git
The following commit(s) were added to refs/heads/master by this push: new 2fcfa30 add translate doc. (#49) 2fcfa30 is described below commit 2fcfa302fae06729bcf336315628c6eb8dc5a963 Author: Wen Ming <moonbingb...@gmail.com> AuthorDate: Fri Jun 19 16:29:50 2020 +0800 add translate doc. (#49) --- content/contribute/release/index.en.md | 128 ++++++++++++++++----------------- content/contribute/release/index.zh.md | 14 ++-- 2 files changed, 68 insertions(+), 74 deletions(-) diff --git a/content/contribute/release/index.en.md b/content/contribute/release/index.en.md index fa1f66d..4020900 100644 --- a/content/contribute/release/index.en.md +++ b/content/contribute/release/index.en.md @@ -6,56 +6,55 @@ include_footer: true <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> {{< highlight go "linenos=table" >}} gpg --version {{< / highlight >}} - <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> {{< highlight go "linenos=table" >}} gpg --full-gen-key {{< / highlight >}} - <p>GnuPG-1.x可使用:</p> + <p>GnuPG-1.x:</p> {{< highlight go "linenos=table" >}} gpg --gen-key {{< / highlight >}} - <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> {{< highlight go "linenos=table" >}} {{% contribute/release/gpg-key-generator %}} {{< / highlight >}} - <h3 class="subtitle">查看生成的key</h3> + <h3 class="subtitle">View the generated key:</h3> {{< highlight go "linenos=table" >}} gpg --list-keys {{< / highlight >}} - <p>执行结果:</p> + <p>The example result:</p> {{< highlight go "linenos=table" >}} - // 笔者本地电脑 $ gpg --list-keys /home/resty/.gnupg/pubring.gpg ------------------------------ - pub 4096R/30B5FD72 2020-01-02 + pub 4096R/30B5FD72 2020-01-02 uid Yuansheng Wang <membp...@apache.org> sub 4096R/3D2F913D 2020-01-02 {{< / highlight >}} - <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> {{< highlight go "linenos=table" >}} - // 最后参数是上面生成的公钥 ID。 + // The last parameter is the public key ID generated above $ gpg --keyserver hkp://pool.sks-keyservers.net --send-key 30B5FD72 gpg: sending key 30B5FD72 to hkp server pool.sks-keyservers.net {{< / highlight >}} - <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> {{< highlight go "linenos=table" >}} - # 注意下方 Key fingerprint 部分 + # Note the `Key fingerprint` section below. $ gpg --list-keys --fingerprint /home/resty/.gnupg/pubring.gpg ------------------------------ @@ -64,65 +63,60 @@ include_footer: true uid Yuansheng Wang <membp...@apache.org> sub 4096R/3D2F913D 2020-01-02 {{< / highlight >}} - <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> {{< highlight go "linenos=table" >}} - $ svn --username=${Apache 用户名} co https://dist.apache.org/repos/dist/dev/incubator/apisix + $ svn --username=${Apache username} co https://dist.apache.org/repos/dist/dev/incubator/apisix {{< / highlight >}} - <p>进入 apisix 目录并查看其中文件:</p> {{< highlight go "linenos=table" >}} - $ cd apisix + $ cd apisix $ ls KEYS {{< / highlight >}} - <p>导出公钥到追加到 KEYS 文件:</p> + <p>Export the public key and append to the KEYS file.</p> {{< highlight go "linenos=table" >}} - $ gpg -a --export ${GPG用户名} >> KEYS + $ gpg -a --export ${GPG username} >> KEYS {{< / highlight >}} - <p>提交修改后的 KEYS 文件,把公钥信息保存到 svn 服务器:</p> + <p>Commit the modified KEYS file, saving the public key to the svn server.</p> {{< highlight go "linenos=table" >}} - $ svn --username=${Apache 用户名} commit -m "added ${Apache 邮箱} gpg pub key" + $ svn --username=${Apache username} commit -m "added ${Apache email} gpg pub key" Authentication realm: <https://dist.apache.org:443> ASF Committers - Password for 'membphis': # 输入密码 + Password for 'membphis': # input password Store password unencrypted (yes/no)? yes Sending KEYS Transmitting file data . Committed revision 37434. {{< / highlight >}} - <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> {{< highlight go "linenos=table" >}} - # 进入 Apache svn 的 apisix 目录,应只有一个 KEYS 文件 - $ ls - KEYS - # 新建版本号目录并进入,比如:1.0-rc1 - $ mkdir 1.0-rc1 && cd 1.0-rc1 + # Create a new version number directory and enter, for example: 1.0-rc1 + $ mkdir 1.0-rc1 && cd 1.0-rc1 - # 下载安装包 + # download repo git clone -b v1.0 g...@github.com:apache/incubator-apisix.git apache-apisix-1.0-incubating - # 检查版本号 + # check version $ cd apache-apisix-1.0-incubating && ./utils/check-version.sh 1.0 && cd .. - # 删除 .git 文件夹 + # delete .git $ rm -rf apache-apisix-1.0-incubating/.git - # 制作压缩包 + # make tar package $ tar zcvf apache-apisix-1.0-rc1-incubating-src.tar.gz apache-apisix-1.0-incubating - # 制作签名(这步会弹出对话框,提示你输入生成 gpg 时录入的密码) + # Signature (this brings up a dialog box that prompts you to enter the password you entered when generating the gpg) $ gpg --armor --detach-sign apache-apisix-1.0-rc1-incubating-src.tar.gz - # 生成 sha512 校验文件 + # Generate sha512 checksum file $ shasum -a512 apache-apisix-1.0-rc1-incubating-src.tar.gz > apache-apisix-1.0-rc1-incubating-src.tar.gz.sha512 - # 删除 apache-apisix-1.0-rc1-incubating + # remove apache-apisix-1.0-rc1-incubating $ rm -rf apache-apisix-1.0-incubating - # 后退到 Apache svn 的 apisix 根目录,并确认文件目录 + # check files $ cd .. && tree . ├── 1.0-rc1 @@ -133,7 +127,7 @@ include_footer: true 1 directory, 4 files - # 添加新文件到 svn + # add files to SVN $ svn add * A 1.0-rc1 A (bin) 1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz.asc @@ -143,8 +137,8 @@ include_footer: true svn: E200009: Could not add all targets because some targets are already versioned svn: E200009: Illegal target for the requested operation - # 提交修改到 Apache svn 服务器 - $ svn --username=${Apache 用户名} commit -m "release 1.0-rc1" + # commit to Apache SVN + $ svn --username=${Apache username} commit -m "release 1.0-rc1" Adding 1.0-rc1 Adding (bin) 1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz Adding (bin) 1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz.asc @@ -152,19 +146,19 @@ include_footer: true Transmitting file data ... Committed revision 37435. {{< / highlight >}} - <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 邮件到 d...@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=u...@mail.gmail.com%3e">点击此处查看参考邮件</a> 在 gene...@incubator.apache.org 发起投票邮件,同时需要将在 d...@apisix.apache.org 邮件列表中的统计结果附加到此封邮件,主要参考内容:邮件发送人(apache 邮箱)、邮件标题、邮件正文(主要是修改版本号和链接地址)。</p> - <h3 class="subtitle">再次统计投票结果</h3> - <p><a href="http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3ccabzgmxfal247-9u4ehabxrezhkjykzhh2izuiu2jdtx7zg4...@mail.gmail.com%3e">点击此处查看参考邮件</a> 发起投票邮件后需要等待72小时,然后统计投票结果并发送一封 result 邮件到 gene...@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> 在 d...@apisix.apache.org 和 gene...@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 d...@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=u...@mail.gmail.com%3e">Click here to view the reference email</a> send vote thread to gene...@incubator.apache.org and add link of vote result of d...@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-9u4ehabxrezhkjykzhh2izuiu2jdtx7zg4...@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 gene...@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 d...@apisix.apache.org and gene...@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> \ No newline at end of file +</div> diff --git a/content/contribute/release/index.zh.md b/content/contribute/release/index.zh.md index 5b7ae13..a72230c 100644 --- a/content/contribute/release/index.zh.md +++ b/content/contribute/release/index.zh.md @@ -39,7 +39,7 @@ include_footer: true $ gpg --list-keys /home/resty/.gnupg/pubring.gpg ------------------------------ - pub 4096R/30B5FD72 2020-01-02 + pub 4096R/30B5FD72 2020-01-02 uid Yuansheng Wang <membp...@apache.org> sub 4096R/3D2F913D 2020-01-02 {{< / highlight >}} @@ -73,7 +73,7 @@ include_footer: true {{< / highlight >}} <p>进入 apisix 目录并查看其中文件:</p> {{< highlight go "linenos=table" >}} - $ cd apisix + $ cd apisix $ ls KEYS {{< / highlight >}} @@ -99,7 +99,7 @@ include_footer: true KEYS # 新建版本号目录并进入,比如:1.0-rc1 - $ mkdir 1.0-rc1 && cd 1.0-rc1 + $ mkdir 1.0-rc1 && cd 1.0-rc1 # 下载安装包 git clone -b v1.0 g...@github.com:apache/incubator-apisix.git apache-apisix-1.0-incubating @@ -152,13 +152,13 @@ include_footer: true Transmitting file data ... Committed revision 37435. {{< / highlight >}} - <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 邮件到 d...@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=u...@mail.gmail.com%3e">点击此处查看参考邮件</a> 在 gene...@incubator.apache.org 发起投票邮件,同时需要将在 d...@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-9u4ehabxrezhkjykzhh2izuiu2jdtx7zg4...@mail.gmail.com%3e">点击此处查看参考邮件</a> 发起投票邮件后需要等待72小时,然后统计投票结果并发送一封 result 邮件到 gene...@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> 在 d...@apisix.apache.org 和 gene...@incubator.apache.org 两个邮件列表发起 announce 邮件</p> @@ -167,4 +167,4 @@ include_footer: true <h3 class="subtitle">更新下载信息</h3> <p>更新<a href="http://apisix.apache.org/downloads/">此地址</a> 的下载信息,源码在 https://github.com/apache/incubator-apisix-website</p> </section> -</div> \ No newline at end of file +</div>