You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by zh...@apache.org on 2019/10/17 11:33:33 UTC

[incubator-doris] branch fix-doc created (now 219a7cb)

This is an automated email from the ASF dual-hosted git repository.

zhaoc pushed a change to branch fix-doc
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git.


      at 219a7cb  Update release process documents

This branch includes the following new commits:

     new 219a7cb  Update release process documents

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org


[incubator-doris] 01/01: Update release process documents

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhaoc pushed a commit to branch fix-doc
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git

commit 219a7cb0164724a1b98f5720a0d786a2884b08b2
Author: zhaochun <zh...@baidu.com>
AuthorDate: Thu Oct 17 19:31:56 2019 +0800

    Update release process documents
---
 docs/documentation/cn/community/release-process.md | 249 +++++++++++----------
 .../en/community/release-process_EN.md             | 197 ++++++++--------
 docs/website/source/_templates/footer.html         |   2 +-
 3 files changed, 242 insertions(+), 206 deletions(-)

diff --git a/docs/documentation/cn/community/release-process.md b/docs/documentation/cn/community/release-process.md
index 60c419e..d3a6865 100644
--- a/docs/documentation/cn/community/release-process.md
+++ b/docs/documentation/cn/community/release-process.md
@@ -4,65 +4,42 @@ Apache 的发布必须至少是 IPMC 成员,拥有 apache 邮箱的commiter,
 
 发布的大致流程如下:
 
