Skip to content

Commit

Permalink
Merge pull request #3395 from mooncak/fix_doc_issue
Browse files Browse the repository at this point in the history
Fix some documents issues
  • Loading branch information
k8s-ci-robot authored Nov 11, 2018
2 parents 55104c9 + 2d64e15 commit 14fe489
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/user-guide/ingress-path-matching.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ location ~* "^/foo/.*" {

## Path Priority

In NGINX, regular expressions follow a **first match** policy. In order to enable more acurate path matching, ingress-nginx first orders the paths by descending length before writing them to the NGINX template as location blocks.
In NGINX, regular expressions follow a **first match** policy. In order to enable more accurate path matching, ingress-nginx first orders the paths by descending length before writing them to the NGINX template as location blocks.

**Please read the [warning](#warning) before using regular expressions in your ingress definitions.**

Expand Down
6 changes: 3 additions & 3 deletions docs/user-guide/nginx-configuration/configmap.md
Original file line number Diff line number Diff line change
Expand Up @@ -830,22 +830,22 @@ _**default:**_ "/.well-known/acme-challenge"

## block-cidrs

A comma-separated list of IP addresses (or subnets), requestst from which have to be blocked globally.
A comma-separated list of IP addresses (or subnets), request from which have to be blocked globally.

_References:_
[http://nginx.org/en/docs/http/ngx_http_access_module.html#deny](http://nginx.org/en/docs/http/ngx_http_access_module.html#deny)

## block-user-agents

A comma-separated list of User-Agent, requestst from which have to be blocked globally.
A comma-separated list of User-Agent, request from which have to be blocked globally.
It's possible to use here full strings and regular expressions. More details about valid patterns can be found at `map` Nginx directive documentation.

_References:_
[http://nginx.org/en/docs/http/ngx_http_map_module.html#map](http://nginx.org/en/docs/http/ngx_http_map_module.html#map)

## block-referers

A comma-separated list of Referers, requestst from which have to be blocked globally.
A comma-separated list of Referers, request from which have to be blocked globally.
It's possible to use here full strings and regular expressions. More details about valid patterns can be found at `map` Nginx directive documentation.

_References:_
Expand Down

0 comments on commit 14fe489

Please sign in to comment.