From d147299e23f47f5d4914e88568f95b164a439aa9 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Thu, 16 Mar 2023 17:35:06 +0800
Subject: [PATCH 1/2] chore: refine changes for merged PRs

---
 changes/ce/feat-10065.en.md     | 1 +
 changes/ce/feat-10065.zh.md     | 1 +
 changes/ce/feat-9893.en.md      | 2 ++
 changes/ce/feat-9893.zh.md      | 2 ++
 changes/ce/fix-10056.en.md      | 4 +++-
 changes/ce/fix-10056.zh.md      | 4 +++-
 changes/ce/fix-10066.en.md      | 2 +-
 changes/ce/fix-10066.zh.md      | 2 +-
 changes/ce/fix-10086.en.md      | 2 +-
 changes/ce/fix-10086.zh.md      | 2 +-
 changes/ce/fix-10100.en.md      | 1 +
 changes/ce/fix-10100.zh.md      | 1 +
 changes/ce/fix-10118.en.md      | 2 +-
 changes/ce/fix-10118.zh.md      | 4 ++--
 changes/ee/feat-10083.en.md     | 2 +-
 changes/ee/feat-10083.zh.md     | 2 +-
 changes/v5.0.16/feat-9893.en.md | 1 -
 changes/v5.0.16/feat-9893.zh.md | 1 -
 18 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 changes/ce/feat-10065.en.md
 create mode 100644 changes/ce/feat-10065.zh.md
 create mode 100644 changes/ce/feat-9893.en.md
 create mode 100644 changes/ce/feat-9893.zh.md
 delete mode 100644 changes/v5.0.16/feat-9893.en.md
 delete mode 100644 changes/v5.0.16/feat-9893.zh.md

diff --git a/changes/ce/feat-10065.en.md b/changes/ce/feat-10065.en.md
new file mode 100644
index 000000000..ae182f3c8
--- /dev/null
+++ b/changes/ce/feat-10065.en.md
@@ -0,0 +1 @@
+Add deb package support for `raspbian9` and `raspbian10`.
diff --git a/changes/ce/feat-10065.zh.md b/changes/ce/feat-10065.zh.md
new file mode 100644
index 000000000..366276333
--- /dev/null
+++ b/changes/ce/feat-10065.zh.md
@@ -0,0 +1 @@
+为 `raspbian9` 及 `raspbian10` 增加 deb 包支持。
diff --git a/changes/ce/feat-9893.en.md b/changes/ce/feat-9893.en.md
new file mode 100644
index 000000000..343c3794f
--- /dev/null
+++ b/changes/ce/feat-9893.en.md
@@ -0,0 +1,2 @@
+When connecting with the flag `clean_start=false`, EMQX will filter out messages that published by banned clients.
+Previously, the messages sent by banned clients may still be delivered to subscribers in this scenario.
diff --git a/changes/ce/feat-9893.zh.md b/changes/ce/feat-9893.zh.md
new file mode 100644
index 000000000..426439c3e
--- /dev/null
+++ b/changes/ce/feat-9893.zh.md
@@ -0,0 +1,2 @@
+当使用 `clean_start=false` 标志连接时，EMQX 将会从消息队列中过滤出被封禁客户端发出的消息，使它们不能被下发给订阅者。
+此前被封禁客户端发出的消息仍可能在这一场景下被下发给订阅者。
diff --git a/changes/ce/fix-10056.en.md b/changes/ce/fix-10056.en.md
index ab9b980e8..55449294d 100644
--- a/changes/ce/fix-10056.en.md
+++ b/changes/ce/fix-10056.en.md
@@ -1 +1,3 @@
-`/bridges` API: return `400` instead of `403` in case of inconsistency in the application logic either because bridge is about to be deleted, but active rules still depend on it, or an operation (start|stop|restart) is called, but the bridge is not enabled.
+Fix `/bridges` API status code.
+- Return `400` instead of `403` in case of removing a data bridge that is dependent on an active rule.
+- Return `400` instead of `403` in case of calling operations (start|stop|restart) when Data-Bridging is not enabled.
diff --git a/changes/ce/fix-10056.zh.md b/changes/ce/fix-10056.zh.md
index 4d3317165..ec5982137 100644
--- a/changes/ce/fix-10056.zh.md
+++ b/changes/ce/fix-10056.zh.md
@@ -1 +1,3 @@
-`/bridges` API：在应用逻辑不一致的情况下，返回`400'而不是`403'，因为桥即将被删除，但活动规则仍然依赖于它，或者调用了一个操作（启动|停止|重新启动），但桥没有被启用。
+修复 `/bridges` API 的 HTTP 状态码。
+- 当删除被活动中的规则依赖的数据桥接时，将返回 `400` 而不是 `403` 。
+- 当数据桥接未启用时，调用操作（启动|停止|重启）将返回 `400` 而不是 `403`。
diff --git a/changes/ce/fix-10066.en.md b/changes/ce/fix-10066.en.md
index 2d23ad5b9..87e253aca 100644
--- a/changes/ce/fix-10066.en.md
+++ b/changes/ce/fix-10066.en.md
@@ -1 +1 @@
-Return human readable error message for `/briges_probe` and `[/node/:node]/bridges/:id/:operation` API calls and set HTTP status code to `400` instead of `500`.
+Improve error messages for `/briges_probe` and `[/node/:node]/bridges/:id/:operation` API calls to make them more readable. And set HTTP status code to `400` instead of `500`.
diff --git a/changes/ce/fix-10066.zh.md b/changes/ce/fix-10066.zh.md
index c72f21ff1..e5e3c2113 100644
--- a/changes/ce/fix-10066.zh.md
+++ b/changes/ce/fix-10066.zh.md
@@ -1 +1 @@
-为 `/briges_probe` 和 `[/node/:node]/bridges/:id/:operation` 的 API 调用返回人类可读的错误信息，并将 HTTP 状态代码设置为 `400` 而不是 `500`。
+改进 `/briges_probe` 和 `[/node/:node]/bridges/:id/:operation` API 调用的错误信息，使之更加易读。并将 HTTP 状态代码设置为 `400` 而不是 `500`。
diff --git a/changes/ce/fix-10086.en.md b/changes/ce/fix-10086.en.md
index 31e8b6453..d337a57c7 100644
--- a/changes/ce/fix-10086.en.md
+++ b/changes/ce/fix-10086.en.md
@@ -1,4 +1,4 @@
 Upgrade HTTP client ehttpc to `0.4.7`.
 Prior to this upgrade, HTTP clients for authentication, authorization and webhook may crash
