Merge branch 'master' into testUpdateBranchGrayRulesWithUpdateOnce

CHANGES.md

@@ -34,6 +34,7 @@ Apollo 2.1.0
 * [fix get the openapi interface that contains namespace information for deleted items](https://github.com/apolloconfig/apollo/pull/4596)
 * [A user-friendly config management page for apollo portal](https://github.com/apolloconfig/apollo/pull/4592)
 * [feat: support use database as a registry](https://github.com/apolloconfig/apollo/pull/4595)
+* [fix doc bug](https://github.com/apolloconfig/apollo/pull/4579)
 
 ------------------
-All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/11?closed=1)
+All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/11?closed=1)

docs/en/deployment/distributed-deployment-guide.md

@@ -1307,12 +1307,6 @@ If set to true, only super administrators and accounts with project administrato
 
 ### 3.1.12 admin-services.access.tokens - set the access token required by apollo-portal to access the apollo-adminservice for each environment
 
-### 3.1.13 searchByItem.switch - whether the console search box supports searching by configuration item
-
-The default is true, which makes it easy to quickly search for configurations by configuration item
-
-If set to false, this feature is disabled 
-
 > for version 1.7.1 and above
 
 If the corresponding environment apollo-adminservice has [access control enabled](en/deployment/distributed-deployment-guide?id=_326-admin-servicesaccesscontrolenabled-configure-whether-apollo-adminservice-has-access-control-enabled), then you need to configure apollo-portal access here access token required for this environment apollo-adminservice, otherwise access will fail .
@@ -1326,6 +1320,12 @@ The format is json, as follows.
 }
 ```
 
+### 3.1.13 searchByItem.switch - whether the console search box supports searching by configuration item
+
+The default is true, which makes it easy to quickly search for configurations by configuration item
+
+If set to false, this feature is disabled
+
 ## 3.2 Adjusting ApolloConfigDB configuration
 
 Configuration items are uniformly stored in the ApolloConfigDB.ServerConfig table. It should be noted that each environment's ApolloConfigDB.ServerConfig needs to be configured separately, and the modification takes effect in real time for one minute afterwards.

docs/zh/deployment/distributed-deployment-guide.md

@@ -1252,12 +1252,6 @@ portal上“帮助”链接的地址，默认是Apollo github的wiki首页，可
 
 ### 3.1.12 admin-service.access.tokens - 设置apollo-portal访问各环境apollo-adminservice所需的access token
 
-### 3.1.13 searchByItem.switch - 控制台搜索框是否支持按配置项搜索
-
-默认为 true，可以方便的按配置项快速搜索配置
-
-如果设置为 false，则关闭此功能 
-
 > 适用于1.7.1及以上版本
 
 如果对应环境的apollo-adminservice开启了[访问控制](#_326-admin-serviceaccesscontrolenabled-配置apollo-adminservice是否开启访问控制)，那么需要在此配置apollo-portal访问该环境apollo-adminservice所需的access token，否则会访问失败
@@ -1271,6 +1265,13 @@ portal上“帮助”链接的地址，默认是Apollo github的wiki首页，可
 }
 ```
 
+### 3.1.13 searchByItem.switch - 控制台搜索框是否支持按配置项搜索
+
+默认为 true，可以方便的按配置项快速搜索配置
+
+如果设置为 false，则关闭此功能
+
+
 ## 3.2 调整ApolloConfigDB配置
 配置项统一存储在ApolloConfigDB.ServerConfig表中，需要注意每个环境的ApolloConfigDB.ServerConfig都需要单独配置，修改完一分钟实时生效。