rocketmq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vongosl...@apache.org
Subject [rocketmq] branch develop updated: fixed the text description in chinese doc (#1339)
Date Tue, 30 Jul 2019 02:08:48 GMT
This is an automated email from the ASF dual-hosted git repository.

vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 57e2959  fixed the text description in chinese doc (#1339)
57e2959 is described below

commit 57e2959bbe5358bba0619c6d0d7b6fda0b501c1a
Author: skyline1688 <42176423+skyline1688@users.noreply.github.com>
AuthorDate: Tue Jul 30 10:08:43 2019 +0800

    fixed the text description in chinese doc (#1339)
---
 CONTRIBUTING.md     |  5 ++---
 README.md           | 20 ++++++++++++++++++++
 docs/cn/README.md   |  4 ++--
 docs/cn/features.md |  2 +-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b7b1334..952ad73 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ Nor is code the only way to contribute to the project. We strongly value
documen
 To submit a change for inclusion, please do the following:
 
 #### If the change is non-trivial please include some unit tests that cover the new functionality.
-#### If you are introducing a completely new feature or API it is a good idea to start a
wiki and get consensus on the basic design first.
+#### If you are introducing a completely new feature or API it is a good idea to start a
[RIP](https://github.com/apache/rocketmq/wiki/RocketMQ-Improvement-Proposal) and get consensus
on the basic design first.
 #### It is our job to follow up on patches in a timely fashion. Nag us if we aren't doing
our job (sometimes we drop things).
 
 ## Becoming a Committer
@@ -19,9 +19,8 @@ We are always interested in adding new contributors. What we look for are
series
 
 Nowadays,we have several important contribution points:
 #### Wiki & JavaDoc
-#### RocketMQ Console
 #### RocketMQ SDK(C++\.Net\Php\Python\Go\Node.js)
-#### RocketMQ MySQL(Oracle\PostgreSQL\Redis\MongoDB\HBase\MSSQL) Replicator
+#### RocketMQ Connectors
 
 ##### Prerequisite
 If you want to contribute the above listing points, you must abide our some prerequisites:
diff --git a/README.md b/README.md
index 98d97a0..1c17c7e 100644
--- a/README.md
+++ b/README.md
@@ -51,3 +51,23 @@ We always welcome new contributions, whether for trivial cleanups, [big
new feat
 [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html) Copyright
(C) Apache Software Foundation
 
 
+----------
+## Export Control Notice
+This distribution includes cryptographic software. The country in which you currently reside
may have
+restrictions on the import, possession, use, and/or re-export to another country, of encryption
software.
+BEFORE using any encryption software, please check your country's laws, regulations and policies
concerning
+the import, possession, or use, and re-export of encryption software, to see if this is permitted.
See
+<http://www.wassenaar.org/> for more information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has classified
this
+software as Export Commodity Control Number (ECCN) 5D002.C.1, which includes information
security software
+using or performing cryptographic functions with asymmetric algorithms. The form and manner
of this Apache
+Software Foundation distribution makes it eligible for export under the License Exception
ENC Technology
+Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section
740.13) for
+both object code and source code.
+
+The following provides more details on the included cryptographic software:
+
+This software uses Apache Commons Crypto (https://commons.apache.org/proper/commons-crypto/)
to
+support authentication, and encryption and decryption of data sent across the network between
+services.
diff --git a/docs/cn/README.md b/docs/cn/README.md
index a47ec64..c8bdc8d 100644
--- a/docs/cn/README.md
+++ b/docs/cn/README.md
@@ -1,4 +1,4 @@
-Apache RocketMQ开发者指南
+Apache RocketMQ开发者指南
 --------
 
 ##### 这个开发者指南是帮忙您快速了解,并使用 Apache RocketMQ
@@ -14,7 +14,7 @@ Apache RocketMQ开发者指南
 
 - [架构(Architecture)](architecture.md):介绍RocketMQ部署架构和技术架构。
 
-- [设计(Design)](design.md):介绍RocketMQ关键机制的设计原理,主要包括消息存储、通信机制、消息过滤、负载均衡、事物消息等。
+- [设计(Design)](design.md):介绍RocketMQ关键机制的设计原理,主要包括消息存储、通信机制、消息过滤、负载均衡、事务消息等。
 
 
 ### 3. 样例
diff --git a/docs/cn/features.md b/docs/cn/features.md
index 1c0456b..859e0f8 100644
--- a/docs/cn/features.md
+++ b/docs/cn/features.md
@@ -12,7 +12,7 @@
 - 分区顺序
 对于指定的一个 Topic,所有消息根据 sharding key 进行区块分区。 同一个分区内的消息按照严格的
FIFO 顺序进行发布和消费。 Sharding key 是顺序消息中用来区分不同分区的关键字段,和普通消息的
Key 是完全不同的概念。
 适用场景:性能要求高,以 sharding key 作为分区字段,在同一个区块中严格的按照
FIFO 原则进行消息发布和消费的场景。
-##3 消息过滤
+## 3 消息过滤
 RocketMQ的消费者可以根据Tag进行消息过滤,也支持自定义属性过滤。消息过滤目前是在Broker端实现的,优点是减少了对于Consumer无用消息的网络传输,缺点是增加了Broker的负担、而且实现相对复杂。
 ## 4 消息可靠性
 RocketMQ支持消息的高可靠,影响消息可靠性的几种情况:


Mime
View raw message