This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch new-official-website
in repository https://gitbox.apache.org/repos/asf/rocketmq-site.git
The following commit(s) were added to refs/heads/new-official-website by this
push:
new 0a12b27f1 Fix doc language and example errors (#581)
0a12b27f1 is described below
commit 0a12b27f1da496b5f9541d34341a54942032be38
Author: koado <[email protected]>
AuthorDate: Mon Jul 24 08:44:34 2023 +0800
Fix doc language and example errors (#581)
Co-authored-by: kkddd z <[email protected]>
---
.../version-5.0/03-domainModel/02topic.md | 4 ++--
.../version-5.0/04-featureBehavior/01normalmessage.md | 2 +-
.../version-5.0/04-featureBehavior/03fifomessage.md | 2 +-
.../version-5.0/04-featureBehavior/07messagefilter.md | 4 ++--
.../version-5.0/04-featureBehavior/08consumerloadbalance.md | 6 +++---
versioned_docs/version-5.0/03-domainModel/02topic.md | 4 ++--
versioned_docs/version-5.0/03-domainModel/03messagequeue.md | 2 +-
versioned_docs/version-5.0/04-featureBehavior/01normalmessage.md | 2 +-
versioned_docs/version-5.0/04-featureBehavior/03fifomessage.md | 2 +-
versioned_docs/version-5.0/04-featureBehavior/05sendretrypolicy.md | 2 +-
versioned_docs/version-5.0/04-featureBehavior/07messagefilter.md | 4 ++--
.../version-5.0/04-featureBehavior/08consumerloadbalance.md | 6 +++---
12 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/03-domainModel/02topic.md
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/03-domainModel/02topic.md
index e9da97248..28e941dc7 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/03-domainModel/02topic.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/03-domainModel/02topic.md
@@ -68,9 +68,9 @@ A topic contains one or more queues. Message storage and
scalability are impleme
Apache RocketMQ version 5.x allows you to specify a message type for a topic.
This way, you can manage and process messages of the specified type in a
separate topic. Apache RocketMQ forcibly verifies the type of messages that are
sent and the message type of the topic to which the messages are sent. If
message type verification fails, message delivery requests are rejected, and a
type mismatch error is returned. The following verification rules apply:
-* Consistent message typesThe messages that you want to send must use the same
message type as the message type that is specified for the topic to which you
want to send the messages.
+* Consistent message types. The messages that you want to send must use the
same message type as the message type that is specified for the topic to which
you want to send the messages.
-* Only one type of messages sent to a topicThe messages that you want to send
to a topic must use the same message type. Only one message type can be
specified for a topic.
+* Only one type of messages sent to a topic. The messages that you want to
send to a topic must use the same message type. Only one message type can be
specified for a topic.
:::info
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/01normalmessage.md
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/01normalmessage.md
index 6bda2177e..52c2e7264 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/01normalmessage.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/01normalmessage.md
@@ -50,7 +50,7 @@ Normal messages support only topics whose MessageType is
Normal.
For creating topics in Apache RocketMQ 5.0, it is recommended to use the
mqadmin tool. However, it is worth noting that message type needs to be added
as a property parameter. Here is an example:
```shell
-sh mqadmin updateTopic -n <nameserver_address> -t <topic_name> -c
<cluster_name> -a +message.type=Normal
+sh mqadmin updateTopic -n <nameserver_address> -t <topic_name> -c
<cluster_name> -a +message.type=NORMAL
```
**Send messages**
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/03fifomessage.md
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/03fifomessage.md
index d553abb64..ea3035815 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/03fifomessage.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/03fifomessage.md
@@ -132,7 +132,7 @@ Compared with normal messages, ordered messages must have
message groups configu
```bash
-./bin/mqadmin updateTopic -c DefaultCluster -t FIFOTopic -o true -n
127.0.0.1:9876
+./bin/mqadmin updateTopic -c DefaultCluster -t FIFOTopic -o true -n
127.0.0.1:9876 -a +message.type=FIFO
```
+ -c the cluster name
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/07messagefilter.md
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/07messagefilter.md
index e994b1fb7..94f19e01e 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/07messagefilter.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/07messagefilter.md
@@ -194,11 +194,11 @@ You must follow the SQL92 syntax when you write filter
expressions. Specifically
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
| IS NULL
| Specifies that an attribute does not exist.
[...]
| IS NOT NULL
| Specifies that an attribute exists.
[...]
-| * \> * \>= * \< * \<= | Compares numeric values. The syntax cannot be
used to compare strings. If it is used to compare strings, an error is reported
when the consumer is started. **Note** Strings that can be converted into
numeric values are also considered as numeric values.
| * `a IS NOT NULL AND a >
100`: Attribute a exists and the value of Attribute a is greater than 100. *
`a IS NOT NULL AND a > 'a [...]
+| * \> * \>= * < * <= | Compares numeric values. The syntax cannot be
used to compare strings. If it is used to compare strings, an error is reported
when the consumer is started. **Note** Strings that can be converted into
numeric values are also considered as numeric values.
| * `a IS NOT NULL AND a >
100`: Attribute a exists and the value of Attribute a is greater than 100. *
`a IS NOT NULL AND a > 'a [...]
| BETWEEN xxx AND xxx
| Compares numeric values. The syntax cannot be used to
compare strings. If it is used to compare strings, an error is reported when
the consumer is started. The syntax is equivalent to \>= xxx AND \<= xxx. It
means that the value of the attribute is between two numeric values or equal to
either of the two nu [...]
| NOT BETWEEN xxx AND xxx
| Compares numeric values. The syntax cannot be used to
compare strings. If it is used to compare strings, an error is reported when
the consumer is started. The syntax is equivalent to \< xxx OR \> xxx. It means
that the value of the attribute is less than the left-side numeric value or
greater than the righ [...]
| IN (xxx, xxx)
| Indicates that the value of the attribute is included
in a set. The elements in the set can only be strings.
[...]
-| * = * \<\>
| The equal to operator and the not equal to operator. They
can be used to compare numeric values and strings.
| `a IS NOT NULL AND (a = 'abc' OR a<>'def')`:
Attribute a exis [...]
+| * = * <\>
| The equal to operator and the not equal to operator. They
can be used to compare numeric values and strings.
| `a IS NOT NULL AND (a = 'abc' OR a<>'def')`:
Attribute a exist [...]
| * AND * OR
| The logical AND operator and the logical OR operator. They
can be used to combine simple logical functions, and each logical function must
be put in parentheses.
| `a IS NOT NULL AND (a > 100) OR (b IS NULL)`:
Attribute a exi [...]
diff --git
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
index 6ce8e5faa..a38f8fcdc 100644
---
a/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
+++
b/i18n/en/docusaurus-plugin-content-docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
@@ -73,15 +73,15 @@ In the preceding figure, there are four ordered messages in
message group G1 of
Compared with queue-based load balancing, message-based load balancing has the
following features:
-* More balanced consumption allocationIn conventional queue-based load
balancing, the number of queues and the number of consumers may not be properly
balanced. This results in a system where some consumers may be idle while some
consumers are overburdened. In comparison, message-based load balancing ensures
even load balancing among consumers without requiring you to manage the number
of queues and consumers.
+* More balanced consumption allocation. In conventional queue-based load
balancing, the number of queues and the number of consumers may not be properly
balanced. This results in a system where some consumers may be idle while some
consumers are overburdened. In comparison, message-based load balancing ensures
even load balancing among consumers without requiring you to manage the number
of queues and consumers.
-* More forgiving to differences in networking capacitiesIn an online
production environment, the processing capabilities of consumers may be
different due to actual network conditions or inconsistent networking hardware
specifications. If messages are allocated based on queues, there might be cases
where some consumers have accumulated messages while some other consumers are
idle. In contrast, message-based load balancing allocates messages on demand to
achieve a more balanced load distr [...]
+* More forgiving to differences in networking capacities. In an online
production environment, the processing capabilities of consumers may be
different due to actual network conditions or inconsistent networking hardware
specifications. If messages are allocated based on queues, there might be cases
where some consumers have accumulated messages while some other consumers are
idle. In contrast, message-based load balancing allocates messages on demand to
achieve a more balanced load dis [...]
-* Easier O\&M for queue allocationIn scenarios where conventional queue-based
load balancing is used, you must make sure that the number of queues is greater
or equal to the number of consumers to ensure that no consumers are idle. This
issue is not present with message-based load balancing.
+* Easier O\&M for queue allocation. In scenarios where conventional
queue-based load balancing is used, you must make sure that the number of
queues is greater or equal to the number of consumers to ensure that no
consumers are idle. This issue is not present with message-based load balancing.
**Scenarios**
diff --git a/versioned_docs/version-5.0/03-domainModel/02topic.md
b/versioned_docs/version-5.0/03-domainModel/02topic.md
index 90d38e3e4..0be00e9e6 100644
--- a/versioned_docs/version-5.0/03-domainModel/02topic.md
+++ b/versioned_docs/version-5.0/03-domainModel/02topic.md
@@ -71,9 +71,9 @@
Apache RocketMQ
5.x版本支持将消息类型拆分到主题中进行独立运维和处理，因此系统会对发送的消息类型和主题定的消息类型进行强制校验，若校验不通过，则消息发送请求会被拒绝，并返回类型不匹配异常。校验原则如下：
-* 消息类型必须一致发送的消息的类型，必须和目标主题定义的消息类型一致。
+* 消息类型必须一致：发送的消息的类型，必须和目标主题定义的消息类型一致。
-* 主题类型必须单一每个主题只支持一种消息类型，不允许将多种类型的消息发送到同一个主题中。
+* 主题类型必须单一：每个主题只支持一种消息类型，不允许将多种类型的消息发送到同一个主题中。
:::info
diff --git a/versioned_docs/version-5.0/03-domainModel/03messagequeue.md
b/versioned_docs/version-5.0/03-domainModel/03messagequeue.md
index 61a101422..941021e4d 100644
--- a/versioned_docs/version-5.0/03-domainModel/03messagequeue.md
+++ b/versioned_docs/version-5.0/03-domainModel/03messagequeue.md
@@ -89,7 +89,7 @@ Apache RocketMQ 的队列数可在创建主题或变更主题时设置修改，
* 客户端压力过大
- Apache RocketMQ 的消息读写都是针对队列进行操作，队列过多容易产生空轮询请求，增加系统负荷。
+ Apache RocketMQ 的消息读写都是针对队列进行操作，队列过多对应更多的轮询请求，增加系统负荷。
**常见队列增加场景**
diff --git a/versioned_docs/version-5.0/04-featureBehavior/01normalmessage.md
b/versioned_docs/version-5.0/04-featureBehavior/01normalmessage.md
index 0e7889ddd..ff51b8380 100644
--- a/versioned_docs/version-5.0/04-featureBehavior/01normalmessage.md
+++ b/versioned_docs/version-5.0/04-featureBehavior/01normalmessage.md
@@ -46,7 +46,7 @@
Apache RocketMQ 5.0版本下创建主题操作，推荐使用mqadmin工具，需要注意的是，对于消息类型需要通过属性参数添加。示例如下：
```shell
-sh mqadmin updateTopic -n <nameserver_address> -t <topic_name> -c
<cluster_name> -a +message.type=Normal
+sh mqadmin updateTopic -n <nameserver_address> -t <topic_name> -c
<cluster_name> -a +message.type=NORMAL
```
**发送消息**
diff --git a/versioned_docs/version-5.0/04-featureBehavior/03fifomessage.md
b/versioned_docs/version-5.0/04-featureBehavior/03fifomessage.md
index dd1adaec1..d8f332047 100644
--- a/versioned_docs/version-5.0/04-featureBehavior/03fifomessage.md
+++ b/versioned_docs/version-5.0/04-featureBehavior/03fifomessage.md
@@ -138,7 +138,7 @@ sh mqadmin updateTopic -n <nameserver_address> -t
<topic_name> -c <cluster_name>
**创建FIFO主题**
```bash
-./bin/mqadmin updateTopic -c DefaultCluster -t FIFOTopic -o true -n
127.0.0.1:9876
+./bin/mqadmin updateTopic -c DefaultCluster -t FIFOTopic -o true -n
127.0.0.1:9876 -a +message.type=FIFO
```
+ -c 集群名称
diff --git a/versioned_docs/version-5.0/04-featureBehavior/05sendretrypolicy.md
b/versioned_docs/version-5.0/04-featureBehavior/05sendretrypolicy.md
index 4a6070b90..efd9d135b 100644
--- a/versioned_docs/version-5.0/04-featureBehavior/05sendretrypolicy.md
+++ b/versioned_docs/version-5.0/04-featureBehavior/05sendretrypolicy.md
@@ -6,7 +6,7 @@
**消息发送重试**
-Apache RocketM Q的消息发送重试机制主要为您解答如下问题：
+Apache RocketMQ的消息发送重试机制主要为您解答如下问题：
* 部分节点异常是否影响消息发送？
diff --git a/versioned_docs/version-5.0/04-featureBehavior/07messagefilter.md
b/versioned_docs/version-5.0/04-featureBehavior/07messagefilter.md
index 68af044c1..d7b42fe6f 100644
--- a/versioned_docs/version-5.0/04-featureBehavior/07messagefilter.md
+++ b/versioned_docs/version-5.0/04-featureBehavior/07messagefilter.md
@@ -196,11 +196,11 @@ SQL属性过滤使用SQL92语法作为过滤规则表达式，语法规范如下
|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| IS NULL
| 判断属性不存在。
| `a IS NULL` ：属性a不存在。
|
| IS NOT NULL
| 判断属性存在。
| `a IS NOT NULL`：属性a存在。
|
-| * \> * \>= * \< * \<= | 用于比较数字，不能用于比较字符串，否则消费者客户端启动时会报错。 **说明**
可转化为数字的字符串也被认为是数字。 | * `a IS NOT NULL AND a > 100`：属性a存在且属性a的值大于100。
* `a IS NOT NULL AND a > 'abc'`：错误示例，abc为字符串，不能用于比较大小。 |
+| * \> * \>= * < * <= | 用于比较数字，不能用于比较字符串，否则消费者客户端启动时会报错。 **说明**
可转化为数字的字符串也被认为是数字。 | * `a IS NOT NULL AND a > 100`：属性a存在且属性a的值大于100。
* `a IS NOT NULL AND a > 'abc'`：错误示例，abc为字符串，不能用于比较大小。 |
| BETWEEN xxx AND xxx
| 用于比较数字，不能用于比较字符串，否则消费者客户端启动时会报错。等价于\>= xxx AND \<=
xxx。表示属性值在两个数字之间。 | `a IS NOT NULL AND (a BETWEEN 10 AND
100)`：属性a存在且属性a的值大于等于10且小于等于100。
|
| NOT BETWEEN xxx AND xxx
| 用于比较数字，不能用于比较字符串，否则消费者客户端启动会报错。等价于\< xxx OR \>
xxx，表示属性值在两个值的区间之外。 | `a IS NOT NULL AND (a NOT BETWEEN 10 AND
100)`：属性a存在且属性a的值小于10或大于100。
|
| IN (xxx, xxx)
| 表示属性的值在某个集合内。集合的元素只能是字符串。
| `a IS NOT NULL AND (a IN ('abc', 'def'))`：属性a存在且属性a的值为abc或def。
|
-| * = * \<\>
| 等于和不等于。可用于比较数字和字符串。
| `a IS NOT NULL AND (a = 'abc' OR
a<>'def')`：属性a存在且属性a的值为abc或a的值不为def。
|
+| * = * <\>
| 等于和不等于。可用于比较数字和字符串。
| `a IS NOT NULL AND (a = 'abc' OR a<>'def')`：属性a存在且属性a的值为abc或a的值不为def。
|
| * AND * OR
| 逻辑与、逻辑或。可用于组合任意简单的逻辑判断，需要将每个逻辑判断内容放入括号内。
| `a IS NOT NULL AND (a > 100) OR (b IS
NULL)`：属性a存在且属性a的值大于100或属性b不存在。
|
diff --git
a/versioned_docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
b/versioned_docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
index 6281bf01f..021e6c3c6 100644
--- a/versioned_docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
+++ b/versioned_docs/version-5.0/04-featureBehavior/08consumerloadbalance.md
@@ -75,11 +75,11 @@
相对于队列粒度负载均衡策略，消息粒度负载均衡策略有以下特点：
-*
消费分摊更均衡传统队列级的负载均衡策略中，如果队列数量和消费者数量不均衡，则可能会出现部分消费者空闲，或部分消费者处理过多消息的情况。消息粒度负载均衡策略无需关注消费者和队列的相对数量，能够更均匀地分摊消息。
+*
消费分摊更均衡：对于传统队列级的负载均衡策略，如果队列数量和消费者数量不均衡，则可能会出现部分消费者空闲，或部分消费者处理过多消息的情况。消息粒度负载均衡策略无需关注消费者和队列的相对数量，能够更均匀地分摊消息。
-*
对非对等消费者更友好对于线上生产环境，由于网络机房分区延迟、消费者物理资源规格不一致等原因，消费者的处理能力可能会不一致，如果按照队列分配消息，则可能出现部分消费者消息堆积、部分消费者空闲的情况。消息粒度负载均衡策略按需分配，消费者处理任务更均衡。
+*
对非对等消费者更友好：在线上生产环境中，由于网络机房分区延迟、消费者物理资源规格不一致等原因，消费者的处理能力可能会不一致，如果按照队列分配消息，则可能出现部分消费者消息堆积、部分消费者空闲的情况。消息粒度负载均衡策略按需分配，消费者处理任务更均衡。
-*
队列分配运维更方便传统基于绑定队列的负载均衡策略，必须保证队列数量大于等于消费者数量，以免产生部分消费者获取不到队列出现空转的情况，而消息粒度负载均衡策略则无需关注队列数。
+*
队列分配运维更方便：传统基于绑定队列的负载均衡策略必须保证队列数量大于等于消费者数量，以免产生部分消费者获取不到队列出现空转的情况，而消息粒度负载均衡策略则无需关注队列数。
**适用场景**
