Fix typos and delete error info (#876)

FISCO-BCOS · Jun 28, 2020 · fcd7249 · fcd7249
1 parent ee98de4
commit fcd7249
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 8 deletions.
diff --git a/docs/design/storage/mpt.md b/docs/design/storage/mpt.md
@@ -1,6 +1,6 @@
 # MPT State
 
-MPT State是以太坊上级经典的数据存储方式。通过MPT树的方式，将所有合约的数据组织起来，实现了对数据的查找和追溯。
+MPT State是以太坊上经典的数据存储方式。通过MPT树的方式，将所有合约的数据组织起来，实现了对数据的查找和追溯。
 
 ```eval_rst
 .. important::

diff --git a/docs/design/storage/storage.md b/docs/design/storage/storage.md
@@ -24,7 +24,7 @@ Entries中存放主Key相同的Entry，数组。AMDB的主Key与Mysql中的主ke
 
 Table中的删改查接口支持传入条件，这三种接口会返回根据条件筛选后的结果。如果条件为空，则不做任何筛选。
 
-数据更新或者插入过程中，需要根据主Key获取数据并将对数据更新或者append操作，然后再写回存储系统。因此，在一个主Key对应的的Entries中Entry个数很多的时候，执行效率会受到影响；同时，会加大内存的使用。所以，实际生产过程中主Key对应的的Entries中Entry个数不宜过多。
+数据更新或者插入过程中，需要根据主Key获取数据并将对数据更新或者append操作，然后再写回存储系统。因此，在一个主Key对应的Entries中Entry个数很多的时候，执行效率会受到影响；同时，会加大内存的使用。所以，实际生产过程中主Key对应的Entries中Entry个数不宜过多。
 
 ### 举例
 

diff --git a/docs/enterprise_tools/index.md b/docs/enterprise_tools/index.md
@@ -29,7 +29,7 @@
 
 在上述模式中，总有一个机构会优先加入到联盟链之中；并且在这种模式中，总有一个机构会获得所有节点的私钥。
 
-如何保证企业间如何对等、安全、隐私地新建群组。新建群组之后如何保证节点可靠，有效的运行；群组账本的隐私性和安全性，以及企业建立群组、使用群组操作的隐私性都需要一个有效的方式来保证。
+如何保证企业间对等、安全、隐私地新建群组。新建群组之后如何保证节点可靠，有效的运行；群组账本的隐私性和安全性，以及企业建立群组、使用群组操作的隐私性都需要一个有效的方式来保证。
 
 **设计思路**
 

diff --git a/docs/manual/build_chain.md b/docs/manual/build_chain.md
@@ -81,7 +81,7 @@ bash build_chain.sh -f ipconf -T
 用于指定`fisco-bcos`二进制所在的**完整路径**，脚本会将`fisco-bcos`拷贝以IP为名的目录下。不指定时，默认从GitHub下载`master`分支最新的二进制程序。
 
 ```bash
-# 从GitHub下载下载最新release二进制，生成本机4节点
+# 从GitHub下载最新release二进制，生成本机4节点
 $ bash build_chain.sh -l "127.0.0.1:4"
 # 使用 bin/fisco-bcos 二进制，生成本机4节点
 $ bash build_chain.sh -l "127.0.0.1:4" -e bin/fisco-bcos

diff --git a/docs/manual/console.md b/docs/manual/console.md
@@ -960,7 +960,7 @@ contract address:0xd653139b9abffc3fe07573e7bacdfd35210b5576
 ```
 **注：**
 - 部署用户编写的合约，只需要将solidity合约文件放到控制台根目录的`contracts/solidity/`目录下，然后进行部署即可。按tab键可以搜索`contracts/solidity/`目录下的合约名称。
-- 若需要部署的合约引用了其他其他合约或library库，引用格式为`import "./XXX.sol";`。其相关引入的合约和library库均放在`contracts/solidity/`目录。
+- 若需要部署的合约引用了其他合约或library库，引用格式为`import "./XXX.sol";`。其相关引入的合约和library库均放在`contracts/solidity/`目录。
 - 如果合约引用了library库，library库文件的名称必须以`Lib`字符串开始，以便于区分是普通合约与library库文件。library库文件不能单独部署和调用。
 - **由于FISCO BCOS已去除以太币的转账支付逻辑，因此solidity合约的方法不支持使用`payable`关键字，该关键字会导致solidity合约转换成的java合约文件在编译时失败。**
 
@@ -1044,7 +1044,7 @@ contract address:0x0b33d383e8e93c7c8083963a4ac4a58b214684a8
 ```
 **注：**
 - 部署用户编写的合约，只需要将solidity合约文件放到控制台根目录的`contracts/solidity/`目录下，然后进行部署即可。按tab键可以搜索`contracts/solidity/`目录下的合约名称。
-- 若需要部署的合约引用了其他其他合约或library库，引用格式为`import "./XXX.sol";`。其相关引入的合约和library库均放在`contracts/solidity/`目录。
+- 若需要部署的合约引用了其他合约或library库，引用格式为`import "./XXX.sol";`。其相关引入的合约和library库均放在`contracts/solidity/`目录。
 - 如果合约引用了library库，library库文件的名称必须以`Lib`字符串开始，以便于区分是普通合约与library库文件。library库文件不能单独部署和调用。
 - **由于FISCO BCOS已去除以太币的转账支付逻辑，因此solidity合约的方法不支持使用`payable`关键字，该关键字会导致solidity合约转换成的java合约文件在编译时失败。**
 

diff --git a/docs/manual/get_executable.md b/docs/manual/get_executable.md
@@ -87,7 +87,6 @@ $ make
 
 ### 编译选项介绍
 
-- BUILD_GM，默认off，国密编译开关。通过`cmake -DBUILD_GM=on ..`打开国密开关。
 - TESTS，默认off，单元测试编译开关。通过`cmake -DTESTS=on ..`打开单元测试开关。
 - DEMO，默认off，测试程序编译开关。通过`cmake -DDEMO=on ..`打开单元测试开关。
 - TOOL，默认off，工具程序编译开关。通过`cmake -DTOOL=on ..`打开工具开关，提供FISCO节点的rocksdb读取工具。

diff --git a/en/docs/design/storage/mpt.md b/en/docs/design/storage/mpt.md
@@ -38,3 +38,4 @@ State root is a field of block. Each block has different state. Operation of tra
 MPT State is imported to retrieve data, The historical information of account can be retrieved according to the state root of block. However, it also brings out massive hash computings and breaks the consecutiveness of bottom data storage. MPT state is born with disadvantages in performance. We can say that MPT State has extremely good traceability at the cost of performance.
 
 In transactional cases of FISCO BCOS, performance matters more than traceability. Therefore, FISCO BCOS has re-designed the bottom storage and implemented [Storage State](storage.md). Storage State has better performance regardless of losing part of traceability.
+
diff --git a/en/docs/design/storage/storage.md b/en/docs/design/storage/storage.md
@@ -92,3 +92,4 @@ StorageState is a method to store account status by AMDB. It has following diffe
 |historical status|not support/maintain historical status|support|
 
 Every account in MPTState uses MPT tree to store data. As historical data increases, it will lead to low performance due to storage method and disk IO. Every account in StorageState is related to one table and stores its data, including `nonce`, `code`, `balance` of the account. AMDB can improve performance by supporting different databases through their storage drives. We have found in RocksDB test that StorageState is twice as much as MPTState in performance.
+
diff --git a/en/docs/enterprise_tools/index.md b/en/docs/enterprise_tools/index.md
@@ -77,3 +77,4 @@ Users agree to generate the Genesis Block and node configuration file folder and
    config.md
    operation.md
 ```
+
diff --git a/en/docs/manual/build_chain.md b/en/docs/manual/build_chain.md
@@ -342,3 +342,4 @@ bash gen_agency_cert.sh -c nodes/cert/ -a newAgencyName -g nodes/gmcert/
 Using the build_chain script to build a multi-server and multi-group FISCO BCOS alliance chain requires the script configuration file. For details, please refer to [here](../manual/group_use_cases.md).
 
 [build_chain]:https://github.com/FISCO-BCOS/FISCO-BCOS/blob/master/tools/build_chain.sh
+
diff --git a/en/docs/manual/console.md b/en/docs/manual/console.md
@@ -1813,3 +1813,4 @@ $ source /etc/profile
 # To inquire the Java version. If the result shows the version you just downloaded, the installation is successful.
 java -version
 ```
+
diff --git a/en/docs/manual/get_executable.md b/en/docs/manual/get_executable.md
@@ -89,7 +89,6 @@ $ make
 
 ### Compile options
 
-- BUILD_GM，off by default, national cryptography compilation flag. To enable it, use `cmake -DBUILD_GM=on ..`
 - TESTS, off by default, unit test compilation flag. To enable it, use `cmake -DTESTS=on ..`
 - DEMO, off by default, test program compilation switch. To open it through `cmake -DDEMO=on ..`.
 - TOOL, off by default, tools program compilation switch. To open it through`cmake -DTOOL=on ..`.