From 1152e800587eba89f1c8fdeea796b6ed08c52c83 Mon Sep 17 00:00:00 2001 From: Round_Robin Date: Tue, 17 Nov 2020 16:03:20 +0900 Subject: [PATCH] Fix typo --- docs/deploy/hardening-guide.md | 4 ++-- docs/enhancements/20190815-zone-aware-routing.md | 2 +- docs/examples/grpc/README.md | 4 ++-- docs/user-guide/ingress-path-matching.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/deploy/hardening-guide.md b/docs/deploy/hardening-guide.md index 962ae27b0..ba491e150 100644 --- a/docs/deploy/hardening-guide.md +++ b/docs/deploy/hardening-guide.md @@ -29,8 +29,8 @@ This guide refers to chapters in the CIS Benchmark. For full explanation you sho | 1.1.2 Ensure NGINX is installed from source (Not Scored)| OK | done through helm charts / following documentation to deploy nginx ingress | | | ||| | | __1.2 Configure Software Updates__||| | -| 1.2.1 Ensure package manager repositories are properly configured (Not Scored) | OK | done via helm, nginx version could be overwritten, however compability is not ensured then| | -| 1.2.2 Ensure the latest software package is installed (Not Scored)| ACTION NEEDED | done via helm, nginx version could be overwritten, however compability is not ensured then| Plan for periodic updates | +| 1.2.1 Ensure package manager repositories are properly configured (Not Scored) | OK | done via helm, nginx version could be overwritten, however compatibility is not ensured then| | +| 1.2.2 Ensure the latest software package is installed (Not Scored)| ACTION NEEDED | done via helm, nginx version could be overwritten, however compatibility is not ensured then| Plan for periodic updates | | ||| | | __2 Basic Configuration__ ||| | | ||| | diff --git a/docs/enhancements/20190815-zone-aware-routing.md b/docs/enhancements/20190815-zone-aware-routing.md index 91c04e7f9..357e8ad92 100644 --- a/docs/enhancements/20190815-zone-aware-routing.md +++ b/docs/enhancements/20190815-zone-aware-routing.md @@ -63,7 +63,7 @@ The idea here is to have the controller part of ingress-nginx (2) detect the zone for every endpoint it knows about. After that, it will post that data as part of endpoints to Lua land. When picking an endpoint, the Lua balancer will try to pick zone-local endpoint first and -if there is no zone-local endpoint then it will fall back to current behaviour. +if there is no zone-local endpoint then it will fall back to current behavior. Initially, this feature should be optional since it is going to make it harder to reason about the load balancing and not everyone might want that. diff --git a/docs/examples/grpc/README.md b/docs/examples/grpc/README.md index 891f960fa..60e696bfd 100644 --- a/docs/examples/grpc/README.md +++ b/docs/examples/grpc/README.md @@ -107,11 +107,11 @@ $ grpcurl fortune-teller.stack.build:443 build.stack.fortune.FortuneTeller/Predi ### Notes on using response/request streams -1. If your server does only response streaming and you expect a stream to be open longer than 60 seconds, you will have to change the `grpc_read_timeout` to acommodate for this. +1. If your server does only response streaming and you expect a stream to be open longer than 60 seconds, you will have to change the `grpc_read_timeout` to accommodate for this. 2. If your service does only request streaming and you expect a stream to be open longer than 60 seconds, you have to change the `grpc_send_timeout` and the `client_body_timeout`. 3. If you do both response and request streaming with an open stream longer than 60 seconds, you have to change all three timeouts: `grpc_read_timeout`, `grpc_send_timeout` and `client_body_timeout`. Values for the timeouts must be specified as e.g. `"1200s"`. -> On the most recent versions of nginx-ingress, changing these timeouts requires using the `nginx.ingress.kubernetes.io/server-snippet` annotation. There are plans for future releases to allow using the Kubernetes annotations to define each timeout seperately. +> On the most recent versions of nginx-ingress, changing these timeouts requires using the `nginx.ingress.kubernetes.io/server-snippet` annotation. There are plans for future releases to allow using the Kubernetes annotations to define each timeout separately. diff --git a/docs/user-guide/ingress-path-matching.md b/docs/user-guide/ingress-path-matching.md index 149ebfedd..092cf9264 100644 --- a/docs/user-guide/ingress-path-matching.md +++ b/docs/user-guide/ingress-path-matching.md @@ -116,7 +116,7 @@ The following request URI's would match the corresponding location blocks: ## Warning -The following example describes a case that may inflict unwanted path matching behaviour. +The following example describes a case that may inflict unwanted path matching behavior. This case is expected and a result of NGINX's a first match policy for paths that use the regular expression [location modifier](https://nginx.org/en/docs/http/ngx_http_core_module.html#location). For more information about how a path is chosen, please read the following article: ["Understanding Nginx Server and Location Block Selection Algorithms"](https://www.digitalocean.com/community/tutorials/understanding-nginx-server-and-location-block-selection-algorithms).