Skip to content

Commit 4b5f866

Browse files
authored
Fix typos and linguistic errors in documentation (#9748)
Signed-off-by: Sebastien Dionne <survivant00@gmail.com>
1 parent 060e4dc commit 4b5f866

13 files changed

Lines changed: 43 additions & 44 deletions

CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
We are always very happy to have contributions, whether for trivial cleanups or big new features.
44
We want to have high quality, well documented codes for each programming language, as well as the surrounding [ecosystem](https://github.com/apache/rocketmq-externals) of integration tools that people use with RocketMQ.
55

6-
Nor is code the only way to contribute to the project. We strongly value documentation, integration with other project, and gladly accept improvements for these aspects.
6+
Nor is code the only way to contribute to the project. We strongly value documentation, integration with other projects, and gladly accept improvements for these aspects.
77

88
Recommend reading:
99
* [Contributors Tech Guide](http://www.apache.org/dev/contributors)
@@ -34,15 +34,15 @@ More details of squash can be found at [stackoverflow](https://stackoverflow.com
3434

3535
We are always interested in adding new contributors. What we look for are series of contributions, good taste and ongoing interest in the project. If you are interested in becoming a committer, please let one of the existing committers know and they can help you walk through the process.
3636

37-
Nowadays,we have several important contribution points:
37+
Nowadays, we have several important contribution points:
3838
#### Wiki & JavaDoc
3939
#### RocketMQ SDK(C++\.Net\Php\Python\Go\Node.js)
4040
#### RocketMQ Connectors
4141

42-
##### Prerequisite
43-
If you want to contribute the above listing points, you must abide our some prerequisites:
42+
##### Prerequisites
43+
If you want to contribute to the above listed points, you must abide by the following prerequisites:
4444

45-
###### Readability - API must have Javadoc, some very important methods also must have javadoc
46-
###### Testability - 80% above unit test coverage about main process
47-
###### Maintainability - Comply with our [checkstyle spec](style/rmq_checkstyle.xml), and at least 3 month update frequency
45+
###### Readability - API must have Javadoc, and some very important methods must also have Javadoc
46+
###### Testability - Above 80% unit test coverage for the main process
47+
###### Maintainability - Comply with our [checkstyle spec](style/rmq_checkstyle.xml), and at least a 3-month update frequency
4848
###### Deployability - We encourage you to deploy into [maven repository](http://search.maven.org/)

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ It offers a variety of features:
1616

1717
* Messaging patterns including publish/subscribe, request/reply and streaming
1818
* Financial grade transactional message
19-
* Built-in fault tolerance and high availability configuration options base on [DLedger Controller](docs/en/controller/quick_start.md)
20-
* Built-in message tracing capability, also support opentracing
19+
* Built-in fault tolerance and high availability configuration options based on [DLedger Controller](docs/en/controller/quick_start.md)
20+
* Built-in message tracing capability, also supports opentracing
2121
* Versatile big-data and streaming ecosystem integration
2222
* Message retroactivity by time or offset
2323
* Reliable FIFO and strict ordered messaging in the same queue
@@ -80,7 +80,7 @@ $ tail -f ~/logs/rocketmqlogs/namesrv.log
8080
The Name Server boot success...
8181
```
8282

83-
For Windows users, you need set environment variables first:
83+
For Windows users, you need to set environment variables first:
8484
- From the desktop, right click the Computer icon.
8585
- Choose Properties from the context menu.
8686
- Click the Advanced system settings link.
@@ -139,7 +139,7 @@ Before your operations, make sure that `kubectl` and related kubeconfig file ins
139139
$ git clone https://github.com/apache/rocketmq-operator
140140
$ cd rocketmq-operator && make deploy
141141

142-
### check whether CRDs is successfully installed
142+
### check whether CRDs are successfully installed
143143
$ kubectl get crd | grep rocketmq.apache.org
144144
brokers.rocketmq.apache.org 2022-05-12T09:23:18Z
145145
consoles.rocketmq.apache.org 2022-05-12T09:23:19Z
@@ -156,7 +156,7 @@ rocketmq-operator-6f65c77c49-8hwmj 1/1 Running 0 93s
156156
### create RocketMQ cluster resource
157157
$ cd example && kubectl create -f rocketmq_v1alpha1_rocketmq_cluster.yaml
158158

159-
### check whether cluster resources is running
159+
### check whether cluster resources are running
160160
$ kubectl get sts
161161
NAME READY AGE
162162
broker-0-master 1/1 107m
@@ -182,7 +182,7 @@ name-service 1/1 107m
182182
* [RocketMQ Dashboard](https://github.com/apache/rocketmq-dashboard): Operation and maintenance console of Apache RocketMQ.
183183
* [RocketMQ Connect](https://github.com/apache/rocketmq-connect): A tool for scalably and reliably streaming data between Apache RocketMQ and other systems.
184184
* [RocketMQ MQTT](https://github.com/apache/rocketmq-mqtt): A new MQTT protocol architecture model, based on which Apache RocketMQ can better support messages from terminals such as IoT devices and Mobile APP.
185-
* [RocketMQ EventBridge](https://github.com/apache/rocketmq-eventbridge): EventBridge make it easier to build a event-driven application.
185+
* [RocketMQ EventBridge](https://github.com/apache/rocketmq-eventbridge): EventBridge makes it easier to build an event-driven application.
186186
* [RocketMQ Incubating Community Projects](https://github.com/apache/rocketmq-externals): Incubator community projects of Apache RocketMQ, including [logappender](https://github.com/apache/rocketmq-externals/tree/master/logappender), [rocketmq-ansible](https://github.com/apache/rocketmq-externals/tree/master/rocketmq-ansible), [rocketmq-beats-integration](https://github.com/apache/rocketmq-externals/tree/master/rocketmq-beats-integration), [rocketmq-cloudevents-binding](https://github.com/apache/rocketmq-externals/tree/master/rocketmq-cloudevents-binding), etc.
187187
* [RocketMQ Site](https://github.com/apache/rocketmq-site): The repository for Apache RocketMQ website.
188188
* [RocketMQ E2E](https://github.com/apache/rocketmq-e2e): A project for testing Apache RocketMQ, including end-to-end, performance, compatibility tests.

distribution/bin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
### Operating system tuning
2-
Before deploying broker servers, it's highly recommended to run **os.sh**, which is to optimize your operating system for better performance.
2+
Before deploying broker servers, it is highly recommended to run **os.sh**, which optimizes your operating system for better performance.
33

44
## Notice
55
### os.sh should be executed only once with root permission.
6-
### os.sh parameter settings are for reference purpose only. You can tune them according to your target host configurations.
6+
### os.sh parameter settings are for reference purposes only. You can tune them according to your target host configurations.
77

88

99
### Start broker

docs/en/Concept.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@ The Name Server serves as the provider of routing service. The producer or the c
1818
## 7 Pull Consumer
1919
A type of Consumer, the application pulls messages from brokers by actively invoking the consumer pull message method, and the application has the advantages of controlling the timing and frequency of pulling messages. Once the batch of messages is pulled, user application will initiate consuming process.
2020
## 8 Push Consumer
21-
A type of Consumer, the application do not invoke the consumer pull message method to pull messages, instead the client invoke pull message method itself. At the user level it seems like brokers
22-
push to consumer when new messages arrived.
21+
A type of Consumer, the application does not invoke the consumer pull message method to pull messages, instead the client invokes the pull message method itself. At the user level it seems like brokers push to the consumer when new messages arrive.
2322
## 9 Producer Group
2423
A collection of the same type of Producer, which sends the same type of messages with consistent logic. If a transaction message is sent and the original producer crashes after sending, the broker server will contact other producers in the same producer group to commit or rollback the transactional message.
2524
## 10 Consumer Group
2625
A collection of the same type of Consumer, which consume the same type of messages with consistent logic. The consumer group makes load-balance and fault-tolerance super easy in terms of message consuming.
2726
Warning: consumer instances of one consumer group must have exactly the same topic subscription(s).
2827

29-
RocketMQ supports two types of consumption mode:Clustering and Broadcasting.
28+
RocketMQ supports two types of consumption mode: Clustering and Broadcasting.
3029
## 11 Consumption Mode - Clustering
31-
Under the Clustering mode, all the messages from one topic will be delivered to all the consumers instances averagely as much as possible. That is, one message can be consumed by only one consumer instance.
30+
Under the Clustering mode, all the messages from one topic will be delivered to all the consumer instances as evenly as possible. That is, one message can be consumed by only one consumer instance.
3231
## 12 Consumption Mode - Broadcasting
3332
Under the Broadcasting mode, each consumer instance of the same consumer group receives every message published to the corresponding topic.
3433
## 13 Normal Ordered Message
@@ -39,4 +38,4 @@ Under the Strictly Ordered Message mode, all messages received by the consumers
3938
The physical carrier of information transmitted by a messaging system, the smallest unit of production and consumption data, each message must belong to one topic.
4039
Each Message in RocketMQ has a unique message id and can carry a key used to store business-related value. The system has the function to query messages by its id or key.
4140
## 16 Tag
42-
Flags set for messages to distinguish different types of messages under the same topic, functioning as a "sub-topic". Messages from the same business unit can set different tags under the same topic in terms of different business purposes. The tag can effectively maintain the clarity and consistency of the code and optimize the query system provided by RocketMQ. The consumer can realize different "sub-topic" by using tag in order to achieve better expandability.
41+
Flags set for messages to distinguish different types of messages under the same topic, functioning as a "sub-topic". Messages from the same business unit can set different tags under the same topic for different business purposes. The tag can effectively maintain the clarity and consistency of the code and optimize the query system provided by RocketMQ. The consumer can realize different "sub-topics" by using tags in order to achieve better extensibility.

docs/en/Configuration_TLS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# TLS Configuration
2-
This section introduce TLS configuration in RocketMQ.
2+
This section introduces TLS configuration in RocketMQ.
33

4-
## 1 Generate Certification Files
5-
User can generate certification files using OpenSSL. Suggested to generate files in Linux.
4+
## 1 Generate Certificate Files
5+
Users can generate certificate files using OpenSSL. It is suggested to generate files in Linux.
66

77
### 1.1 Generate ca.pem
88
```shell
@@ -107,7 +107,7 @@ Add following parameters in JVM. The value of "tls.config.file" needs to be repl
107107
-Dtls.client.authServer=true -Dtls.enable=true -Dtls.test.mode.enable=false -Dtls.config.file=/opt/certs/tlsclient.properties
108108
```
109109

110-
Enable TLS for client linke following:
110+
Enable TLS for client like the following:
111111
```Java
112112
public class ExampleProducer {
113113
public static void main(String[] args) throws Exception {

docs/en/Deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### 1 Single Master mode
66

7-
This is the simplest, but also the riskiest mode, that makes the entire service unavailable once the broker restarts or goes down. Production environments are not recommended, but can be used for local testing and development. Here are the steps to build.
7+
This is the simplest, but also the riskiest mode, that makes the entire service unavailable once the broker restarts or goes down. Production environments are not recommended, but it can be used for local testing and development. Here are the steps to build.
88

99
**1)Start NameServer**
1010

docs/en/Design_LoadBlancing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Load balancing in RocketMQ is accomplished on Client side. Specifically, it can
33

44
### Producer Load Balancing
55
When the Producer sends a message, it will first find the specified TopicPublishInfo according to Topic. After getting the routing information of TopicPublishInfo, the RocketMQ client will select a queue (MessageQueue) from the messageQueue List in TopicPublishInfo to send the message by default.Specific fault-tolerant strategies are defined in the MQFaultStrategy class.
6-
Here is a sendLatencyFaultEnable switch variable, which, if turned on, filters out the Broker agent of not available on the basis of randomly gradually increasing modular arithmetic selection. The so-called "latencyFault Tolerance" refers to a certain period of time to avoid previous failures. For example, if the latency of the last request exceeds 550 Lms, it will evade 30000 Lms; if it exceeds 1000L, it will evade 60000L; if it is closed, it will choose a queue (MessageQueue) to send messages by randomly gradually increasing modular arithmetic, and the latencyFault Tolerance mechanism is the key to achieve high availability of message sending.
6+
Here is a sendLatencyFaultEnable switch variable, which, if turned on, filters out the Broker agents that are not available on the basis of randomly gradually increasing modular arithmetic selection. The so-called "latencyFault Tolerance" refers to a certain period of time to avoid previous failures. For example, if the latency of the last request exceeds 550 Lms, it will evade 30000 Lms; if it exceeds 1000L, it will evade 60000L; if it is closed, it will choose a queue (MessageQueue) to send messages by randomly gradually increasing modular arithmetic, and the latencyFault Tolerance mechanism is the key to achieve high availability of message sending.
77

88
### Consumer Load Balancing
99
In RocketMQ, the two consumption modes (Push/Pull) on the Consumer side are both based on the pull mode to get the message, while in the Push mode it is only a kind of encapsulation of the pull mode, which is essentially implemented as the message pulling thread after pulling a batch of messages from the server. After submitting to the message consuming thread pool, it continues to try again to pull the message to the server. If the message is not pulled, the pull is delayed and continues. In both pull mode based consumption patterns (Push/Pull), the Consumer needs to know which message queue - queue from the Broker side to get the message. Therefore, it is necessary to do load balancing on the Consumer side, that is, which Consumer consumption is allocated to the same ConsumerGroup by more than one MessageQueue on the Broker side.

docs/en/Design_Trancation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The compensation phase is used to resolve the timeout or failure case of the mes
2222
### 1.2 The design of RocketMQ Transaction Message
2323
1 Transaction message is invisible to users in first phase(commit-request phase)
2424

25-
Upon on the main process of transaction message, the message of first phase is invisible to the user. This is also the biggest difference from normal message. So how do we write the message while making it invisible to the user? And below is the solution of RocketMQ: if the message is a Half message, the topic and queueId of the original message will be backed up, and then changes the topic to RMQ_SYS_TRANS_HALF_TOPIC. Since the consumer group does not subscribe to the topic, the consumer cannot consume the Half message. Then RocketMQ starts a timing task, pulls the message for RMQ_SYS_TRANS_HALF_TOPIC, obtains a channel according to producer group and sends a back-check to query local transaction status, and decide whether to submit or roll back the message according to the status.
25+
In the main process of transaction message, the message of first phase is invisible to the user. This is also the biggest difference from normal message. So how do we write the message while making it invisible to the user? And below is the solution of RocketMQ: if the message is a Half message, the topic and queueId of the original message will be backed up, and then changes the topic to RMQ_SYS_TRANS_HALF_TOPIC. Since the consumer group does not subscribe to the topic, the consumer cannot consume the Half message. Then RocketMQ starts a timing task, pulls the message for RMQ_SYS_TRANS_HALF_TOPIC, obtains a channel according to producer group and sends a back-check to query local transaction status, and decide whether to submit or roll back the message according to the status.
2626

2727
In RocketMQ, the storage structure of the message in the broker is as follows. Each message has corresponding index information. The Consumer reads the content of the message through the secondary index of the ConsumeQueue. The flow is as follows:
2828

docs/en/FAQ.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The following questions are frequently asked with regard to the RocketMQ project
88

99
Please refer to [Why RocketMQ](http://rocketmq.apache.org/docs/motivation)
1010

11-
2. Do I have to install other softeware, such as zookeeper, to use RocketMQ?
11+
2. Do I have to install other software, such as zookeeper, to use RocketMQ?
1212

1313
No. RocketMQ can run independently.
1414

@@ -24,9 +24,9 @@ The following questions are frequently asked with regard to the RocketMQ project
2424

2525
### 2. How to reconsume message when consumption fails?
2626

27-
&#8195;1) Cluster consumption pattern, The consumer business logic code returns Action.ReconsumerLater, NULL, or throws an exception, if a message failed to be consumed, it will retry for up to 16 times, after that, the message would be descarded.
27+
&#8195;1) Cluster consumption pattern, The consumer business logic code returns Action.ReconsumerLater, NULL, or throws an exception, if a message failed to be consumed, it will retry for up to 16 times, after that, the message would be discarded.
2828

29-
&#8195;2) Broadcast consumption patternThe broadcaset consumption still ensures that a message is consumered at least once, but no resend option is provided.
29+
&#8195;2) Broadcast consumption pattern. The broadcast consumption still ensures that a message is consumed at least once, but no resend option is provided.
3030

3131
### 3. How to query the failed message if there is a consumption failure?
3232

docs/en/Troubleshoopting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
1111
Solution: Execute `export NAMESRV_ADDR=ip:9876` (ip refers to the address of NameServer deployed in the cluster) on the VM that deploys the RocketMQ cluster.Then you will execute commands of "mqadmin" successfully.
1212
13-
## 2 The inconsistent version of RocketMQ between the producer and consumer leads to the problem that message can't be consumed normally.
13+
## 2 The inconsistent version of RocketMQ between the producer and consumer leads to the problem that messages can't be consumed normally.
1414
1515
> Problem: The same producer sends a message, consumer A can consume, but consumer B can't consume, and the RocketMQ Console appears:
1616
>

0 commit comments

Comments
 (0)