Add latest changes from gitlab-org/gitlab@master

21 files changed, 40 insertions, 34 deletions

diff --git a/doc/user/admin_area/monitoring/health_check.md b/doc/user/admin_area/monitoring/health_check.md
index a36f00c768c..84c7fa3c419 100644
--- a/doc/user/admin_area/monitoring/health_check.md
+++ b/doc/user/admin_area/monitoring/health_check.md
@@ -12,14 +12,14 @@ database connection, Redis connection, and access to the file system. These
 endpoints [can be provided to schedulers like Kubernetes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) to hold
 traffic until the system is ready or restart the container as needed.
 
-## IP whitelist
+## IP allowlist
 
-To access monitoring resources, the requesting client IP needs to be included in a whitelist.
+To access monitoring resources, the requesting client IP needs to be included in the allowlist.
 For details, see [how to add IPs to the allowlist for the monitoring endpoints](../../../administration/monitoring/ip_whitelist.md).
 
 ## Using the endpoints locally
 
-With default whitelist settings, the probes can be accessed from localhost using the following URLs:
+With default allowlist settings, the probes can be accessed from localhost using the following URLs:
 
 ```plaintext
 GET http://localhost/-/health
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md
index 970897fd8da..c877ca9837d 100644
--- a/doc/user/admin_area/settings/index.md
+++ b/doc/user/admin_area/settings/index.md
@@ -160,7 +160,7 @@ The **Preferences** settings contain:
 The **Reporting** settings contain:
 
 - [Spam and Anti-bot Protection](../../../integration/recaptcha.md) -
-  Enable anti-spam services, like reCAPTCHA, Akismet or [Spamcheck](../reporting/spamcheck.md), and set IP limits.
+  Enable anti-spam services, like reCAPTCHA, Akismet, or [Spamcheck](../reporting/spamcheck.md), and set IP limits.
 - [Abuse reports](../review_abuse_reports.md) - Set notification email for abuse reports.
 
 ### Repository
diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md
index 103eae07517..55a399f0241 100644
--- a/doc/user/admin_area/settings/visibility_and_access_controls.md
+++ b/doc/user/admin_area/settings/visibility_and_access_controls.md
@@ -95,7 +95,7 @@ To set the default [visibility levels for new projects](../../public_access.md):
 1. Expand the **Visibility and access controls** section.
 1. Select the desired default project visibility:
    - **Private** - Project access must be granted explicitly to each user. If this
-     project is part of a group, access will be granted to members of the group.
+     project is part of a group, access is granted to members of the group.
    - **Internal** - The project can be accessed by any logged in user except external users.
    - **Public** - The project can be accessed without any authentication.
 1. Select **Save changes**.
diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md
index 3781397578d..cbe20ecde30 100644
--- a/doc/user/application_security/api_fuzzing/index.md
+++ b/doc/user/application_security/api_fuzzing/index.md
@@ -65,7 +65,7 @@ Requirements:
   - Postman Collection v2.0 or v2.1
 
   WARNING:
-  **NEVER** run fuzz testing against a production server. Not only can it perform *any* function that
+  **Never** run fuzz testing against a production server. Not only can it perform *any* function that
   the API can, it may also trigger bugs in the API. This includes actions like modifying and deleting
   data. Only run fuzzing against a test server.
 
diff --git a/doc/user/application_security/dast/checks/16.3.md b/doc/user/application_security/dast/checks/16.3.md
index e4fc2468dae..6f80a2a32c6 100644
--- a/doc/user/application_security/dast/checks/16.3.md
+++ b/doc/user/application_security/dast/checks/16.3.md
@@ -32,4 +32,4 @@ information from the `X-Powered-By` header.
 ## Links
 
 - [CWE](https://cwe.mitre.org/data/definitions/16.html)
-- [PHP expose_php](https://www.php.net/manual/en/ini.core.php#ini.expose-php)
+- [PHP `expose_php`](https://www.php.net/manual/en/ini.core.php#ini.expose-php)
diff --git a/doc/user/application_security/dast/checks/16.5.md b/doc/user/application_security/dast/checks/16.5.md
index 28bb9f7ee4b..e03da3043ef 100644
--- a/doc/user/application_security/dast/checks/16.5.md
+++ b/doc/user/application_security/dast/checks/16.5.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 ## Description
 
-The target website returns AspNet header(s) and version information of this website. By
+The target website returns AspNet headers and version information of this website. By
 exposing these values attackers may attempt to identify if the target software is vulnerable to known
 vulnerabilities, or catalog known sites running particular versions to exploit in the future when a
 vulnerability is identified in the particular version.
diff --git a/doc/user/application_security/dast/checks/16.6.md b/doc/user/application_security/dast/checks/16.6.md
index ddd3a10c5f8..9cbcde669a0 100644
--- a/doc/user/application_security/dast/checks/16.6.md
+++ b/doc/user/application_security/dast/checks/16.6.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 ## Description
 
-The target website returns AspNet header(s) along with version information of this website. By
+The target website returns AspNet headers along with version information of this website. By
 exposing these values attackers may attempt to identify if the target software is vulnerable to known
 vulnerabilities. Or catalog known sites running particular versions to exploit in the future when a
 vulnerability is identified in the particular version.
diff --git a/doc/user/application_security/dast/checks/319.1.md b/doc/user/application_security/dast/checks/319.1.md
index 7eed0104809..d598fb70ce3 100644
--- a/doc/user/application_security/dast/checks/319.1.md
+++ b/doc/user/application_security/dast/checks/319.1.md
@@ -9,19 +9,19 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 ## Description
 
 The target application was found to request resources over insecure transport protocols (HTTP). This is usually due to HTML
-elements which load resources using the `http://` scheme instead of `https://`. It should be noted that most modern browsers 
-block these requests automatically so there is limited risk. 
+elements which load resources using the `http://` scheme instead of `https://`. It should be noted that most modern browsers
+block these requests automatically so there is limited risk.
 
 Some parts of the application may not behave correctly since these files are not being properly loaded.
 
 ## Remediation
 