-1. 在社区发起 DISCUSS;
-2. 准备分支和打 tag;
-3. 将 tag 打包签名;
-4. 上传签名的软件包到 Apache SVN 的 DEV 目录
-3. 发社区投票邮件
-4. 投票通过后,发 Result 邮件
-5. 发邮件到 general@incubator.apache.org 进行投票
-6. 发 Result 邮件到 general@incubator.apache.org
-7. 上传签名的软件包到 Apache SVN 的 release 目录,并生成相关链接
-8. 准备 release note 并发 Announce 邮件到 general@incubator.apache.org
-9. 在 Doris 官网和 github 发布下载链接
+1. 环境准备
+2. 发布准备
+	1. 社区发起 DISCUSS 并与社区交流具体发布计划
+	2. 创建分支用于发布
+	3. 清理issue
+	4. 将必要的Patch合并到发布的分支
+3. 社区发布投票流程
+	1. 将 tag 打包,签名并上传到[Apache Dev svn 仓库](https://dist.apache.org/repos/dist/dev/incubator/doris)
+	2. 在 [Doris 社区](dev@doris.apache.org)发起投票
+	3. 投票通过后,在Doris社区发 Result 邮件
+	4. 在 [Incubator 社区](general@incubator.apache.org) 发起新一轮投票
+	5. 发 Result 邮件到 general@incubator.apache.org
+4. 完成工作
+	1. 上传签名的软件包到 [Apache release repo](https://dist.apache.org/repos/dist/release/incubator/doris),并生成相关链接
+	2. 准备 release note 并发 Announce 邮件到 general@incubator.apache.org
+	3. 在 Doris 官网和 github 发布下载链接
+
+## 准备环境
+
+如果这是你第一次发布,那么你需要在你的环境中准备如下工具
+
+1. release signing https://www.apache.org/dev/release-signing.html
+2. gpg https://www.apache.org/dev/openpgp.html
+3. svn https://www.apache.org/dev/openpgp.html
+
+### 准备gpg key
 
 Release manager 在发布前需要先生成自己的签名公钥,并上传到公钥服务器,之后就可以用这个公钥对准备发布的软件包进行签名。
+如果在[KEY](https://dist.apache.org/repos/dist/dev/incubator/doris/KEYS)里已经存在了你的KEY,那么你可以跳过这个步骤了。
 
-## 1. 准备发布
-
-###  1.1 在社区发起 DISCUSS
-
-如果觉得已经修复了很多bug,开发了比较重要的 feature,任何 IPMC 成员都可以发起 DISCUSS 讨论发布新版本。
-可以发起一个标题为 [DISCUSS] x.y.z release 的邮件,在社区内部进行讨论,说明已经修复了哪些bug,开发了哪些 features。
-如果 DISCUSS 邮件得到大家支持就可以进行下一步。
-
-###  1.2 准备分支
-
-发布前需要先新建一个分支,这个分支要进行比较充分的测试,使得功能可用,bug收敛,重要bug都得到修复。
-
-例如:
-
-```
-$ git checkout -b branch-0.9
-
-```
-
-###  1.3 打 tag
-
-当上述分支已经比较稳定后,就可以在此分支上打 tag。
-记得在创建 tag 时,修改 `gensrc/script/gen_build_version.sh` 中的 `build_version` 变量。如 `build_version="0.10.0-release"`
-
-例如:
-
-```
-$ git checkout branch-0.9
-$ git tag -a 0.9.0-rc01 -m "0.9.0 release candidate 01"
-$ git push origin 0.9.0-rc01
-Counting objects: 1, done.
-Writing objects: 100% (1/1), 165 bytes | 0 bytes/s, done.
-Total 1 (delta 0), reused 0 (delta 0)
-To git@github.com:apache/incubator-doris.git
- * [new tag]         0.9.0-rc01 -> 0.9.0-rc01
-
-$ git tag
-```
-
-## 2. 签名软件 GnuPG 的安装配置
-###  2.1 GnuPG
+#### 签名软件 GnuPG 的安装配置
+##### GnuPG
 
 1991年,程序员Phil Zimmermann为了避开政府监视,开发了加密软件PGP。这个软件非常好用,迅速流传开来,成了许多程序员的必备工具。但是,它是商业软件,不能自由使用。所以,自由软件基金会决定,开发一个PGP的替代品,取名为GnuPG。这就是GPG的由来。
 
-###  2.2 安装配置
+##### 安装配置
 
 CentOS 安装命令:
 
@@ -90,10 +67,9 @@ personal-digest-preferences SHA512
 cert-digest-algo SHA512
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
 ```
+#### 生成新的签名
 
-## 3. 生成新的签名
-
-### 3.1 准备签名
+##### 准备签名
 
 推荐的生成新签名的设置:
 
@@ -119,7 +95,7 @@ Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
 Compression: Uncompressed, ZIP, ZLIB, BZIP2
 ```
 
-### 3.2 生成新的签名
+##### 生成新的签名
 
 ```
 $ gpg --gen-key
@@ -162,7 +138,7 @@ Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
 其中 Real name 需保持和 id.apache.org 中显示的 id 一致。
 Email address 为 apache 的邮箱。
 
-### 3.3 查看和输出
+##### 查看和输出
 
 第一行显示公钥文件名(pubring.gpg),第二行显示公钥特征(4096位,Hash字符串和生成时间),第三行显示"用户ID",第四行显示私钥特征。
 
@@ -177,7 +153,9 @@ sub   4096R/0E8182E6 2018-12-06
 
 其中 xxx-yyy 就是用户ID。
 
+```
 gpg --armor --output public-key.txt --export [用户ID]
+```
 
 ```
 $ gpg --armor --output public-key.txt --export xxx-yyy
@@ -189,26 +167,24 @@ mQINBFwJEQ0BEACwqLluHfjBqD/RWZ4uoYxNYHlIzZvbvxAlwS2mn53BirLIU/G3
 9opMWNplvmK+3+gNlRlFpiZ7EvHsF/YJOAP59HmI2Z...
 ```
 
-## 4. 上传签名公钥
+#### 上传签名公钥
+
 公钥服务器是网络上专门储存用户公钥的服务器。send-keys 参数可以将公钥上传到服务器。
 
+```
 gpg --send-keys xxxx
 
-其中 xxxx 为上一步 --list-keys 结果中 pub 后面的字符串,如上为:33DBF2E0
-
-也可以通过下面的网址上传上述 public-key.txt 的内容:
-
-```
-http://keys.gnupg.net
 ```
+其中 xxxx 为上一步 `--list-keys` 结果中 pub 后面的字符串,如上为:33DBF2E0
 
-上传成功之后,可以通过查询这个网站,输入 0x33DBF2E0 查询:
+也可以通过[网站](https://keys.gnupg.net)上传上述 public-key.txt 的内容:
 
-http://keys.gnupg.net
+上传成功之后,可以通过查询这个[网站](https://keys.gnupg.net),输入 0x33DBF2E0 查询:
 
 该网站查询有延迟,可能需要等1个小时。
 
-## 5. 生成 fingerprint 并上传到 apache 用户信息中
+#### 生成 fingerprint 并上传到 apache 用户信息中
+
 由于公钥服务器没有检查机制,任何人都可以用你的名义上传公钥,所以没有办法保证服务器上的公钥的可靠性。通常,你可以在网站上公布一个公钥指纹,让其他人核对下载到的公钥是否为真。
 
 fingerprint参数生成公钥指纹:
@@ -228,41 +204,70 @@ sub   4096R/0E8182E6 2018-12-06
 将上面的 fingerprint (即 07AA E690 B01D 1A4B 469B  0BEF 5E29 CE39 33DB F2E0)粘贴到自己的用户信息中:
 
 https://id.apache.org
-OpenPGP Public Key Primary Fingerprint:
 
-## 6. 生成 keys
+OpenPGP Public Key Primary Fingerprint:
 
-新建一个名为 KEYS 的文件,写入如下内容(无需做任何修改):
+#### 生成 keys
 
 ```
-This file contains the PGP keys of various developers.
+svn co //dist.apache.org/repos/dist/dev/incubator/doris/
+# edit doris/KEY file
+gpg --list-sigs [用户 ID] >> doris/KEYS
+gpg --armor --export [用户 ID] >> doris/KEYS
+svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Update KEYS"
+```
 
-Users: pgp < KEYS
-or
-       gpg --import KEYS
+## 准备发布
 
-Developers:
-    pgp -kxa <your name> and append it to this file.
-or
-    (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
-or
-    (gpg --list-sigs <your name>
-    && gpg --armor --export <your name>) >> this file.
-```
+### 在社区发起 DISCUSS
+
+如果觉得已经修复了很多bug,开发了比较重要的 feature,任何 IPMC 成员都可以发起 DISCUSS 讨论发布新版本。
+可以发起一个标题为 [DISCUSS] x.y.z release 的邮件,在社区内部进行讨论,说明已经修复了哪些bug,开发了哪些 features。
+如果 DISCUSS 邮件得到大家支持就可以进行下一步。
+
+### 准备分支
 
-然后生成将 签名信息追加写入:
+发布前需要先新建一个分支。例如:
 
 ```
-gpg --list-sigs [用户 ID] >> KEYS
+$ git checkout -b branch-0.9
+
 ```
 
-最后,将 public key 追加导入:
+这个分支要进行比较充分的测试,使得功能可用,bug收敛,重要bug都得到修复。
+这个过程需要等待社区,看看是否有必要的patch需要在这个版本合入,如果有,需要把它cherry-pick到发布分支。
+
+### 清理issue
+
+将这个属于这个版本的所有issue都过一遍,关闭已经完成的,如果没法完成的,推迟到更晚的版本。
+
+### 合并必要的Patch
+
+在发布等待过程中,可能会有比较重要的Patch合入,如果社区有人说要有重要的Bug需要合入,那么Release Manager需要评估并将重要的Patch合入到发布分支中。
+
+## 社区发布投票流程
+
+### 打 tag
+
+当上述分支已经比较稳定后,就可以在此分支上打 tag。
+记得在创建 tag 时,修改 `gensrc/script/gen_build_version.sh` 中的 `build_version` 变量。如 `build_version="0.10.0-release"`
+
+例如:
 
 ```
-gpg --armor --export [用户 ID] >> KEYS
+$ git checkout branch-0.9
+$ git tag -a 0.9.0-rc01 -m "0.9.0 release candidate 01"
+$ git push origin 0.9.0-rc01
+Counting objects: 1, done.
+Writing objects: 100% (1/1), 165 bytes | 0 bytes/s, done.
+Total 1 (delta 0), reused 0 (delta 0)
+To git@github.com:apache/incubator-doris.git
+ * [new tag]         0.9.0-rc01 -> 0.9.0-rc01
+
+$ git tag
 ```
 
-## 7. 打包签名
+### 打包、签名上传
 
 如下步骤,也需要通过 SecureCRT 等终端直接登录用户账户,不能通过 su - user 或者 ssh 转,否则密码输入 box 会显示不出来而报错。
 
@@ -280,9 +285,7 @@ $ sha512sum apache-doris-0.9.0-incubating-src.tar.gz > apache-doris-0.9.0-incuba
 $ sha512sum --check apache-doris-0.9.0-incubating-src.tar.gz.sha512
 ```
 
-## 8. 上传签名的软件包和 KEYS 文件到 DEV svn
-
-首先,下载 svn 库:
+然后将打包的内容上传到svn仓库中,首先下载 svn 库:
 
 ```
 svn co https://dist.apache.org/repos/dist/dev/incubator/doris/
@@ -292,22 +295,21 @@ svn co https://dist.apache.org/repos/dist/dev/incubator/doris/
 
 ```
 ./doris/
-├── 0.9
-│   └── 0.9.0-rc1
-│       ├── apache-doris-0.9.0-incubating-src.tar.gz
-│       ├── apache-doris-0.9.0-incubating-src.tar.gz.asc
-│       ├── apache-doris-0.9.0-incubating-src.tar.gz.sha512
-│       └── KEYS
+|-- 0.11.0-rc1
+|   |-- apache-doris-0.11.0-incubating-src.tar.gz
+|   |-- apache-doris-0.11.0-incubating-src.tar.gz.asc
+|   `-- apache-doris-0.11.0-incubating-src.tar.gz.sha512
+`-- KEYS
 ```
 
 上传这些文件
 
 ```
-svn add 0.9.0-rc1
-svn commit -m "Release Apache Doris (incubating) 0.9.0 rc1"
+svn add 0.11.0-rc1
+svn commit -m "Add 0.11.0-rc1"
 ```
 
-## 9. 发社区投票邮件
+### 发社区投票邮件
 
 [VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -320,12 +322,8 @@ The release candidate has been tagged in GitHub as 0.9.0-rc01, available
 here:
 https://github.com/apache/incubator-doris/releases/tag/0.9.0-rc01
 
-===== CHANGE LOG =====
-
-New Features:
-....
-
-======================
+Release Notes are here:
+https://github.com/apache/incubator-doris/issues/1891
 
 Thanks to everyone who has contributed to this release.
 
@@ -351,9 +349,19 @@ The vote will be open for at least 72 hours.
 
 Best Regards,
 xxx
+
+----
+DISCLAIMER: 
+Apache Doris(incubating) is an effort undergoing incubation at The Apache
+Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
 ```
 
-## 10. 投票通过后,发 Result 邮件
+### 投票通过后,发 Result 邮件
 
 [Result][VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -373,7 +381,7 @@ xxx
 
 ```
 
-## 11. 发邮件到 general@incubator.apache.org 进行投票
+### 发邮件到 general@incubator.apache.org 进行投票
 
 [VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -436,6 +444,16 @@ $ sh build.sh
 
 Best Regards,
 xxx
+
+----
+DISCLAIMER: 
+Apache Doris(incubating) is an effort undergoing incubation at The Apache
+Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
 ```
 
 邮件的 thread 连接可以在这里找到:
@@ -443,7 +461,7 @@ xxx
 `https://lists.apache.org/list.html?dev@doris.apache.org`
 
 
-## 12. 发 Result 邮件到 general@incubator.apache.org
+### 发 Result 邮件到 general@incubator.apache.org
 
 [RESULT][VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -468,7 +486,9 @@ Best Regards,
 xxx
 ```
 
-## 13. 上传 package 到 release
+## 完成发布流程
+
+### 上传 package 到 release
 
 当正式发布投票成功后,先发[Result]邮件,然后就准备 release package。
 将之前在dev下发布的对应rc文件夹下的源码包、签名文件和hash文件拷贝到另一个目录 0.9.0-incubating,注意文件名字中不要rcxx (可以rename,但不要重新计算签名,hash可以重新计算,结果不会变)
@@ -484,8 +504,7 @@ http://www.apache.org/dist/incubator/doris/0.9.0-incubating/
 
 ```
 
-
-## 14. 发 Announce 邮件到 general@incubator.apache.org
+### 发 Announce 邮件到 general@incubator.apache.org
 
 Title:
 
@@ -521,9 +540,9 @@ On behalf of the Doris team,
 xxx
 ```
 
-## 15. 在 Doris 官网和 github 发布链接
+### 在 Doris 官网和 github 发布链接
 
-### 15.1 创建下载链接
+#### 创建下载链接
 
 下载链接:
 http://www.apache.org/dyn/closer.cgi?filename=incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz&action=download
@@ -549,7 +568,7 @@ http://archive.apache.org/dist/incubator/doris/KEYS
 
 refer to: <http://www.apache.org/dev/release-download-pages#closer>
 
-### 15.2 准备 release note
+#### 准备 release note
 
 需要修改如下两个地方:
 
diff --git a/docs/documentation/en/community/release-process_EN.md b/docs/documentation/en/community/release-process_EN.md
index b61fea4..456db85 100644
--- a/docs/documentation/en/community/release-process_EN.md
+++ b/docs/documentation/en/community/release-process_EN.md
@@ -4,65 +4,45 @@ Apache publishing must be at least an IPMC member, a commiter with Apache mailbo
 
 The general process of publication is as follows:
 
-1. Launching DISCUSS in the community;
-2. Preparing branches and tagging;
-3. Packing tag for signature;
-4. Upload the signature package to the DEV directory of Apache SVN
-3. Send community voting email
-4. Result e-mail after the vote is passed
-5. Send an email to general@incubator.apache.org for a vote.
-6. Email Result to general@incubator.apache.org
-7. Upload the signature package to the release directory of Apache SVN and generate relevant links
-8. Prepare release note and send Announce mail to general@incubator.apache.org
-9. Publish download links on Doris website and GitHub
+1. Preparing your setup
+2. Preparing for release candidates
+	1. launching DISCUSS in the community
+	2. cutting a release branch
+	3. clean up issues
+	4. merging necessary patch to release branch
+3. Running the voting process for a release
+	1. singing a tag and upload it to [Apache dev svn repo](https://dist.apache.org/repos/dist/dev/incubator/doris)
+	2. calling votes from [Doris community](dev@doris.apache.org)
+	3. send result email to [Doris community](dev@doris.apache.org)
+	4. calling votes from [Incubator community](general@incubator.apache.org)
+	5. send result email to general@incubator.apache.org
+4. Finalizing and posting a release
+	1. Upload the signature package to [Apache release repo](https://dist.apache.org/repos/dist/release/incubator/doris) and generate relevant links
+	2. Prepare release note and send Announce mail to general@incubator.apache.org
+	3. Publish download links on Doris website and GitHub
 
-Release manager needs Mr. A to sign his own public key before publishing and upload it to the public key server. Then he can use this public key to sign the package ready for publication.
 
-## 1. Prepare for release
+## prepare setup
 
-### 1.1 Launching DISCUSS in the Community
+If you are a new Release Manager, you can read up on the process from the followings:
 
-If you think you've fixed a lot of bugs and developed more important features, any IPMC member can initiate DISCUSS discussions to release a new version.
-An e-mail entitled [DISCUSS] x.y.z release can be launched to discuss within the community what bugs have been fixed and what features have been developed.
-If DISCUSS mail is supported, we can proceed to the next step.
-
-### 1.2 Preparatory Branch
-
-Before publishing, we need to build a new branch, which needs to be fully tested to make functions available, bug convergence, and important bugs repaired.
+1. release signing https://www.apache.org/dev/release-signing.html
+2. gpg for signing https://www.apache.org/dev/openpgp.html
+3. svn https://www.apache.org/dev/version-control.html#https-svn
 
-For example:
-
-```
-$ git checkout -b branch-0.9
-
-```
-
-### 1.3 dozen Tags
-
-When the above branches are stable, tags can be made on them.
-Remember to modify the `build_version` variable in `gensrc/script/gen_build_version.sh` when creating tags. For example, `build_version='0.10.0-release'.`
-
-For example:
+### preparing gpg key
 
-```
-$ git checkout branch-0.9
-$ git tag -a 0.9.0-rc01 -m "0.9.0 release candidate 01"
-$ git push origin 0.9.0-rc01
-Counting objects: 1, done.
-Writing objects: 100% (1/1), 165 bytes | 0 bytes/s, done.
-Total 1 (delta 0), reused 0 (delta 0)
-To git@github.com:apache/incubator-doris.git
- * [new tag]         0.9.0-rc01 -> 0.9.0-rc01
+Release manager needs Mr. A to sign his own public key before publishing and upload it to the public key 
+server. Then he can use this public key to sign the package ready for publication.
+If your key already exists in [key] (https://dist.apache.org/repos/dist/dev/initiator/doris/keys), you can skip this step.
 
-$ git tag
-```
 
-## 2. Installation and configuration of signature software GnuPG
-###  2.1 GnuPG
+#### Installation and configuration of signature software GnuPG
+##### GnuPG
 
 In 1991, programmer Phil Zimmermann developed the encryption software PGP to avoid government surveillance. This software is very useful, spread quickly, has become a necessary tool for many programmers. However, it is commercial software and cannot be used freely. So the Free Software Foundation decided to develop a replacement for PGP, called GnuPG. This is the origin of GPG.
 
-### 2.2 Installation Configuration
+##### Installation Configuration
 
 CentOS installation command:
 
@@ -91,9 +71,9 @@ cert -digest -something SHA512
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
 ```
 
-## 3. Generating new signatures
+#### Generating new signatures
 
-### 3.1 Prepare to Sign
+##### Prepare to Sign
 
 Recommended settings for generating new signatures:
 
@@ -119,7 +99,7 @@ Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
 Compression: Uncompressed, ZIP, ZLIB, BZIP2
 ```
 
-### 3.2 Generating new signatures
+##### Generating new signatures
 
 ```
 $ gpg --gen-key
@@ -162,7 +142,7 @@ Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? o
 Real name needs to be consistent with the ID shown in ID. apache. org.
 Email address is apache's mailbox.
 
-### 3.3 View and Output
+##### View and Output
 
 The first line shows the name of the public key file (pubring. gpg), the second line shows the public key characteristics (4096 bits, Hash string and generation time), the third line shows the "user ID", and the fourth line shows the private key characteristics.
 
@@ -177,7 +157,9 @@ sub   4096R/0E8182E6 2018-12-06
 
 xxx-yy is the user ID.
 
+```
 gpg --armor --output public-key.txt --export [用户ID]
+```
 
 ```
 $ gpg --armor --output public-key.txt --export xxx-yyy
@@ -189,10 +171,13 @@ mQINBFwJEQ0BEACwqLluHfjBqD/RWZ4uoYxNYHlIzZvbvxAlwS2mn53BirLIU/G3
 9opMWNplvmK+3+gNlRlFpiZ7EvHsF/YJOAP59HmI2Z...
 ```
 
-## 4. Upload signature public key
+#### Upload signature public key
+
 Public key servers are servers that store users'public keys exclusively on the network. The send-keys parameter uploads the public key to the server.
 
+```
 gpg --send-keys xxxx
+```
 
 Where XXX is the last step -- the string after pub in the list-keys result, as shown above: 33DBF2E0
 
@@ -208,7 +193,9 @@ http://keys.gnupg.net
 
 Queries on the site are delayed and may take an hour.
 
-## 5. Generate fingerprint and upload it to Apache user information
+
+#### Generate fingerprint and upload it to Apache user information
+
 Because the public key server has no checking mechanism, anyone can upload the public key in your name, so there is no way to guarantee the reliability of the public key on the server. Usually, you can publish a public key fingerprint on the website and let others check whether the downloaded public key is true or not.
 
 Fingerprint parameter generates public key fingerprints:
@@ -230,39 +217,68 @@ Paste the fingerprint above (i.e. 07AA E690 B01D 1A4B 469B 0BEF 5E29 CE39 33DB F
 https://id.apache.org
 OpenPGP Public Key Primary Fingerprint:
 
-## 6. Generating keys
-
-Create a new file named KEYS and write it as follows (without any modification):
+#### Generating keys
 
 ```
-This file contains the PGP keys of various developers.
+svn co //dist.apache.org/repos/dist/dev/incubator/doris/
+# edit doris/KEY file
+gpg --list-sigs [用户 ID] >> doris/KEYS
+gpg --armor --export [用户 ID] >> doris/KEYS
+svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Update KEYS"
+```
 
-Users: pgp < KEYS
-or
-       gpg --import KEYS
+## Prepare for release
 
-Developers:
-    pgp -kxa <your name> and append it to this file.
-or
-    (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
-or
-    (gpg --list-sigs <your name>
-    && gpg --armor --export <your name>) >> this file.
-```
+### Launching DISCUSS in the Community
+
+If you think you've fixed a lot of bugs and developed more important features, any IPMC member can initiate DISCUSS discussions to release a new version.
+An e-mail entitled [DISCUSS] x.y.z release can be launched to discuss within the community what bugs have been fixed and what features have been developed.
+If DISCUSS mail is supported, we can proceed to the next step.
+
+### Preparatory Branch
 
-Then the generation adds the signature information to write:
+Before publishing, we need to build a new branch, For example:
 
 ```
-gpg --list-sigs [User ID] >> KEYS
+$ git checkout -b branch-0.9
+
 ```
 
-Finally, the public key addition is imported:
+This branch needs to be fully tested to make functions available, bug convergence, and important bugs fixed.
+
+This process needs to wait for the community to see if a necessary patch needs to be merged in this version, and if so, it needs to be cherry picked to the release branch.
+
+### clean up issue
+
+Go through all the issues belonging to this version, close those that have been completed, and if they cannot be completed, postpone them to a later version.
+
+### Merge necessary patches
+
+During the release waiting process, there may be more important patch merging. If someone in the community says that there is an important bug to merge, then release manager needs to evaluate and merge the important patches into the release branch.
+
+## Running the voting process for a release
+
+### dozen Tags
+
+When the above branches are stable, tags can be made on them.
+Remember to modify the `build_version` variable in `gensrc/script/gen_build_version.sh` when creating tags. For example, `build_version='0.10.0-release'.`
+
+For example:
 
 ```
-gpg --armor --export [User ID] >> KEYS
+$ git checkout branch-0.9
+$ git tag -a 0.9.0-rc01 -m "0.9.0 release candidate 01"
+$ git push origin 0.9.0-rc01
+Counting objects: 1, done.
+Writing objects: 100% (1/1), 165 bytes | 0 bytes/s, done.
+Total 1 (delta 0), reused 0 (delta 0)
+To git@github.com:apache/incubator-doris.git
+ * [new tag]         0.9.0-rc01 -> 0.9.0-rc01
+
+$ git tag
 ```
 
-## 7. Packing Signature
+### Packing Signature
 
 The following steps also need to log into user accounts directly through terminals such as SecureCRT, and can not be transferred through Su - user or ssh, otherwise the password input box will not show and error will be reported.
 
@@ -280,7 +296,7 @@ $ sha512sum apache-doris-0.9.0-incubating-src.tar.gz > apache-doris-0.9.0-incuba
 $ sha512sum --check apache-doris-0.9.0-incubating-src.tar.gz.sha512
 ```
 
-## 8. Upload signature packages and KEYS files to DEV SVN
+### Upload signature packages and KEYS files to DEV SVN
 
 First, download the SVN library:
 
@@ -292,12 +308,11 @@ Organize all previous files into the following SVN paths
 
 ```
 ./doris/
-├── 0.9
-│   └── 0.9.0-rc1
-│       ├── apache-doris-0.9.0-incubating-src.tar.gz
-│       ├── apache-doris-0.9.0-incubating-src.tar.gz.asc
-│       ├── apache-doris-0.9.0-incubating-src.tar.gz.sha512
-│       └── KEYS
+|-- 0.11.0-rc1
+|   |-- apache-doris-0.11.0-incubating-src.tar.gz
+|   |-- apache-doris-0.11.0-incubating-src.tar.gz.asc
+|   `-- apache-doris-0.11.0-incubating-src.tar.gz.sha512
+`-- KEYS
 ```
 
 Upload these files
@@ -307,7 +322,7 @@ svn add 0.9.0-rc1
 svn commit -m "Release Apache Doris (incubating) 0.9.0 rc1"
 ```
 
-## 9. Send community voting emails
+### Send community voting emails
 
 [VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -354,7 +369,7 @@ Best Regards,
 xxx
 ```
 
-## 10. Email Result after the vote is passed
+### Email Result after the vote is passed
 
 [Result][VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -374,7 +389,7 @@ xxx
 
 ```
 
-## 11. Send an e-mail to general@incubator.apache.org for a vote.
+### Send an e-mail to general@incubator.apache.org for a vote.
 
 [VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -444,7 +459,7 @@ The threaded connection for mail can be found here:
 `https://lists.apache.org/list.html?dev@doris.apache.org`
 
 
-## 12. Email Result to general@incubator.apache.org
+### Email Result to general@incubator.apache.org
 
 [RESULT][VOTE] Release Apache Doris 0.9.0-incubating-rc01
 
@@ -468,7 +483,9 @@ Best Regards,
 xxx
 ```
 
-## 13. Upload package to release
+## Finalizing release
+
+### Upload package to release
 
 When the formal voting is successful, email [Result] first, and then prepare the release package.
 Copy the source package, signature file and hash file from the corresponding RC folder published under dev to another directory 0.9.0-incubating. Note that the file name does not need rcxx (rename, but do not recalculate signatures, hash can recalculate, the results will not change)
@@ -485,7 +502,7 @@ http://www.apache.org/dist/incubator/doris/0.9.0-incubating/
 ```
 
 
-## 14. Send Announce e-mail to general@incubator.apache.org
+### Send Announce e-mail to general@incubator.apache.org
 
 Title:
 
@@ -521,9 +538,9 @@ On behalf of the Doris team,
 xxx
 ```
 
-## 15. Publish links on Doris website and GitHub
+### Publish links on Doris website and GitHub
 
-### 15.1 Create Download Links
+#### Create Download Links
 
 Download link:
 http://www.apache.org/dyn/closer.cgi?filename=incubator/doris/0.9.0-incubating/apache-doris-0.9.0-incubating-src.tar.gz&action=download
@@ -549,7 +566,7 @@ http://archive.apache.org /dist /incubator /doris /KEYS
 
 refer to: <http://www.apache.org/dev/release-download-pages#closer>
 
-### 15.2 Prepare release note
+#### Prepare release note
 
 The following two areas need to be modified:
 
diff --git a/docs/website/source/_templates/footer.html b/docs/website/source/_templates/footer.html
index 6c30f0e..ab9402b 100644
--- a/docs/website/source/_templates/footer.html
+++ b/docs/website/source/_templates/footer.html
@@ -4,7 +4,7 @@
     <p></p>
     <p>
 
-        Apache Doris is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the name of Apache TLP sponsor. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate  [...]
+        Apache Doris(incubating) is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicat [...]
 
     </p>
 </div>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org