Skip to content

Commit

Permalink
modify the sequence of descriptions of changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
@cyjseagull
cyjseagull committed May 9, 2019
1 parent 3db5b1d commit f988fe4
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 26 deletions.
10 changes: 5 additions & 5 deletions docs/changelog/2.0-rc1.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [FISCO BCOS 2.0.0-rc1](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.0.0-rc1)
# [FISCO BCOS v2.0.0-rc1](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.0.0-rc1)

```eval_rst
.. admonition:: v1.0升级到v2.0.0-rc1
Expand Down Expand Up @@ -41,8 +41,8 @@
| | 兼容版本 | 说明 |
| --------- | --------------------------------------------------- | ------------------------------------------------------------ |
| 节点 | 不兼容FISCO BCOS 1.x | 2.0版本与1.x版本完全不兼容 <br> 2.0版本不能直接跑在1.0的数据上，也不能和1.0的节点相互通信。 |
| 控制台 | 1.0.0+ | |
| Web3SDK | 2.0.0-rc1+ | |
| generator | 1.0.0-rc1 | |
| 浏览器 | 2.0.0-rc1+ | |
| 控制台 | v1.0.0+ | |
| Web3SDK | v2.0.0-rc1+ | |
| generator | v1.0.0-rc1 | |
| 浏览器 | v2.0.0-rc1+ | |
| Solidity | 最高支持 solidity 0.5.2 | |
12 changes: 6 additions & 6 deletions docs/changelog/2.0-rc2.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [FISCO BCOS 2.0.0-rc2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.0.0-rc2)
# [FISCO BCOS v2.0.0-rc2](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.0.0-rc2)

```eval_rst
.. admonition:: v2.0.0-rc1升级到v2.0.0-rc2
Expand Down Expand Up @@ -52,9 +52,9 @@ https://security.webank.com/report/freelink/932/6673f4de1e4c4acaf69a0ebb474545a0
| | 兼容版本 | 说明 |
| --------- | --------------------------------------------------- | ------------------------------------------------------------ |
| 节点 | 向下兼容 FISCO BCOS v2.0.0-rc1<br>不兼容FISCO BCOS 1.x | 可运行于v2.0.0-rc1节点<br>v2.0.0-rc1节点无法使用v2.0.0-rc2新特性，但可提升稳定性 <br> 若需要用此版本的新特性，需重新搭链。 |
| 控制台 | 1.0.2+ | |
| Web3SDK | 2.0.0-rc2+ | |
| generator | 1.0.0-rc2 | |
| 浏览器 | 2.0.0-rc2+ | |
| 控制台 | v1.0.2+ | |
| Web3SDK | v2.0.0-rc2+ | |
| generator | v1.0.0-rc2 | |
| 浏览器 | v2.0.0-rc2+ | |
| Solidity | 最高支持 solidity 0.5.2 | |
| AMDB | 2.0.0+ | |
| AMDB | v2.0.0+ | |
28 changes: 13 additions & 15 deletions docs/changelog/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
版本及兼容
##############################################################

.. admonition:: `FISCO BCOS 1.0 Releases <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v1.0.0>`_

**FISCO BCOS 1.0 Releases:** https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v1.0.0
.. admonition:: `FISCO BCOS 2.0.0-rc2 <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.0.0-rc2>`_

**新增特性**
- `并行计算模型 <../what_is_new.html#id4>`_ (`操作手册 <../manual/transaction_parallel.html>`_ ) (`设计文档 <../tutorial/group_use_cases.html>`_ )
- `分布式存储 <../what_is_new.html#id3>`_ (`操作手册 <../manual/amdbconfig.html>`_ )

**变更描述、兼容及升级说明**
- `FISCO BCOS 2.0 rc2 <./2.0-rc2.html>`_

.. admonition:: `FISCO BCOS 2.0.0-rc1 <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.0.0-rc1>`_

Expand All @@ -20,15 +25,11 @@
**变更描述、兼容及升级说明**
- `FISCO BCOS 2.0 rc1 <./2.0-rc1.html>`_


.. admonition:: `FISCO BCOS 1.0 Releases <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v1.0.0>`_

**FISCO BCOS 1.0 Releases:** https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v1.0.0

.. admonition:: `FISCO BCOS 2.0.0-rc2 <https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v2.0.0-rc2>`_

**新增特性**
- `并行计算模型 <../what_is_new.html#id4>`_ (`操作手册 <../manual/transaction_parallel.html>`_ ) (`设计文档 <../tutorial/group_use_cases.html>`_ )
- `分布式存储 <../what_is_new.html#id3>`_ (`操作手册 <../manual/amdbconfig.html>`_ )

**变更描述、兼容及升级说明**
- `FISCO BCOS 2.0 rc2 <./2.0-rc2.html>`_

.. admonition:: 查看节点和数据版本

Expand All @@ -39,8 +40,5 @@
.. toctree::
:maxdepth: 1

2.0-rc1.md
2.0-rc2.md



2.0-rc1.md

0 comments on commit f988fe4

Please sign in to comment.