Add latest changes from gitlab-org/gitlab@master

16 files changed, 75 insertions, 34 deletions

diff --git a/doc/administration/auth/index.md b/doc/administration/auth/index.md
index 3c4b695fb67..2b978dd1f2c 100644
--- a/doc/administration/auth/index.md
+++ b/doc/administration/auth/index.md
@@ -27,10 +27,10 @@ For more information, see the links shown on this page for each external provide
 
 | Capability                                      | SaaS                                    | Self-managed                       |
 |-------------------------------------------------|-----------------------------------------|------------------------------------|
-| **User Provisioning**                           | SCIM<br>SAML <sup>1</sup> | LDAP <sup>1</sup><br>SAML <sup>1</sup><br>[OmniAuth Providers](../../integration/omniauth.md#supported-providers) <sup>1</sup> |
+| **User Provisioning**                           | SCIM<br>SAML <sup>1</sup> | LDAP <sup>1</sup><br>SAML <sup>1</sup><br>[OmniAuth Providers](../../integration/omniauth.md#supported-providers) <sup>1</sup><br>SCIM  |
 | **User Detail Updating** (not group management) | Not Available                           | LDAP Sync                          |
 | **Authentication**                              | SAML at top-level group (1 provider)    | LDAP (multiple providers)<br>Generic OAuth 2.0<br>SAML (only 1 permitted per unique provider)<br>Kerberos<br>JWT<br>Smartcard<br>[OmniAuth Providers](../../integration/omniauth.md#supported-providers) (only 1 permitted per unique provider) |
 | **Provider-to-GitLab Role Sync**                | SAML Group Sync                         | LDAP Group Sync<br>SAML Group Sync ([GitLab 15.1](https://gitlab.com/gitlab-org/gitlab/-/issues/285150) and later) |
-| **User Removal**                                | SCIM (remove user from top-level group) | LDAP (remove user from groups and block from the instance) |
+| **User Removal**                                | SCIM (remove user from top-level group) | LDAP (remove user from groups and block from the instance)<br>SCIM |
 
 1. Using Just-In-Time (JIT) provisioning, user accounts are created when the user first signs in.
diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index bf9a7be8b1f..46d146ac577 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -147,6 +147,20 @@ http://secondary.example.com/
                 Last status report was: 1 minute ago
 ```
 
+There are up to three statuses for each item. For example, for `Repositories`, you see the following lines:
+
+```plaintext
+  Repositories: succeeded 12345 / total 12345 (100%)
+  Verified Repositories: succeeded 12345 / total 12345 (100%)
+  Repositories Checked: failed 5 / succeeded 0 / total 5 (0%)
+```
+
+The 3 status items are defined as follows:
+
+- The `Repositories` output shows how many repositories are synced from the primary to the secondary.
+- The `Verified Repositories` output shows how many repositories on this secondary have a matching repository checksum with the Primary.
+- The `Repositories Checked` output shows how many repositories have passed a local Git repository check (`git fsck`) on the secondary.
+
 To find more details about failed items, check
 [the `gitlab-rails/geo.log` file](../../logs/log_parsing.md#find-most-common-geo-sync-errors)
 
diff --git a/doc/administration/gitaly/troubleshooting.md b/doc/administration/gitaly/troubleshooting.md
index 4b8ed74ec62..df189f97941 100644
--- a/doc/administration/gitaly/troubleshooting.md
+++ b/doc/administration/gitaly/troubleshooting.md
@@ -703,7 +703,7 @@ Possible solutions:
 
 ## Profiling Gitaly
 
-Gitaly exposes several of Golang's built-in performance profiling tools on the Prometheus listen port. For example, if Prometheus is listening
+Gitaly exposes several of the Golang built-in performance profiling tools on the Prometheus listen port. For example, if Prometheus is listening
 on port `9236` of the GitLab server:
 
 - Get a list of running `goroutines` and their backtraces:
@@ -724,7 +724,7 @@ on port `9236` of the GitLab server:
   curl --output heap.bin "http://<gitaly_server>:9236/debug/pprof/heap"
   ```
 
-- Record a 5 second execution trace. This will impact Gitaly's performance while running:
+- Record a 5 second execution trace. This impacts the Gitaly performance while running:
 
   ```shell
   curl --output trace.bin "http://<gitaly_server>:9236/debug/pprof/trace?seconds=5"
diff --git a/doc/development/api_graphql_styleguide.md b/doc/development/api_graphql_styleguide.md
index 396bba2623e..6e5487c827f 100644
--- a/doc/development/api_graphql_styleguide.md
+++ b/doc/development/api_graphql_styleguide.md
@@ -951,13 +951,25 @@ You can view descriptions of fields and arguments in:
 
 #### Language and punctuation
 
-Use `{x} of the {y}` where possible, where `{x}` is the item you're describing,
-and `{y}` is the resource it applies to. For example:
+To describe fields and arguments, use `{x} of the {y}` where possible,
+where `{x}` is the item you're describing, and `{y}` is the resource it applies to. For example:
 
 ```plaintext
 ID of the issue.
 ```
 
+```plaintext
+Author of the epics.
+```
+
+For arguments that sort or search, start with the appropriate verb.
+To indicate the specified values, for conciseness, you can use `this` instead of
+`the given` or `the specified`. For example:
+
+```plaintext
+Sort issues by this criteria.
+```
+
 Do not start descriptions with `The` or `A`, for consistency and conciseness.
 
 End all descriptions with a period (`.`).
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 05db439ffcd..99ba05925a5 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -51,10 +51,25 @@ Known issues are gathered from within GitLab and from customer reported issues.
 
 See the [GitLab AWS known issues list](https://gitlab.com/gitlab-com/alliances/aws/public-tracker/-/issues?label_name%5B%5D=AWS+Known+Issue) for a complete list.
 
-## Official GitLab releases as AMIs
+## Provision a single GitLab instance on AWS
+
+If you want to provision a single GitLab instance on AWS, you have two options:
+
+- The marketplace subscription
+- The official GitLab AMIs
+
+### Marketplace subscription
+
+GitLab provides a 5 user subscription as an AWS Marketplace subscription to help teams of all sizes to get started with an Ultimate licensed instance in record time. The Marketplace subscription can be easily upgraded to any GitLab licensing via an AWS Marketplace Private Offer, with the convenience of continued AWS billing. No migration is necessary to obtain a larger, non-time based license from GitLab. Per-minute licensing is automatically removed when you accept the private offer.
+
+For a tutorial on provisioning a GitLab Instance via a Marketplace Subscription, [use this tutorial](https://gitlab.awsworkshop.io/040_partner_setup.html). The tutorial links to the [GitLab Ultimate Marketplace Listing](https://aws.amazon.com/marketplace/pp/prodview-g6ktjmpuc33zk), but you can also use the [GitLab Premium Marketplace Listing](https://aws.amazon.com/marketplace/pp/prodview-amk6tacbois2k) to provision an instance.
+
+### Official GitLab releases as AMIs
 
 GitLab produces Amazon Machine Images (AMI) during the regular release process. The AMIs can be used for single instance GitLab installation or, by configuring `/etc/gitlab/gitlab.rb`, can be specialized for specific GitLab service roles (for example a Gitaly server). Older releases remain available and can be used to migrate an older GitLab server to AWS.
 
+Initial licensing can either be the Free Enterprise License (EE) or the open source Community Edition (CE). The Enterprise Edition provides the easiest path forward to a licensed version if the need arises.
+
 Currently the Amazon AMI uses the Amazon prepared Ubuntu AMI (x86 and ARM are available) as its starting point.
 
 NOTE:
diff --git a/doc/user/application_security/offline_deployments/index.md b/doc/user/application_security/offline_deployments/index.md
index 6976956758d..5a075bf731b 100644
--- a/doc/user/application_security/offline_deployments/index.md
+++ b/doc/user/application_security/offline_deployments/index.md
@@ -234,6 +234,6 @@ Once these steps are complete, GitLab has local copies of the Secure analyzers a
 them instead of an Internet-hosted container image. This allows you to run Secure in AutoDevOps in
 an offline environment.
 
-Note that these steps are specific to GitLab Secure with AutoDevOps. Using other stages with
+These steps are specific to GitLab Secure with AutoDevOps. Using other stages with
 AutoDevOps may require other steps covered in the
 [Auto DevOps documentation](../../../topics/autodevops/index.md).
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index c4352f45704..1f089c6110f 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -146,7 +146,7 @@ the repository. For details on the Solution format, see the Microsoft reference
 
 > Introduced in GitLab 14.2.
 
-Vulnerabilities that have been detected and are false positives will be flagged as false positives in the security dashboard.
+Vulnerabilities that have been detected and are false positives are flagged as false positives in the security dashboard.
 
 False positive detection is available in a subset of the [supported languages](#supported-languages-and-frameworks) and [analyzers](analyzers.md):
 
@@ -350,13 +350,13 @@ To override the automatic update behavior, set the `SAST_ANALYZER_IMAGE_TAG` CI/
 in your CI/CD configuration file after you include the [`SAST.gitlab-ci.yml` template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/SAST.gitlab-ci.yml).
 
 Only set this variable within a specific job.
-If you set it [at the top level](../../../ci/variables/index.md#define-a-cicd-variable-in-the-gitlab-ciyml-file), the version you set will be used for other SAST analyzers.
+If you set it [at the top level](../../../ci/variables/index.md#define-a-cicd-variable-in-the-gitlab-ciyml-file), the version you set is used for other SAST analyzers.
 
 You can set the tag to:
 
-- A major version, like `3`. Your pipelines will use any minor or patch updates that are released within this major version.
-- A minor version, like `3.7`. Your pipelines will use any patch updates that are released within this minor version.
-- A patch version, like `3.7.0`. Your pipelines won't receive any updates.
+- A major version, like `3`. Your pipelines use any minor or patch updates that are released within this major version.
+- A minor version, like `3.7`. Your pipelines use any patch updates that are released within this minor version.
+- A patch version, like `3.7.0`. Your pipelines don't receive any updates.
 
 This example uses a specific minor version of the `semgrep` analyzer and a specific patch version of the `brakeman` analyzer:
 
@@ -552,7 +552,7 @@ Some analyzers make it possible to filter out vulnerabilities under a given thre
 
 | CI/CD variable               | Default value            | Description                                                                                                                                                                                                                 |
 |------------------------------|--------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `SAST_EXCLUDED_PATHS`        | `spec, test, tests, tmp` | Exclude vulnerabilities from output based on the paths. This is a comma-separated list of patterns. Patterns can be globs (see [`doublestar.Match`](https://pkg.go.dev/github.com/bmatcuk/doublestar/v4@v4.0.2#Match) for supported patterns), or file or folder paths (for example, `doc,spec`). Parent directories also match patterns. You might need to exclude temporary directories used by your build tool as these can generate false positives. To exclude paths, copy and paste the default excluded paths, then **add** your own paths to be excluded. If you don't specify the default excluded paths, you will override the defaults and _only_ paths you specify will be excluded from the SAST scans. |
+| `SAST_EXCLUDED_PATHS`        | `spec, test, tests, tmp` | Exclude vulnerabilities from output based on the paths. This is a comma-separated list of patterns. Patterns can be globs (see [`doublestar.Match`](https://pkg.go.dev/github.com/bmatcuk/doublestar/v4@v4.0.2#Match) for supported patterns), or file or folder paths (for example, `doc,spec`). Parent directories also match patterns. You might need to exclude temporary directories used by your build tool as these can generate false positives. To exclude paths, copy and paste the default excluded paths, then **add** your own paths to be excluded. If you don't specify the default excluded paths, you override the defaults and _only_ paths you specify are excluded from the SAST scans. |
 | `SEARCH_MAX_DEPTH`           | 4                        | SAST searches the repository to detect the programming languages used, and selects the matching analyzers. Set the value of `SEARCH_MAX_DEPTH` to specify how many directory levels the search phase should span. After the analyzers have been selected, the _entire_ repository is analyzed. |
 | `SAST_BANDIT_EXCLUDED_PATHS` |                          | Comma-separated list of paths to exclude from scan. Uses Python's [`fnmatch` syntax](https://docs.python.org/2/library/fnmatch.html); For example: `'*/tests/*, */venv/*'`. [Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/352554) in GitLab 15.4. |
 | `SAST_BRAKEMAN_LEVEL`        | 1                        | Ignore Brakeman vulnerabilities under given confidence level. Integer, 1=Low 3=High.                                                                                                                                        |
diff --git a/doc/user/application_security/vulnerability_report/index.md b/doc/user/application_security/vulnerability_report/index.md
index dd919889b4d..cd40e0983d2 100644
--- a/doc/user/application_security/vulnerability_report/index.md
+++ b/doc/user/application_security/vulnerability_report/index.md
@@ -199,7 +199,7 @@ To sort vulnerabilities by the date each vulnerability was detected, select the
 > - [Added](https://gitlab.com/gitlab-org/gitlab/-/issues/213013) to the group-level Vulnerability Report in GitLab 13.1.
 
 You can export details of the vulnerabilities listed in the Vulnerability Report. The export format
-is CSV (comma separated values). Note that all vulnerabilities are included because filters do not
+is CSV (comma separated values). All vulnerabilities are included because filters do not
 apply to the export.
 
 Fields included are:
@@ -263,7 +263,7 @@ To add a new vulnerability finding from your project level Vulnerability Report
 1. Select **Submit vulnerability**.
 1. Complete the fields and submit the form.
 
-You will be brought to the newly created vulnerability's detail page. Manually created records appear in the
+You are brought to the newly created vulnerability's detail page. Manually created records appear in the
 Group, Project, and Security Center Vulnerability Reports. To filter them, use the Generic Tool filter.
 
 ## Operational vulnerabilities
diff --git a/doc/user/application_security/vulnerability_report/pipeline.md b/doc/user/application_security/vulnerability_report/pipeline.md
index 57c18cb045e..4718b43a0a9 100644
--- a/doc/user/application_security/vulnerability_report/pipeline.md
+++ b/doc/user/application_security/vulnerability_report/pipeline.md
@@ -38,7 +38,7 @@ Before GitLab displays results, the vulnerability findings in all pipeline repor
 GitLab displays one row of information for each [scan type](../terminology/index.md#scan-type-report-type) artifact present in
 the pipeline.
 
-Note that each scan type's total number of vulnerabilities includes dismissed findings. If the number of findings
+Each scan type's total number of vulnerabilities includes dismissed findings. If the number of findings
 in the report doesn't match the number in **Scan details**, ensure that **Hide dismissed** is disabled.
 
 ### Download security scan outputs
@@ -77,7 +77,7 @@ incorporated once the pipeline finishes.
 | Confirmed                     | No                     | Confirmed                |
 | Needs triage (Detected)       | No                     | Needs triage (Detected)  |
 | Resolved                      | No                     | Needs triage (Detected)  |
-| N/A (i.e.: new vulnerability) | No                     | Needs triage (Detected)  |
+| N/A (That is: new vulnerability) | No                     | Needs triage (Detected)  |
 
 ## Retention period for vulnerabilities
 
diff --git a/doc/user/clusters/agent/work_with_agent.md b/doc/user/clusters/agent/work_with_agent.md
index 566eae8e24e..28a0d366ec5 100644
--- a/doc/user/clusters/agent/work_with_agent.md
+++ b/doc/user/clusters/agent/work_with_agent.md
@@ -76,7 +76,7 @@ observability:
     grpc_level: warn
 ```
 
-When `grpc_level` is set to `info` or below, there will be a lot of gRPC logs.
+When `grpc_level` is set to `info` or below, there are a lot of gRPC logs.
 
 Commit the configuration changes and inspect the agent service logs:
 
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index 09c910cf3a8..b0052be3f4e 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -301,7 +301,7 @@ The list of GitLab.com specific settings (and their defaults) is as follows:
 | `autovacuum_vacuum_scale_factor`      | 0.01                                                                | 0.02                                  |
 | `checkpoint_completion_target`        | 0.7                                                                 | 0.9                                   |
 | `checkpoint_segments`                 | 32                                                                  | 10                                    |
-| `effective_cache_size`                | 338688MB                                                            | Based on how much memory is available |
+| `effective_cache_size`                | 338688 MB                                                           | Based on how much memory is available |
 | `hot_standby`                         | on                                                                  | off                                   |
 | `hot_standby_feedback`                | on                                                                  | off                                   |
 | `log_autovacuum_min_duration`         | 0                                                                   | -1                                    |
@@ -309,19 +309,19 @@ The list of GitLab.com specific settings (and their defaults) is as follows:
 | `log_line_prefix`                     | `%t [%p]: [%l-1]`                                                   | empty                                 |
 | `log_min_duration_statement`          | 1000                                                                | -1                                    |
 | `log_temp_files`                      | 0                                                                   | -1                                    |
-| `maintenance_work_mem`                | 2048MB                                                              | 16 MB                                 |
+| `maintenance_work_mem`                | 2048 MB                                                             | 16 MB                                 |
 | `max_replication_slots`               | 5                                                                   | 0                                     |
 | `max_wal_senders`                     | 32                                                                  | 0                                     |
-| `max_wal_size`                        | 5GB                                                                 | 1GB                                   |
-| `shared_buffers`                      | 112896MB                                                            | Based on how much memory is available |
+| `max_wal_size`                        | 5 GB                                                                | 1 GB                                  |
+| `shared_buffers`                      | 112896 MB                                                           | Based on how much memory is available |
 | `shared_preload_libraries`            | `pg_stat_statements`                                                | empty                                 |
 | `shmall`                              | 30146560                                                            | Based on the server's capabilities    |
 | `shmmax`                              | 123480309760                                                        | Based on the server's capabilities    |
-| `wal_buffers`                         | 16MB                                                                | -1                                    |
+| `wal_buffers`                         | 16 MB                                                               | -1                                    |
 | `wal_keep_segments`                   | 512                                                                 | 10                                    |
 | `wal_level`                           | replica                                                             | minimal                               |
-| `statement_timeout`                   | 15s                                                                 | 60s                                   |
-| `idle_in_transaction_session_timeout` | 60s                                                                 | 60s                                   |
+| `statement_timeout`                   | 15 s                                                                | 60 s                                  |
+| `idle_in_transaction_session_timeout` | 60 s                                                                | 60 s                                  |
 
 Some of these settings are in the process being adjusted. For example, the value
 for `shared_buffers` is quite high, and we are
diff --git a/doc/user/group/access_and_permissions.md b/doc/user/group/access_and_permissions.md
index 4629f33f088..4aecf016e56 100644
--- a/doc/user/group/access_and_permissions.md
+++ b/doc/user/group/access_and_permissions.md
@@ -205,7 +205,7 @@ By default, projects in a group can be forked.
 Optionally, on [GitLab Premium](https://about.gitlab.com/pricing/) or higher tiers,
 you can prevent the projects in a group from being forked outside of the current top-level group.
 
-This setting will be removed from the SAML setting page, and migrated to the
+This setting is removed from the SAML setting page, and migrated to the
 group settings page. In the interim period, both of these settings are taken into consideration.
 If even one is set to `true`, then the group does not allow outside forks.
 
@@ -296,7 +296,7 @@ Now you can edit the user's permissions from the **Members** page.
 
 ### Verify if access is blocked by IP restriction
 
-If a user sees a 404 when they would normally expect access, and the problem is limited to a specific group, search the `auth.log` rails log for one or more of the following:
+If a user sees a 404 when they would usually expect access, and the problem is limited to a specific group, search the `auth.log` rails log for one or more of the following:
 
 - `json.message`: `'Attempting to access IP restricted group'`
 - `json.allowed`: `false`
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 6bbcb23bf2c..61cfe307e65 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -330,7 +330,7 @@ This table shows granted privileges for jobs triggered by specific types of user
 | Push source and LFS                          |                 |           |            |               |
 
 1. Only if the triggering user is not an external one.
-1. Only if the triggering user is a member of the project. See also [Usage of private Docker images with `if-not-present` pull policy](http://docs.gitlabl.com/runner/security/index.html#usage-of-private-docker-images-with-if-not-present-pull-policy).
+1. Only if the triggering user is a member of the project. See also [Usage of private Docker images with `if-not-present` pull policy](http://docs.gitlab.com/runner/security/index.html#usage-of-private-docker-images-with-if-not-present-pull-policy).
 
 ## Group members permissions
 
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index 9f1eb8a8141..b76b99b5242 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -297,7 +297,7 @@ If you regenerate 2FA recovery codes, save them. You can't use any previously cr
 
 ## Sign in with two-factor authentication enabled
 
-Signing in with 2FA enabled is only slightly different than the normal sign-in process. Enter your username and password
+Signing in with 2FA enabled is only slightly different than the typical sign-in process. Enter your username and password
 and you're presented with a second prompt, depending on which type of 2FA you've enabled.
 
 ### Sign in using a one-time password
diff --git a/doc/user/project/import/cvs.md b/doc/user/project/import/cvs.md
index f8bbb2354fe..00aebb75a50 100644
--- a/doc/user/project/import/cvs.md
+++ b/doc/user/project/import/cvs.md
@@ -54,7 +54,7 @@ Wikipedia article on [comparing the different version control software](https://
 
 CVS is old with no new release since 2008. Git provides more tools to work
 with (`git bisect` for one) which makes for a more productive workflow.
-Migrating to Git/GitLab will benefit you:
+Migrating to Git/GitLab benefits you:
 
 - **Shorter learning curve**, Git has a big community and a vast number of
   tutorials to get you started (see our [Git topic](../../../topics/git/index.md)).
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index 733e58dd031..b5f70fe9d0d 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -54,8 +54,8 @@ You can import projects from:
 - [Uploading a manifest file (AOSP)](manifest.md)
 - [Jira (issues only)](jira.md)
 
-You can also import any Git repository through HTTP from the **New Project** page. Note that if the
-repository is too large, the import can timeout.
+You can also import any Git repository through HTTP from the **New Project** page. If the repository
+is too large, the import can timeout.
 
 You can then [connect your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md).
 
@@ -89,7 +89,7 @@ The backups produced don't depend on the operating system running GitLab. You ca
 the restore method to switch between different operating system distributions or versions, as long
 as the same GitLab version [is available for installation](../../../administration/package_information/supported_os.md).
 
-Also note that administrators can use the [Users API](../../../api/users.md) to migrate users.
+Administrators can use the [Users API](../../../api/users.md) to migrate users.
 
 ## View project import history