Add latest changes from gitlab-org/gitlab@master

12 files changed, 22 insertions, 22 deletions

diff --git a/doc/user/admin_area/merge_requests_approvals.md b/doc/user/admin_area/merge_requests_approvals.md
index 4138dc27066..0c7beadad48 100644
--- a/doc/user/admin_area/merge_requests_approvals.md
+++ b/doc/user/admin_area/merge_requests_approvals.md
@@ -23,11 +23,11 @@ GitLab administrators can later override these settings in a project’s setting
 
 Merge request approval rules that can be set at an instance level are:
 
-- **Prevent approval of merge requests by merge request author**. Prevents non-admins
-  from allowing merge request authors to merge their own merge requests in individual
-  projects.
-- **Prevent approval of merge requests by merge request committers**. Prevents
-  non-admins from allowing merge request committers to merge merge requests they were
-  committing to in individual projects.
-- **Prevent users from modifying merge request approvers list**. Prevents non-admins
-  from modifying approvers list in project settings and in individual merge requests.
+- **Prevent approval of merge requests by merge request author**. Prevents project
+  maintainers from allowing request authors to merge their own merge requests.
+- **Prevent approval of merge requests by merge request committers**. Prevents project
+  maintainers from allowing users to approve merge requests if they have submitted
+  any commits to the source branch.
+- **Prevent users from modifying merge request approvers list**. Prevents project
+  maintainers from allowing users to modify the approvers list in project settings
+  or in individual merge requests.
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index f2b7c30b5cc..c65d6adcff6 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -495,7 +495,7 @@ The DAST job can emit various reports.
 CAUTION: **Caution:**
 The JSON report artifacts are not a public API of DAST and their format is expected to change in the future.
 