-if `body` is empty but content-type HTTP header is set.
+if `Body` is empty but `Content-Type` HTTP header is set.
 For more details see [ehttpc PR#44](https://github.com/emqx/ehttpc/pull/44).
diff --git a/changes/ce/fix-10086.zh.md b/changes/ce/fix-10086.zh.md
index b7c110ea4..c083d6055 100644
--- a/changes/ce/fix-10086.zh.md
+++ b/changes/ce/fix-10086.zh.md
@@ -1,3 +1,3 @@
 HTTP 客户端库 `ehttpc` 升级到 0.4.7。
-在升级前，如果 HTTP 客户端，例如 认证，授权，webhook 等配置中使用了content-type HTTP 头，但是没有配置 body，则可能会发生异常。
+在升级前，如果 HTTP 客户端，例如 '认证'、'授权'、'WebHook' 等配置中使用了 `Content-Type` HTTP 头，但是没有配置 `Body`，则可能会发生异常。
 详情见 [ehttpc PR#44](https://github.com/emqx/ehttpc/pull/44)。
diff --git a/changes/ce/fix-10100.en.md b/changes/ce/fix-10100.en.md
index 002fb6f08..e16ee5efc 100644
--- a/changes/ce/fix-10100.en.md
+++ b/changes/ce/fix-10100.en.md
@@ -1 +1,2 @@
 Fix channel crash for slow clients with enhanced authentication.
+Previously, when the client was using enhanced authentication, but the Auth message was sent slowly or the Auth message was lost, the client process would crash.
diff --git a/changes/ce/fix-10100.zh.md b/changes/ce/fix-10100.zh.md
index 6adb5e7e1..ac2483a27 100644
--- a/changes/ce/fix-10100.zh.md
+++ b/changes/ce/fix-10100.zh.md
@@ -1 +1,2 @@
 修复响应较慢的客户端在使用增强认证时可能出现崩溃的问题。
+此前，当客户端使用增强认证功能，但发送 Auth 报文较慢或 Auth 报文丢失时会导致客户端进程崩溃。
diff --git a/changes/ce/fix-10118.en.md b/changes/ce/fix-10118.en.md
index dd6b5129f..f6db758f3 100644
--- a/changes/ce/fix-10118.en.md
+++ b/changes/ce/fix-10118.en.md
@@ -1,4 +1,4 @@
 Fix problems related to manual joining of EMQX replicant nodes to the cluster.
-Previously, manually joining and then leaving the cluster rendered replicant node unable to start EMQX again and required a node restart.
+Previously, after manually executing joining and then leaving the cluster, the `replicant` node can only run normally after restarting the node after joining the cluster again.
 
 [Mria PR](https://github.com/emqx/mria/pull/128)
diff --git a/changes/ce/fix-10118.zh.md b/changes/ce/fix-10118.zh.md
index 4334a5bba..a037215f0 100644
--- a/changes/ce/fix-10118.zh.md
+++ b/changes/ce/fix-10118.zh.md
@@ -1,4 +1,4 @@
-修复与手动加入 EMQX `replicant` 节点到集群有关的问题。
-以前，手动加入然后离开集群会使 `replicant` 节点无法再次启动 EMQX，需要重新启动节点。
+修复 `replicant` 节点因为手动加入 EMQX 集群导致的相关问题。
+此前，手动执行 `加入集群-离开集群` 后，`replicant` 节点再次加入集群后只有重启节点才能正常运行。
 
 [Mria PR](https://github.com/emqx/mria/pull/128)
diff --git a/changes/ee/feat-10083.en.md b/changes/ee/feat-10083.en.md
index 635549d5e..f4331faf9 100644
--- a/changes/ee/feat-10083.en.md
+++ b/changes/ee/feat-10083.en.md
@@ -1 +1 @@
-Integrate `DynamoDB` into `bridges` as a new backend.
+Add `DynamoDB` support for Data-Brdige.
diff --git a/changes/ee/feat-10083.zh.md b/changes/ee/feat-10083.zh.md
index 061e2e416..8274e62c2 100644
--- a/changes/ee/feat-10083.zh.md
+++ b/changes/ee/feat-10083.zh.md
@@ -1 +1 @@
-在 `桥接` 中集成 `DynamoDB`。
+为数据桥接增加 `DynamoDB` 支持。
diff --git a/changes/v5.0.16/feat-9893.en.md b/changes/v5.0.16/feat-9893.en.md
deleted file mode 100644
index 590d82a0f..000000000
--- a/changes/v5.0.16/feat-9893.en.md
+++ /dev/null
@@ -1 +0,0 @@
-When connecting with the flag `clean_start=false`, the new session will filter out banned messages from the `mqueue` before deliver.
diff --git a/changes/v5.0.16/feat-9893.zh.md b/changes/v5.0.16/feat-9893.zh.md
deleted file mode 100644
index 30286a679..000000000
--- a/changes/v5.0.16/feat-9893.zh.md
+++ /dev/null
@@ -1 +0,0 @@
-当使用 `clean_start=false` 标志连接时，新会话将在传递之前从 `mqueue` 中过滤掉被封禁的消息。

From afd29b69c48ba8725321c54c01b7d5f59104d952 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Thu, 16 Mar 2023 17:50:37 +0800
Subject: [PATCH 2/2] chore: refine i18n doc punctuation

---
 apps/emqx/i18n/emqx_schema_i18n.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/i18n/emqx_schema_i18n.conf b/apps/emqx/i18n/emqx_schema_i18n.conf
index b57698327..fb458b449 100644
--- a/apps/emqx/i18n/emqx_schema_i18n.conf
+++ b/apps/emqx/i18n/emqx_schema_i18n.conf
@@ -1079,11 +1079,11 @@ Supported configurations are the following:
             zh: """共享订阅消息派发策略。
   - `random`：随机挑选一个共享订阅者派发；
   - `round_robin`：使用 round-robin 策略派发；
-  - `round_robin_per_group`: 在共享组内循环选择下一个成员；
-  - `local`: 选择随机的本地成员，否则选择随机的集群范围内成员;
+  - `round_robin_per_group`：在共享组内循环选择下一个成员；
+  - `local`：选择随机的本地成员，否则选择随机的集群范围内成员;
   - `sticky`：总是使用上次选中的订阅者派发，直到它断开连接；
   - `hash_clientid`：使用发送者的 Client ID 进行 Hash 来选择订阅者;
-  - `hash_topic`: 使用源主题进行 Hash 来选择订阅者。"""
+  - `hash_topic`：使用源主题进行 Hash 来选择订阅者。"""
         }
     }
 
@@ -1095,7 +1095,7 @@ This should allow messages to be dispatched to a different subscriber in the gro
 
             zh: """该配置项已废弃，会在 5.1 中移除。
 启用/禁用 QoS 1 和 QoS 2 消息的共享派发确认。
-开启后，允许将消息从未及时回复 ACK 的订阅者 （例如，客户端离线）重新派发给另外一个订阅者。"""
+开启后，允许将消息从未及时回复 ACK 的订阅者 （例如，客户端离线） 重新派发给另外一个订阅者。"""
         }
     }