diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 06:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-14 06:09:01 +0300 |
| commit | c60a1173018e93e6bf433f87cb726adc979d1c8a (patch) | |
| tree | 5231ab640b6b4914e4aee123dd2030a005216303 /doc/topics | |
| parent | e144369009f3404072f7e0f969f7cded93195a01 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/autodevops/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/web_application_firewall/index.md | 2 | ||||
| -rw-r--r-- | doc/topics/web_application_firewall/quick_start_guide.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index ad203b2a7cf..abd946e1f23 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -805,7 +805,7 @@ commands to be wrapped as follows: /bin/herokuish procfile exec $COMMAND ``` -This might be neccessary, for example, when: +This might be necessary, for example, when: - Attaching using `kubectl exec`. - Using GitLab's [Web Terminal](../../ci/environments.md#web-terminals). diff --git a/doc/topics/web_application_firewall/index.md b/doc/topics/web_application_firewall/index.md index db1265e08ac..6c847f12bba 100644 --- a/doc/topics/web_application_firewall/index.md +++ b/doc/topics/web_application_firewall/index.md @@ -55,7 +55,7 @@ you can configure a cluster on GKE. Once this is set up, you can follow the step NOTE: **Note** This guide shows how the WAF can be deployed using Auto DevOps. The WAF -is avaliable by default to all applications no matter how they are deployed, +is available by default to all applications no matter how they are deployed, as long as they are using Ingress. ## Network firewall vs. Web Application Firewall diff --git a/doc/topics/web_application_firewall/quick_start_guide.md b/doc/topics/web_application_firewall/quick_start_guide.md index 35003785753..e3cf0bcd498 100644 --- a/doc/topics/web_application_firewall/quick_start_guide.md +++ b/doc/topics/web_application_firewall/quick_start_guide.md @@ -12,7 +12,7 @@ need to ensure your own [Runners are configured](../../ci/runners/README.md) and [Google OAuth is enabled](../../integration/google.md). **Note**: GitLab's Web Application Firewall is deployed with [Ingress](../../user/clusters/applications.md#Ingress), -so it will be avaliable to your applications no matter how you deploy them to Kubernetes. +so it will be available to your applications no matter how you deploy them to Kubernetes. ## Enable or disable ModSecurity |