-The DAST tool always emits a JSON report report file called `gl-dast-report.json` and sample reports can be found in the [DAST repository](https://gitlab.com/gitlab-org/security-products/dast/-/tree/master/test/end-to-end/expect).
+The DAST tool always emits a JSON report file called `gl-dast-report.json` and sample reports can be found in the [DAST repository](https://gitlab.com/gitlab-org/security-products/dast/-/tree/master/test/end-to-end/expect).
 
 There are two formats of data in the JSON report that are used side by side: the proprietary ZAP format which will be eventually deprecated, and a "common" format which will be the default in the future.
 
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 252abc9295f..9cd2e9d4e62 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -352,7 +352,7 @@ analyzer containers: `DOCKER_`, `CI`, `GITLAB_`, `FF_`, `HOME`, `PWD`, `OLDPWD`,
 CAUTION: **Caution:**
 The JSON report artifacts are not a public API of SAST and their format may change in the future.
 
-The SAST tool emits a JSON report report file. Here is an example of the report structure with all important parts of
+The SAST tool emits a JSON report file. Here is an example of the report structure with all important parts of
 it highlighted:
 
 ```json-doc
diff --git a/doc/user/clusters/management_project.md b/doc/user/clusters/management_project.md
index f5be8a3f5f3..2b8ed83bdb2 100644
--- a/doc/user/clusters/management_project.md
+++ b/doc/user/clusters/management_project.md
@@ -27,7 +27,7 @@ Management projects are restricted to the following:
 - For project-level clusters, the management project must be in the same
   namespace (or descendants) as the cluster's project.
 - For group-level clusters, the management project must be in the same
-  group (or descendants) as as the cluster's group.
+  group (or descendants) as the cluster's group.
 - For instance-level clusters, there are no such restrictions.
 
 ## Usage
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index 7621679c6cc..308a7b2cb4a 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -281,7 +281,7 @@ GitLab [isn't limited to the SAML providers listed above](#my-identity-provider-
 | Additional URLs | | You may need to use the `Identifier` or `Assertion consumer service URL` in other fields on some providers. |
 | Single Sign Out URL | | Not supported |
 
-If the information information you need isn't listed above you may wish to check our [troubleshooting docs below](#i-need-additional-information-to-configure-my-identity-provider).
+If the information you need isn't listed above you may wish to check our [troubleshooting docs below](#i-need-additional-information-to-configure-my-identity-provider).
 
 ## Linking SAML to your existing GitLab.com account
 
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index 7b97933aa89..e66b3d1ac63 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -244,7 +244,7 @@ Registry.
 
 ## Installing a package
 
-NPM packages are commonly installed using the the `npm` or `yarn` commands
+NPM packages are commonly installed using the `npm` or `yarn` commands
 inside a JavaScript project. If you haven't already, you will need to set the
 URL for scoped packages. You can do this with the following command:
 
diff --git a/doc/user/profile/notifications.md b/doc/user/profile/notifications.md
index 3f843bf8b5e..1d92f15552d 100644
--- a/doc/user/profile/notifications.md
+++ b/doc/user/profile/notifications.md
@@ -222,7 +222,7 @@ The following table lists all GitLab-specific email headers:
 
 ### X-GitLab-NotificationReason
 
-The `X-GitLab-NotificationReason` header contains the reason for the notification. The value is one of the the following, in order of priority:
+The `X-GitLab-NotificationReason` header contains the reason for the notification. The value is one of the following, in order of priority:
 
 - `own_activity`
 - `assigned`
diff --git a/doc/user/project/clusters/add_eks_clusters.md b/doc/user/project/clusters/add_eks_clusters.md
index 82b3cb49075..7fa8ec6c5f3 100644
--- a/doc/user/project/clusters/add_eks_clusters.md
+++ b/doc/user/project/clusters/add_eks_clusters.md
@@ -245,7 +245,7 @@ To add an existing EKS cluster to your project, group, or instance:
          token:      <authentication_token>
          ```
 
-   1. Locate the the API server endpoint so GitLab can connect to the cluster. This is displayed on
+   1. Locate the API server endpoint so GitLab can connect to the cluster. This is displayed on
       the AWS EKS console, when viewing the EKS cluster details.
 1. Navigate to your:
    - Project's **{cloud-gear}** **Operations > Kubernetes** page, for a project-level cluster.
diff --git a/doc/user/project/highlighting.md b/doc/user/project/highlighting.md
index 85992e1301f..2bdb0ae2706 100644
--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -10,7 +10,7 @@ If GitLab is guessing wrong, you can override its choice of language using the `
 
 When you check in and push that change, all `*.pl` files in your project will be highlighted as Prolog.
 
-The paths here are simply Git's built-in [`.gitattributes` interface](https://git-scm.com/docs/gitattributes). So, if you were to invent a file format called a `Nicefile` at the root of your project that used ruby syntax, all you need is:
+The paths here are simply Git's built-in [`.gitattributes` interface](https://git-scm.com/docs/gitattributes). So, if you were to invent a file format called a `Nicefile` at the root of your project that used Ruby syntax, all you need is:
 
 ``` conf
 /Nicefile gitlab-language=ruby
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index bbed9ae4686..273ab9095c0 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -397,7 +397,7 @@ Starting in [version 12.8](https://gitlab.com/gitlab-org/gitlab/issues/202696),
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/16530) in GitLab 12.5.
 
-To add an anomaly chart panel type to a dashboard, add add a panel with *exactly* 3 metrics.
+To add an anomaly chart panel type to a dashboard, add a panel with *exactly* 3 metrics.
 
 The first metric represents the current state, and the second and third metrics represent the upper and lower limit respectively:
 
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index e8c691a3d7f..d8a2b427288 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -28,7 +28,7 @@ button and start a merge request from there.
 ## New Merge Request page
 
 On the **New Merge Request** page, start by filling in the title
-and description for the merge request. If there are are already
+and description for the merge request. If there are already
 commits on the branch, the title will be prefilled with the first
 line of the first commit message, and the description will be
 prefilled with any additional lines in the commit message.
diff --git a/doc/user/project/operations/feature_flags.md b/doc/user/project/operations/feature_flags.md
index 86d8e829648..f13fbcb2722 100644
--- a/doc/user/project/operations/feature_flags.md
+++ b/doc/user/project/operations/feature_flags.md
@@ -175,10 +175,10 @@ a number of community contributed libraries.
 
 Official clients:
 
-- [unleash/unleash-client-java](https://github.com/unleash/unleash-client-java)
-- [unleash/unleash-client-node](https://github.com/unleash/unleash-client-node)
-- [unleash/unleash-client-go](https://github.com/unleash/unleash-client-go)
-- [unleash/unleash-client-ruby](https://github.com/unleash/unleash-client-ruby)
+- [Unleash client SDK for Java](https://github.com/unleash/unleash-client-java)
+- [Unleash client SDK for Node.js](https://github.com/unleash/unleash-client-node)
+- [Unleash client for Go](https://github.com/unleash/unleash-client-go)
+- [Unleash client for Ruby](https://github.com/unleash/unleash-client-ruby)
 
 Community contributed clients: