You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2020/12/13 06:15:15 UTC
[apisix] branch master updated: docs: remove unneeded whitespace
from Markdown (#3026)
This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new aed3e81 docs: remove unneeded whitespace from Markdown (#3026)
aed3e81 is described below
commit aed3e818e0297deed150f1ad85c756d94747ac2e
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Sun Dec 13 16:15:07 2020 +1000
docs: remove unneeded whitespace from Markdown (#3026)
---
CHANGELOG.md | 2 +-
CHANGELOG_CN.md | 2 +-
README.md | 2 +-
doc/architecture-design.md | 2 +-
doc/plugins/wolf-rbac.md | 6 +++---
doc/zh-cn/discovery.md | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0dcb08..f80a2ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -107,7 +107,7 @@ For more changes, please refer to [Milestone](https://github.com/apache/apisix/m
### Improvements
- change: nginx worker_shutdown_timeout is changed from 3s to recommended value 240s. [1883](https://github.com/apache/apisix/pull/1883)
-- change: the `healthcheck` timeout time type changed from `integer ` to `number`. [1892](https://github.com/apache/apisix/pull/1892)
+- change: the `healthcheck` timeout time type changed from `integer` to `number`. [1892](https://github.com/apache/apisix/pull/1892)
- change: the `request-validation` plugin input parameter supports `Schema` validation. [1920](https://github.com/apache/apisix/pull/1920)
- change: add comments for Makefile `install` command. [1912](https://github.com/apache/apisix/pull/1912)
- change: update comment for config.yaml `etcd.timeout` configuration. [1929](https://github.com/apache/apisix/pull/1929)
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index 97bdcad..d51f84e 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -108,7 +108,7 @@
### Improvements
- 变更：nginx `worker_shutdown_timeout` 配置默认值由 `3s` 变更为推荐值 `240s`。[1883](https://github.com/apache/apisix/pull/1883)
-- 变更：`healthcheck` 超时时间类型 由 `integer ` 变更为 `number`。[1892](https://github.com/apache/apisix/pull/1892)
+- 变更：`healthcheck` 超时时间类型 由 `integer` 变更为 `number`。[1892](https://github.com/apache/apisix/pull/1892)
- 变更：`request-validation` 插件输入参数支持 `JsonSchema` 验证。[1920](https://github.com/apache/apisix/pull/1920)
- 变更：为 Makefile `install` 命令添加注释。[1912](https://github.com/apache/apisix/pull/1912)
- 变更：更新 config.yaml `etcd.timeout` 默认配置的注释。[1929](https://github.com/apache/apisix/pull/1929)
diff --git a/README.md b/README.md
index 6688a21..627f1cd 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ A/B testing, canary release, blue-green deployment, limit rate, defense against
- **Fine-grained routing**
- [Supports full path matching and prefix matching](doc/router-radixtree.md#how-to-use-libradixtree-in-apisix)
- - [Support all Nginx built-in variables as conditions for routing](/doc/router-radixtree.md#how-to-filter-route-by-nginx-builtin-variable), so you can use `cookie`,` args`, etc. as routing conditions to implement canary release, A/B testing, etc.
+ - [Support all Nginx built-in variables as conditions for routing](/doc/router-radixtree.md#how-to-filter-route-by-nginx-builtin-variable), so you can use `cookie`, `args`, etc. as routing conditions to implement canary release, A/B testing, etc.
- Support [various operators as judgment conditions for routing](https://github.com/iresty/lua-resty-radixtree#operator-list), for example `{"arg_age", ">", 24}`
- Support [custom route matching function](https://github.com/iresty/lua-resty-radixtree/blob/master/t/filter-fun.t#L10)
- IPv6: Use IPv6 to match route.
diff --git a/doc/architecture-design.md b/doc/architecture-design.md
index 66fc7a5..11da4ae 100644
--- a/doc/architecture-design.md
+++ b/doc/architecture-design.md
@@ -483,7 +483,7 @@ Set the route that best suits your business needs in the local configuration `co
* `apisix.router.http`: HTTP Request Route。
* `radixtree_uri`: (Default) only use `uri` as the primary index. Support for full and deep prefix matching based on the `radixtree` engine, see [How to use router-radixtree](router-radixtree.md).
- * `Absolute match `: Complete match for the given `uri`, such as `/foo/bar`,`/foo/glo`.
+ * `Absolute match`: Complete match for the given `uri`, such as `/foo/bar`,`/foo/glo`.
* `Prefix match`: Use `*` at the end to represent the given `uri` as a prefix match. For example, `/foo*` allows matching `/foo/`, `/foo/a` and `/foo/b`.
* `match priority`: first try absolute match, if you can't hit absolute match, try prefix match.
* `Any filter attribute`: Allows you to specify any Nginx built-in variable as a filter, such as URL request parameters, request headers, cookies, and so on.
diff --git a/doc/plugins/wolf-rbac.md b/doc/plugins/wolf-rbac.md
index dea34c8..3690453 100644
--- a/doc/plugins/wolf-rbac.md
+++ b/doc/plugins/wolf-rbac.md
@@ -30,7 +30,7 @@
## Name
-`wolf-rbac` is an authentication and authorization (rbac) plugin. It needs to work with `consumer`. Also need to add `wolf-rbac` to a` service` or `route`.
+`wolf-rbac` is an authentication and authorization (rbac) plugin. It needs to work with `consumer`. Also need to add `wolf-rbac` to a `service` or `route`.
The rbac feature is provided by [wolf](https://github.com/iGeeky/wolf). For more information about `wolf`, please refer to [wolf documentation](https://github.com/iGeeky/wolf).
@@ -58,7 +58,7 @@ You may need to use [interceptors](../plugin-interceptors.md) to protect it.
[Wolf quick start](https://github.com/iGeeky/wolf/blob/master/quick-start-with-docker/README.md)
-### Add `application`,` admin`, `normal user`,` permission`, `resource` and user authorize
+### Add `application`, `admin`, `normal user`, `permission`, `resource` and user authorize
[Wolf-console usage](https://github.com/iGeeky/wolf/blob/master/docs/usage.md)
@@ -112,7 +112,7 @@ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f1
#### Login and get `wolf-rbac` token:
-The following `appid`,` username`, and `password` must be real ones in the wolf system.
+The following `appid`, `username`, and `password` must be real ones in the wolf system.
* Login as `POST application/json`
diff --git a/doc/zh-cn/discovery.md b/doc/zh-cn/discovery.md
index 68dcb29..454f3f1 100644
--- a/doc/zh-cn/discovery.md
+++ b/doc/zh-cn/discovery.md
@@ -180,7 +180,7 @@ discovery:
read: 5000 # 从 eureka 读数据的超时时间，默认5000ms
```
-通过 `discovery.eureka.host ` 配置 eureka 的服务器地址。
+通过 `discovery.eureka.host` 配置 eureka 的服务器地址。
如果 eureka 的地址是 `http://127.0.0.1:8761/` ，并且不需要用户名和密码验证的话，配置如下：