Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 18 deletions

diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md
index 62b515f1a3f..a87118a800a 100644
--- a/doc/administration/auth/ldap-ee.md
+++ b/doc/administration/auth/ldap-ee.md
@@ -48,7 +48,7 @@ The process will execute the following access checks:
 NOTE: **Note:**
 In Active Directory, a user is marked as disabled/blocked if the user
 account control attribute (`userAccountControl:1.2.840.113556.1.4.803`)
-has bit 2 set. See <https://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/>
+has bit 2 set. See <https://ctovswild.com/2009/09/03/bitmask-searches-in-ldap/>
 for more information.
 
 The user will be set to `ldap_blocked` state in GitLab if the above conditions
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index 32062d0767e..0a0e193658e 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -256,9 +256,9 @@ application server, or a Gitaly node.
 
    ```ruby
    # Name of storage hash must match storage name in git_data_dirs on GitLab
-   # server ('storage_1') and in git_data_dirs on Gitaly nodes ('gitaly-1')
+   # server ('praefect') and in git_data_dirs on Gitaly nodes ('gitaly-1')
    praefect['virtual_storages'] = {
-     'storage_1' => {
+     'praefect' => {
        'gitaly-1' => {
          'address' => 'tcp://GITALY_HOST:8075',
          'token'   => 'PRAEFECT_INTERNAL_TOKEN',
diff --git a/doc/administration/operations/extra_sidekiq_processes.md b/doc/administration/operations/extra_sidekiq_processes.md
index e317297c854..1c92a429982 100644
--- a/doc/administration/operations/extra_sidekiq_processes.md
+++ b/doc/administration/operations/extra_sidekiq_processes.md
@@ -228,20 +228,8 @@ When disabling `sidekiq_cluster`, you must copy your configuration for
 `sidekiq_cluster` will be overridden by the options for `sidekiq` when
 setting `sidekiq['cluster'] = true`.
 
-When using this feature, replace the `sidekiq` service with the
-`sidekiq-cluster`service for `gitlab-ctl` commands.
-
-For example, instead of:
-
-```shell
-sudo gitlab-ctl restart sidekiq
-```
-
-Use:
-
-```shell
-sudo gitlab-ctl restart sidekiq-cluster
-```
+When using this feature, the service called `sidekiq` will now be
+running `sidekiq-cluster`.
 
 The [concurrency](#managing-concurrency) and other options configured
 for Sidekiq will be respected.
diff --git a/doc/administration/troubleshooting/log_parsing.md b/doc/administration/troubleshooting/log_parsing.md
index b882595ea4a..0413e5ce953 100644
--- a/doc/administration/troubleshooting/log_parsing.md
+++ b/doc/administration/troubleshooting/log_parsing.md
@@ -7,7 +7,7 @@ but if they are not available you can still quickly parse
 
 ## What is JQ?
 
-As noted in its [manual](https://stedolan.github.io/jq/manual), jq is a command-line JSON processor. The following examples
+As noted in its [manual](https://stedolan.github.io/jq/manual/), jq is a command-line JSON processor. The following examples
 include use cases targeted for parsing GitLab log files.
 
 ## Parsing Logs