diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 03:07:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 03:07:43 +0000 |
| commit | dddde902acfa6acfb11583c61faa67cc7c8d11b6 (patch) | |
| tree | 2e9fdf963c84f82995d62d0c55f91168cff3ec47 /doc/administration | |
| parent | 101c30f4dffc624af3cbe3f12edc2cfee570a5f3 (diff) | |
| download | gitlab-ce-dddde902acfa6acfb11583c61faa67cc7c8d11b6.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/gitaly/praefect.md | 2 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/linux_cheat_sheet.md | 2 | ||||
| -rw-r--r-- | doc/administration/troubleshooting/ssl.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md index 2c9e1bc3cdf..b010a6425c8 100644 --- a/doc/administration/gitaly/praefect.md +++ b/doc/administration/gitaly/praefect.md @@ -631,7 +631,7 @@ and replication jobs will be created to replicate repository data to `internal_s #### Automatic failover When automatic failover is enabled, Praefect will do automatic detection of the health of internal Gitaly nodes. If the -primary has a certain amount of healthchecks fail, it will decide to promote one of the secondaries to be primary, and +primary has a certain amount of health checks fail, it will decide to promote one of the secondaries to be primary, and demote the primary to be a secondary. 1. To enable automatic failover, edit `/etc/gitlab/gitlab.rb`: diff --git a/doc/administration/troubleshooting/linux_cheat_sheet.md b/doc/administration/troubleshooting/linux_cheat_sheet.md index d53745c58b3..a03b8d1868e 100644 --- a/doc/administration/troubleshooting/linux_cheat_sheet.md +++ b/doc/administration/troubleshooting/linux_cheat_sheet.md @@ -215,7 +215,7 @@ Top 25 PIDs ``` Based on the summary, you can then view the details of syscalls made by one or more -procsses using the `-p`/`--pid` for a specific process, or `-s`/`--stats` flags for +processes using the `-p`/`--pid` for a specific process, or `-s`/`--stats` flags for a sorted list. `--stats` takes the same sorting and count options as summary. ```shell diff --git a/doc/administration/troubleshooting/ssl.md b/doc/administration/troubleshooting/ssl.md index ea17116d422..9474126e5c8 100644 --- a/doc/administration/troubleshooting/ssl.md +++ b/doc/administration/troubleshooting/ssl.md @@ -7,7 +7,7 @@ type: reference This page contains a list of common SSL-related errors and scenarios that you may face while working with GitLab. It should serve as an addition to the main SSL docs available here: -- [Omniibus SSL Configuration](https://docs.gitlab.com/omnibus/settings/ssl.html) +- [Omnibus SSL Configuration](https://docs.gitlab.com/omnibus/settings/ssl.html) - [Self-signed certificates or custom Certification Authorities for GitLab Runner](https://docs.gitlab.com/runner/configuration/tls-self-signed.html) - [Manually configuring HTTPS](https://docs.gitlab.com/omnibus/settings/nginx.html#manually-configuring-https) |