-Ensure all HTML elements which load resources from a URL (JavaScript, stylesheets, images, video and other media) are set to 
+Ensure all HTML elements which load resources from a URL (JavaScript, stylesheets, images, video and other media) are set to
 use the `https://` scheme instead of `http://`. Alternatively, developers may use the `//` scheme, which will only load resources
-over the same protocol that the originating page was loaded. 
+over the same protocol that the originating page was loaded.
 
-A browser visiting the website `https://example.com` with the HTML loading a file using 
-`<script src="//example.com/cdn/bundle.js"></script>`, would ensure the `example.com/cdn/bundle.js` file was loaded over 
+A browser visiting the website `https://example.com` with the HTML loading a file using
+`<script src="//example.com/cdn/bundle.js"></script>`, would ensure the `example.com/cdn/bundle.js` file was loaded over
 HTTPS.
 
 ## Details
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index a8e1c7ec369..658b5ba4bf6 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -737,7 +737,7 @@ by the application as correctly authenticated.
 Authentication supports single form logins, multi-step login forms, and authenticating to URLs outside of the configured target URL.
 
 WARNING:
-**NEVER** run an authenticated scan against a production server. When an authenticated
+**Never** run an authenticated scan against a production server. When an authenticated
 scan is run, it may perform *any* function that the authenticated user can. This
 includes actions like modifying and deleting data, submitting forms, and following links.
 Only run an authenticated scan against a test server.
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index 463bb18b941..df24a0dcc3c 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -169,7 +169,7 @@ If you want to override this to increase the pipeline speed you may choose which
 
 ### Secure job status
 
-Jobs pass if they are able to complete a scan. A _pass_ result does NOT indicate if they did, or did not, identify findings. The only exception is coverage fuzzing, which fails if it identifies findings.
+Jobs pass if they are able to complete a scan. A _pass_ result does not indicate if they did, or did not, identify findings. The only exception is coverage fuzzing, which fails if it identifies findings.
 
 Jobs fail if they are unable to complete a scan. You can view the pipeline logs for more information.
 
@@ -200,11 +200,11 @@ reports are available to download. To download a report, select
 
 ### Ultimate
 
-A merge request contains a security widget which displays a summary of the NEW results. New results are determined by comparing the current findings against existing findings in the target (default) branch (if there are prior findings).
+A merge request contains a security widget which displays a summary of the new results. New results are determined by comparing the current findings against existing findings in the target (default) branch (if there are prior findings).
 
 We recommend you run a scan of the `default` branch before enabling feature branch scans for your developers. Otherwise, there is no base for comparison and all feature branches display the full scan results in the merge request security widget.
 
-The merge request security widget displays only a subset of the vulnerabilities in the generated JSON artifact because it contains both NEW and EXISTING findings.
+The merge request security widget displays only a subset of the vulnerabilities in the generated JSON artifact because it contains both new and existing findings.
 
 From the merge request security widget, select **Expand** to unfold the widget, displaying any new and no longer detected (removed) findings by scan type. Select **View full report** to go directly to the **Security** tab in the latest branch pipeline.
 
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 448be0ade3a..d86fa2af48a 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -525,7 +525,7 @@ defined for the `nodejs-scan` scanner:
 '''
 ```
 
-##### File passthrough for gosec
+##### File passthrough for Gosec
 
 Provide the name of the file containing a custom analyzer configuration. In
 this example, customized rules for the `gosec` scanner are contained in the
diff --git a/doc/user/asciidoc.md b/doc/user/asciidoc.md
index 41e4929576b..b55a55eebe5 100644
--- a/doc/user/asciidoc.md
+++ b/doc/user/asciidoc.md
@@ -399,10 +399,10 @@ Color written inside backticks is followed by a color "chip":
 - `HSLA(540,70%,50%,0.3)`
 ```
 
-### STEM
+### Equations and Formulas (STEM)
 
-To activate equation and formula support,
-set the `stem` attribute in the document's header to `latexmath`.
+If you need to include Science, Technology, Engineering and Math (STEM)
+expressions, set the `stem` attribute in the document's header to `latexmath`.
 Equations and formulas are rendered using [KaTeX](https://katex.org/):
 
 ```plaintext
diff --git a/doc/user/clusters/agent/ci_cd_workflow.md b/doc/user/clusters/agent/ci_cd_workflow.md
index 644a753e282..c04c5a1f7ec 100644
--- a/doc/user/clusters/agent/ci_cd_workflow.md
+++ b/doc/user/clusters/agent/ci_cd_workflow.md
@@ -235,6 +235,10 @@ The identity can be specified with the following keys:
 
 See the [official Kubernetes documentation for details](https://kubernetes.io/docs/reference/access-authn-authz/authentication/#user-impersonation).
 
+## Related topics
+
+- [Self-paced classroom workshop](https://gitlab-for-eks.awsworkshop.io) (Uses AWS EKS, but you can use for other Kubernetes clusters)
+
 ## Troubleshooting
 
 ### `kubectl` commands not supported
diff --git a/doc/user/clusters/agent/gitops.md b/doc/user/clusters/agent/gitops.md
index 3bd48390364..64eae308bec 100644
--- a/doc/user/clusters/agent/gitops.md
+++ b/doc/user/clusters/agent/gitops.md
@@ -124,10 +124,10 @@ As a result, every field in a resource can have different managers. Only fields
 are checked for drift. This facilitates the use of in-cluster controllers to modify resources like
 [Horizontal Pod Autoscalers](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/).
 
-## Additional resources
-
-The following documentation and examples can help you get started with a GitOps workflow.
+## Related topics
 
+- [GitOps working examples for training and demos](https://gitlab.com/groups/guided-explorations/gl-k8s-agent/gitops/-/wikis/home)
+- [Self-paced classroom workshop](https://gitlab-for-eks.awsworkshop.io) (Uses AWS EKS, but you can use for other Kubernetes clusters)
 - [Managing Kubernetes secrets in a GitOps workflow](gitops/secrets_management.md)
 - [Application and manifest repository example](https://gitlab.com/gitlab-examples/ops/gitops-demo/hello-world-service-gitops)
 
diff --git a/doc/user/clusters/agent/index.md b/doc/user/clusters/agent/index.md
index 54259b9fc26..5a69da28632 100644
--- a/doc/user/clusters/agent/index.md
+++ b/doc/user/clusters/agent/index.md
@@ -66,9 +66,11 @@ Read about how to [migrate to the agent for Kubernetes](../../infrastructure/clu
 ## Related topics
 
 - [GitOps workflow](gitops.md)
+- [GitOps examples and learning materials](gitops.md#related-topics)
 - [GitLab CI/CD workflow](ci_cd_workflow.md)
 - [Install the agent](install/index.md)
 - [Work with the agent](repository.md)
 - [Troubleshooting](troubleshooting.md)
 - [Guided explorations for a production ready GitOps setup](https://gitlab.com/groups/guided-explorations/gl-k8s-agent/gitops/-/wikis/home#gitlab-agent-for-kubernetes-gitops-working-examples)
+- [CI/CD for Kubernetes examples and learning materials](ci_cd_workflow.md#related-topics)
 - [Contribute to the agent's development](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/tree/master/doc)
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index dc8796ffe4d..552df5173af 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -252,8 +252,8 @@ More details about the permissions for some project-level features follow.
 
 - [Public pipelines](../ci/pipelines/settings.md#change-which-users-can-view-your-pipelines):
   When set to public, gives access to certain CI/CD features to *Guest* project members.
-- [Pipeline visibility](../ci/enable_or_disable_ci.md#enable-cicd-in-a-project): When set to **Everyone with Access**,
-  gives access to certain CI/CD "view" features to *non-project* members.
+- [Pipeline visibility](../ci/pipelines/settings.md#change-pipeline-visibility-for-non-project-members-in-public-projects):
+  When set to **Everyone with Access**, gives access to certain CI/CD "view" features to *non-project* members.
 
 | Action                                                                                                                    | Non-member | Guest   | Reporter | Developer | Maintainer | Owner |
 |---------------------------------------------------------------------------------------------------------------------------|------------|---------|----------|-----------|------------|-------|
@@ -521,7 +521,7 @@ and the ignore case flag is set (`/regex pattern/i`). Here are some examples:
 - Use `\.internal@domain\.com$` to mark email addresses ending with
   `.internal@domain.com` as internal.
 - Use `^(?:(?!\.ext@domain\.com).)*$\r?` to mark users with email addresses
-  NOT including `.ext@domain.com` as internal.
+  not including `.ext@domain.com` as internal.
 
 WARNING:
 Be aware that this regex could lead to a
diff --git a/doc/user/project/highlighting.md b/doc/user/project/highlighting.md
index ef0c787b9d3..37ec7c8e8d3 100644
--- a/doc/user/project/highlighting.md
+++ b/doc/user/project/highlighting.md
@@ -42,7 +42,7 @@ To override syntax highlighting for a file type:
 After the changes merge into your [default branch](repository/branches/default.md),
 all `*.pl` files in your project are highlighted in your preferred language.
 
-You can also extend the highlighting with common gateway interface (CGI) options, such as:
+You can also extend the highlighting with Common Gateway Interface (CGI) options, such as:
 
 ``` conf
 # JSON file with .erb in it
diff --git a/doc/user/project/repository/branches/default.md b/doc/user/project/repository/branches/default.md
index f9fd1a48b9a..e087ed6c439 100644
--- a/doc/user/project/repository/branches/default.md
+++ b/doc/user/project/repository/branches/default.md
@@ -252,7 +252,7 @@ We are tracking this problem in [issue 20474](https://gitlab.com/gitlab-org/gitl
 This issue often occurs when a branch named `HEAD` is present in the repository.
 To fix the problem:
 
-1. In your local repository, create a new, temporary branch and push it:
+1. In your local repository, create a new temporary branch and push it:
 
    ```shell
    git checkout -b tmp_default && git push -u origin tmp_default
diff --git a/doc/user/project/repository/branches/index.md b/doc/user/project/repository/branches/index.md
index 14ad550fe79..6da2e5fc7ee 100644
--- a/doc/user/project/repository/branches/index.md
+++ b/doc/user/project/repository/branches/index.md
@@ -98,7 +98,7 @@ Sometimes when you have hundreds of branches you may want a more flexible matchi
 
 ![Before swap revisions](img/swap_revisions_before_v13_12.png)
 
-The Swap revisions feature allows you to swap the Source and Target revisions. When the Swap revisions button is clicked, the selected revisions for Source and Target will be swapped.
+The Swap revisions feature allows you to swap the Source and Target revisions. When the Swap revisions button is clicked, the selected revisions for Source and Target is swapped.
 
 ![After swap revisions](img/swap_revisions_after_v13_12.png)
 
diff --git a/doc/user/project/repository/csv.md b/doc/user/project/repository/csv.md
index 4bf6c7451d5..27424268d2b 100644
--- a/doc/user/project/repository/csv.md
+++ b/doc/user/project/repository/csv.md
@@ -13,7 +13,7 @@ A comma-separated values (CSV) file is a delimited text file that uses a comma t
 Each line of the file is a data record. Each record consists of one or more fields, separated by
 commas. The use of the comma as a field separator is the source of the name for this file format.
 A CSV file typically stores tabular data (numbers and text) in plain text, in which case each line
-will have the same number of fields.
+has the same number of fields.
 
 The CSV file format is not fully standardized. Other characters can be used as column delimiters.
 Fields may or may not be surrounded to escape special characters.
diff --git a/doc/user/search/advanced_search.md b/doc/user/search/advanced_search.md
index bbed1f542cb..d050bbce19f 100644
--- a/doc/user/search/advanced_search.md
+++ b/doc/user/search/advanced_search.md
@@ -96,7 +96,7 @@ doesn't return any results for searches considered abusive according to the foll
 
 - Searches with less than 2 characters.
 - Searches with any term greater than 100 characters. URL search terms have a maximum of 200 characters.
-- Searches with a stop word as the only term (ie: "the", "and", "if", etc.).
+- Searches with a stop word as the only term (for example, "the", "and", "if", etc.).
 - Searches with a `group_id` or `project_id` parameter that is not completely numeric.
 - Searches with a `repository_ref` or `project_ref` parameter that has special characters not allowed by [Git refname](https://git-scm.com/docs/git-check-ref-format).
 - Searches with a `scope` that is unknown.