Merge branch 'release-2.0' into release-2.0

faquanzhou · Jul 9, 2019 · b6db231 · b6db231
2 parents d974684 + f0eae5e
commit b6db231
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/change_log/2_0_0.md b/docs/change_log/2_0_0.md
@@ -3,7 +3,7 @@
 ```eval_rst
 .. admonition:: v2.0.0-rc3升级到v2.0.0
 
-    - **兼容升级** ：直接替换v2.0.0-rc3节点的二进制为 `rc3二进制 <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.0.0/fisco-bcos.tar.gz>`_ ，升级后的版本修复v2.0.0-rc3中的bug，但不会启用v2.0.0新特性， **升级到v2.0.0后，无法回滚到v2.0.0-rc3**
+    - **兼容升级** ：直接替换v2.0.0-rc3节点的二进制为 `v2.0.0二进制 <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.0.0/fisco-bcos.tar.gz>`_ ，升级后的版本修复v2.0.0-rc3中的bug，但不会启用v2.0.0新特性， **升级到v2.0.0后，无法回滚到v2.0.0-rc3**
 
     - **全面升级** ：参考 `安装 <../installation.html>`_ 搭建新链，重新向新节点提交所有历史交易，升级后节点包含v2.0.0新特性
 

diff --git a/en/docs/change_log/2_0_0.md b/en/docs/change_log/2_0_0.md
@@ -3,7 +3,7 @@
 ```eval_rst
 .. admonition:: v2.0.0 upgrades to v2.0.0
 
-    - **Compatible upgrade** : Directly replace the binary of the v2.0.0-rc3 node with `rc3 binary <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.0.0/fisco-bcos.tar.gz>`_. The upgraded version fixes bugs in v2.0.0-rc3 but does not enable the new features in v2.0.0.  **after upgrading to v2.0.0, cannot roll back to v2.0.0-rc3**
+    - **Compatible upgrade** : Directly replace the binary of the v2.0.0-rc3 node with `v2.0.0 binary <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/download/v2.0.0/fisco-bcos.tar.gz>`_. The upgraded version fixes bugs in v2.0.0-rc3 but does not enable the new features in v2.0.0.  **after upgrading to v2.0.0, cannot roll back to v2.0.0-rc3**
 
     - **Full upgrade** : Refer to `Install <../installation.html>`_ to build new chain and resubmit all historical transactions to the new node. The upgraded node contains the new features in v2.0.0.