diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-01-19 18:44:23 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-01-19 18:44:23 +0000 |
| commit | 9fb5bd416dbb9e7890a2befaa4145c3c8dde2431 (patch) | |
| tree | 8837017470ee5f28642846a1cbd367fe3bf5b1f0 /doc/administration | |
| parent | 604c9133a75b235e3b537ad96dcf92ed6949ed65 (diff) | |
| parent | 0cbbb08e790260ad936810e0047e03938c001e9b (diff) | |
| download | gitlab-ce-9fb5bd416dbb9e7890a2befaa4145c3c8dde2431.tar.gz | |
Merge branch 'spelling' into 'master'
doc: Spelling fixes
See merge request gitlab-org/gitlab-ce!16575
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/auth/okta.md | 2 | ||||
| -rw-r--r-- | doc/administration/container_registry.md | 2 | ||||
| -rw-r--r-- | doc/administration/high_availability/redis.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/auth/okta.md b/doc/administration/auth/okta.md index cb42b7743c5..664657650d4 100644 --- a/doc/administration/auth/okta.md +++ b/doc/administration/auth/okta.md @@ -144,7 +144,7 @@ Now that the Okta app is configured, it's time to enable it in GitLab. 1. [Reconfigure][reconf] or [restart] GitLab for Omnibus and installations from source respectively for the changes to take effect. -You might want to try this out on a incognito browser window. +You might want to try this out on an incognito browser window. ## Configuring groups diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md index 57e54815b68..2441ff85783 100644 --- a/doc/administration/container_registry.md +++ b/doc/administration/container_registry.md @@ -483,7 +483,7 @@ You can use GitLab as an auth endpoint and use a non-bundled Container Registry. 1. A certificate keypair is required for GitLab and the Container Registry to communicate securely. By default omnibus-gitlab will generate one keypair, which is saved to `/var/opt/gitlab/gitlab-rails/etc/gitlab-registry.key`. - When using an non-bundled Container Registry, you will need to supply a + When using a non-bundled Container Registry, you will need to supply a custom certificate key. To do that, add the following to `/etc/gitlab/gitlab.rb` diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md index 0e92f7c5a34..fd2677996b1 100644 --- a/doc/administration/high_availability/redis.md +++ b/doc/administration/high_availability/redis.md @@ -154,7 +154,7 @@ who will take all the decisions to restore the service availability by: - Reconfigure the old **Master** and demote to **Slave** when it comes back online You must have at least `3` Redis Sentinel servers, and they need to -be each in a independent machine (that are believed to fail independently), +be each in an independent machine (that are believed to fail independently), ideally in different geographical areas. You can configure them in the same machines where you've configured the other |