Add latest changes from gitlab-org/gitlab@master

8 files changed, 9 insertions, 9 deletions

diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md
index a87118a800a..3bc30c4c01c 100644
--- a/doc/administration/auth/ldap-ee.md
+++ b/doc/administration/auth/ldap-ee.md
@@ -4,7 +4,7 @@ type: reference
 
 # LDAP Additions in GitLab EE **(STARTER ONLY)**
 
-This section documents LDAP features specific to to GitLab Enterprise Edition
+This section documents LDAP features specific to GitLab Enterprise Edition
 [Starter](https://about.gitlab.com/pricing/#self-managed) and above.
 
 For documentation relevant to both Community Edition and Enterprise Edition,
diff --git a/doc/administration/auth/ldap-troubleshooting.md b/doc/administration/auth/ldap-troubleshooting.md
index b852140e80a..612f782e841 100644
--- a/doc/administration/auth/ldap-troubleshooting.md
+++ b/doc/administration/auth/ldap-troubleshooting.md
@@ -227,7 +227,7 @@ uid: John
 
 There's a lot here, so let's go over what could be helpful when debugging.
 
-First, GitLab will look for all users that have have previously
+First, GitLab will look for all users that have previously
 logged in with LDAP and iterate on them. Each user's sync will start with
 the following line that contains the user's username and email, as they
 exist in GitLab now:
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index 12a42ec0a1e..1e91b539db5 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -498,7 +498,7 @@ the configuration option `lowercase_usernames`. By default, this configuration o
 
 ## Disable LDAP web sign in
 
-It can be be useful to prevent using LDAP credentials through the web UI when
+It can be useful to prevent using LDAP credentials through the web UI when
 an alternative such as SAML is preferred. This allows LDAP to be used for group
 sync, while also allowing your SAML identity provider to handle additional
 checks like custom 2FA.
diff --git a/doc/administration/merge_request_diffs.md b/doc/administration/merge_request_diffs.md
index ca09171e5ff..fd1a425d6b1 100644
--- a/doc/administration/merge_request_diffs.md
+++ b/doc/administration/merge_request_diffs.md
@@ -25,7 +25,7 @@ To enable external storage of merge request diffs, follow the instructions below
    gitlab_rails['external_diffs_enabled'] = true
    ```
 
-1. _The external diffs will be stored in in
+1. _The external diffs will be stored in
    `/var/opt/gitlab/gitlab-rails/shared/external-diffs`._ To change the path,
    for example, to `/mnt/storage/external-diffs`, edit `/etc/gitlab/gitlab.rb`
    and add the following line:
diff --git a/doc/administration/scaling/index.md b/doc/administration/scaling/index.md
index 99e8ca9a65f..1ef9eca2497 100644
--- a/doc/administration/scaling/index.md
+++ b/doc/administration/scaling/index.md
@@ -21,7 +21,7 @@ part of a source installation and their configuration instructions for scaling.
 |-----------|-------------|----------------------------|
 | [PostgreSQL](../../development/architecture.md#postgresql) | Database | [PostgreSQL configuration](https://docs.gitlab.com/omnibus/settings/database.html) |
 | [Redis](../../development/architecture.md#redis)  | Key/value store for fast data lookup and caching | [Redis configuration](../high_availability/redis.md) |
-| [GitLab application services](../../development/architecture.md#unicorn) | Unicorn/Puma, Workhorse, GitLab Shell - serves front-end requests requests (UI, API, Git over HTTP/SSH) | [GitLab app scaling configuration](../high_availability/gitlab.md) |
+| [GitLab application services](../../development/architecture.md#unicorn) | Unicorn/Puma, Workhorse, GitLab Shell - serves front-end requests (UI, API, Git over HTTP/SSH) | [GitLab app scaling configuration](../high_availability/gitlab.md) |
 | [PgBouncer](../../development/architecture.md#pgbouncer) | Database connection pooler | [PgBouncer configuration](../high_availability/pgbouncer.md#running-pgbouncer-as-part-of-a-non-ha-gitlab-installation) **(PREMIUM ONLY)** |
 | [Sidekiq](../../development/architecture.md#sidekiq) | Asynchronous/background jobs | [Sidekiq configuration](../high_availability/sidekiq.md) |
 | [Gitaly](../../development/architecture.md#gitaly) | Provides access to Git repositories | [Gitaly configuration](../gitaly/index.md#running-gitaly-on-its-own-server) |
diff --git a/doc/administration/troubleshooting/debug.md b/doc/administration/troubleshooting/debug.md
index 295dab2be38..d0c1f3fa0ff 100644
--- a/doc/administration/troubleshooting/debug.md
+++ b/doc/administration/troubleshooting/debug.md
@@ -241,7 +241,7 @@ separate Rails process to debug the issue:
    app.get 'https://gitlab.com/gitlab-org/gitlab-foss/issues/1?private_token=123456'
    ```
 
-1. In a new window, run `top`. It should show this ruby process using 100% CPU. Write down the PID.
+1. In a new window, run `top`. It should show this Ruby process using 100% CPU. Write down the PID.
 1. Follow step 2 from the previous section on using gdb.
 
 ### GitLab: API is not accessible
@@ -275,4 +275,4 @@ The output in `/tmp/unicorn.txt` may help diagnose the root cause.
 ## More information
 
 - [Debugging Stuck Ruby Processes](https://blog.newrelic.com/engineering/debugging-stuck-ruby-processes-what-to-do-before-you-kill-9/)
-- [Cheatsheet of using gdb and ruby processes](gdb-stuck-ruby.txt)
+- [Cheatsheet of using gdb and Ruby processes](gdb-stuck-ruby.txt)
diff --git a/doc/administration/troubleshooting/postgresql.md b/doc/administration/troubleshooting/postgresql.md
index 966db356849..8e7727ee214 100644
--- a/doc/administration/troubleshooting/postgresql.md
+++ b/doc/administration/troubleshooting/postgresql.md
@@ -111,7 +111,7 @@ statement_timeout = 15s
 idle_in_transaction_session_timeout = 60s
 ```
 
-Quoting from from issue [#1](https://gitlab.com/gitlab-org/gitlab/issues/30528):
+Quoting from issue [#1](https://gitlab.com/gitlab-org/gitlab/issues/30528):
 
 > "If a deadlock is hit, and we resolve it through aborting the transaction after a short period, then the retry mechanisms we already have will make the deadlocked piece of work try again, and it's unlikely we'll deadlock multiple times in a row."
 
diff --git a/doc/administration/troubleshooting/ssl.md b/doc/administration/troubleshooting/ssl.md
index b66b6e8c90a..f230f047ded 100644
--- a/doc/administration/troubleshooting/ssl.md
+++ b/doc/administration/troubleshooting/ssl.md
@@ -50,7 +50,7 @@ If you have the problems listed above, add your certificate to `/etc/gitlab/trus
 
 Besides getting the errors mentioned in
 [Using an internal CA certificate with GitLab](ssl.md#using-an-internal-ca-certificate-with-gitlab),
-your CI pipelines may stuck stuck in `Pending` status. In the runner logs you may see the below error:
+your CI pipelines may get stuck in `Pending` status. In the runner logs you may see the below error:
 
 ```shell
 Dec  6 02:43:17 runner-host01 gitlab-runner[15131]: #033[0;33mWARNING: Checking for jobs... failed