Add latest changes from gitlab-org/gitlab@master

7 files changed, 47 insertions, 48 deletions

diff --git a/doc/development/experiment_guide/gitlab_experiment.md b/doc/development/experiment_guide/gitlab_experiment.md
index 5359a6f21a3..78e1f84d701 100644
--- a/doc/development/experiment_guide/gitlab_experiment.md
+++ b/doc/development/experiment_guide/gitlab_experiment.md
@@ -317,7 +317,7 @@ of tracking an event in Ruby would be:
 experiment(:pill_color, actor: current_user).track(:clicked)
 ```
 
-When you run an experiment with any of the examples so far, an `:assigned` event
+When you run an experiment with any of the examples so far, an `:assignment` event
 is tracked automatically by default. All events that are tracked from an
 experiment have a special
 [experiment context](https://gitlab.com/gitlab-org/iglu/-/blob/master/public/schemas/com.gitlab/gitlab_experiment/jsonschema/1-0-3)
diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md
index 979d8a52fb8..2033ddbad6f 100644
--- a/doc/integration/jira/configure.md
+++ b/doc/integration/jira/configure.md
@@ -50,7 +50,7 @@ To configure your project:
    If you enable Jira issues with this setting, all users with access to this GitLab project
    can view all issues from the specified Jira project.
 
-1. To enable [issue creation for vulnerabilities](../../user/application_security/vulnerabilities/index.md#create-a-jira-issue-for-a-vulnerability), select **Enable Jira issues creation from vulnerabilities**.
+1. To enable [issue creation for vulnerabilities](../../user/application_security/vulnerabilities/index.md#create-a-jira-issue-for-a-vulnerability), select **Enable Jira issue creation from vulnerabilities**.
 1. Select the **Jira issue type**. If the dropdown is empty, select refresh (**{retry}**) and try again.
 1. To verify the Jira connection is working, select **Test settings**.
 1. Select **Save changes**.
diff --git a/doc/user/application_security/vulnerabilities/index.md b/doc/user/application_security/vulnerabilities/index.md
index 7b39002bac3..db8b3fe8126 100644
--- a/doc/user/application_security/vulnerabilities/index.md
+++ b/doc/user/application_security/vulnerabilities/index.md
@@ -80,7 +80,7 @@ The issue is then opened so you can take further action.
 Prerequisites:
 
 - [Enable Jira integration](../../../integration/jira/index.md).
-  The **Enable Jira issues creation from vulnerabilities** option must be selected as part of the configuration.
+  The **Enable Jira issue creation from vulnerabilities** option must be selected as part of the configuration.
 - Each user must have a personal Jira user account with permission to create issues in the target project.
 
 To create a Jira issue for a vulnerability:
diff --git a/doc/user/clusters/agent/vulnerabilities.md b/doc/user/clusters/agent/vulnerabilities.md
index ef3fd800220..41a80f43467 100644
--- a/doc/user/clusters/agent/vulnerabilities.md
+++ b/doc/user/clusters/agent/vulnerabilities.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Container vulnerability scanning **(ULTIMATE)**
 
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/6346) in GitLab 14.8 [with a flag](../../../administration/feature_flags.md) named `cluster_vulnerabilities`. Enabled by default.
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/6346) in GitLab 14.8.
 
 To view cluster vulnerabilities, you can view the [vulnerability report](../../application_security/vulnerabilities/index.md).
 You can also configure your agent so the vulnerabilities are displayed with other agent information in GitLab.
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index a16f8fd39b1..fa739843e3b 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -67,15 +67,15 @@ Features not found in standard Markdown:
 
 Features [extended from standard Markdown](#features-extended-from-standard-markdown):
 
-| Standard Markdown                     | Extended Markdown in GitLab |
-| ------------------------------------- | ------------------------- |
-| [blockquotes](#blockquotes)           | [multi-line blockquotes](#multiline-blockquote) |
-| [code blocks](#code-spans-and-blocks) | [colored code and syntax highlighting](#colored-code-and-syntax-highlighting) |
-| [emphasis](#emphasis)                 | [multiple underscores in words](#multiple-underscores-in-words-and-mid-word-emphasis)
-| [headers](#headers)                   | [linkable Header IDs](#header-ids-and-links) |
-| [images](#images)                     | [embedded videos](#videos) and [audio](#audio) |
-| [line breaks](#line-breaks)           | [more line break control](#newlines) |
-| [links](#links)                       | [automatically linking URLs](#url-auto-linking) |
+| Standard Markdown                     | Extended Markdown in GitLab                                                           |
+|---------------------------------------|---------------------------------------------------------------------------------------|
+| [blockquotes](#blockquotes)           | [multi-line blockquotes](#multiline-blockquote)                                       |
+| [code blocks](#code-spans-and-blocks) | [colored code and syntax highlighting](#colored-code-and-syntax-highlighting)         |
+| [emphasis](#emphasis)                 | [multiple underscores in words](#multiple-underscores-in-words-and-mid-word-emphasis) |
+| [headers](#headers)                   | [linkable Header IDs](#header-ids-and-links)                                          |
+| [images](#images)                     | [embedded videos](#videos) and [audio](#audio)                                        |
+| [line breaks](#line-breaks)           | [more line break control](#newlines)                                                  |
+| [links](#links)                       | [automatically linking URLs](#url-auto-linking)                                       |
 
 ## Features not found in standard Markdown
 
@@ -262,7 +262,7 @@ The following delimiters are supported:
   ---
   title: About Front Matter
   example:
-  language: yaml
+    language: yaml
   ---
   ```
 
@@ -515,31 +515,31 @@ version to reference other projects from the same namespace.
 
 GitLab Flavored Markdown recognizes the following:
 
-| references                                           | input                         | cross-project reference                    | shortcut inside same namespace   |
-| :--------------------------------------------------- | :---------------------------- | :----------------------------------------- | :------------------------------- |
-| specific user                                        | `@user_name`                  |                                            |                                  |
-| specific group                                       | `@group_name`                 |                                            |                                  |
-| entire team                                          | `@all`                        |                                            |                                  |
-| project                                              | `namespace/project>`          |                                            |                                  |
-| issue                                                | ``#123``                      | `namespace/project#123`                    | `project#123`                    |
-| merge request                                        | `!123`                        | `namespace/project!123`                    | `project!123`                    |
-| snippet                                              | `$123`                        | `namespace/project$123`                    | `project$123`                    |
-| [epic](group/epics/index.md)                         | `&123`                        | `group1/subgroup&123`                      |                                  |
-| vulnerability **(ULTIMATE)** <sup>1</sup>            | `[vulnerability:123]`         | `[vulnerability:namespace/project/123]`    | `[vulnerability:project/123]`    |
-| feature flag                                         | `[feature_flag:123]`          | `[feature_flag:namespace/project/123]`     | `[feature_flag:project/123]`     |
-| label by ID                                          | `~123`                        | `namespace/project~123`                    | `project~123`                    |
-| one-word label by name                               | `~bug`                        | `namespace/project~bug`                    | `project~bug`                    |
-| multi-word label by name                             | `~"feature request"`          | `namespace/project~"feature request"`      | `project~"feature request"`      |
-| scoped label by name                                 | `~"priority::high"`           | `namespace/project~"priority::high"`       | `project~"priority::high"`       |
-| project milestone by ID                              | `%123`                        | `namespace/project%123`                    | `project%123`                    |
-| one-word milestone by name                           | `%v1.23`                      | `namespace/project%v1.23`                  | `project%v1.23`                  |
-| multi-word milestone by name                         | `%"release candidate"`        | `namespace/project%"release candidate"`    | `project%"release candidate"`    |
-| specific commit                                      | `9ba12248`                    | `namespace/project@9ba12248`               | `project@9ba12248`               |
-| commit range comparison                              | `9ba12248...b19a04f5`         | `namespace/project@9ba12248...b19a04f5`    | `project@9ba12248...b19a04f5`    |
-| repository file references                           | `[README](doc/README.md)`     |                                            |                                  |
-| repository file line references                      | `[README](doc/README.md#L13)` |                                            |                                  |
-| [alert](../operations/incident_management/alerts.md) | `^alert#123`                  | `namespace/project^alert#123`              | `project^alert#123`              |
-| contact                       | `[contact:test@example.com]`         |     |    |
+| references                                                                  | input                         | cross-project reference                 | shortcut inside same namespace |
+|:----------------------------------------------------------------------------|:------------------------------|:----------------------------------------|:-------------------------------|
+| specific user                                                               | `@user_name`                  |                                         |                                |
+| specific group                                                              | `@group_name`                 |                                         |                                |
+| entire team                                                                 | `@all`                        |                                         |                                |
+| project                                                                     | `namespace/project>`          |                                         |                                |
+| issue                                                                       | ``#123``                      | `namespace/project#123`                 | `project#123`                  |
+| merge request                                                               | `!123`                        | `namespace/project!123`                 | `project!123`                  |
+| snippet                                                                     | `$123`                        | `namespace/project$123`                 | `project$123`                  |
+| [epic](group/epics/index.md)                                                | `&123`                        | `group1/subgroup&123`                   |                                |
+| [vulnerability](application_security/vulnerabilities/index.md) <sup>1</sup> | `[vulnerability:123]`         | `[vulnerability:namespace/project/123]` | `[vulnerability:project/123]`  |
+| feature flag                                                                | `[feature_flag:123]`          | `[feature_flag:namespace/project/123]`  | `[feature_flag:project/123]`   |
+| label by ID                                                                 | `~123`                        | `namespace/project~123`                 | `project~123`                  |
+| one-word label by name                                                      | `~bug`                        | `namespace/project~bug`                 | `project~bug`                  |
+| multi-word label by name                                                    | `~"feature request"`          | `namespace/project~"feature request"`   | `project~"feature request"`    |
+| scoped label by name                                                        | `~"priority::high"`           | `namespace/project~"priority::high"`    | `project~"priority::high"`     |
+| project milestone by ID                                                     | `%123`                        | `namespace/project%123`                 | `project%123`                  |
+| one-word milestone by name                                                  | `%v1.23`                      | `namespace/project%v1.23`               | `project%v1.23`                |
+| multi-word milestone by name                                                | `%"release candidate"`        | `namespace/project%"release candidate"` | `project%"release candidate"`  |
+| specific commit                                                             | `9ba12248`                    | `namespace/project@9ba12248`            | `project@9ba12248`             |
+| commit range comparison                                                     | `9ba12248...b19a04f5`         | `namespace/project@9ba12248...b19a04f5` | `project@9ba12248...b19a04f5`  |
+| repository file references                                                  | `[README](doc/README.md)`     |                                         |                                |
+| repository file line references                                             | `[README](doc/README.md#L13)` |                                         |                                |
+| [alert](../operations/incident_management/alerts.md)                        | `^alert#123`                  | `namespace/project^alert#123`           | `project^alert#123`            |
+| contact                                                                     | `[contact:test@example.com]`  |                                         |                                |
 
 1. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/222483) in GitLab 13.7.
 
@@ -1486,7 +1486,7 @@ but they do not render properly on `docs.gitlab.com`:
 
 #### Copy from spreadsheet and paste in Markdown
 
-[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27205) in GitLab 12.7.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27205) in GitLab 12.7.
 
 If you're working in spreadsheet software (for example, Microsoft Excel, Google
 Sheets, or Apple Numbers), GitLab creates a Markdown table when you copy-and-paste
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index f96ca746474..e57f9260f2c 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -34,7 +34,8 @@ in the search field in the upper right corner:
 
 > - Filtering by epics was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/195704) in GitLab 12.9.
 > - Filtering by child epics was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9029) in GitLab 13.0.
-> - Filtering by iterations was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118742) in GitLab 13.6. Moved from GitLab Ultimate to Premium in 13.9.
+> - Filtering by iterations was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/118742) in GitLab 13.6.
+> - Filtering by iterations was moved from GitLab Ultimate to GitLab Premium in 13.9.
 > - Filtering by type was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/322755) in GitLab 13.10 [with a flag](../../administration/feature_flags.md) named `vue_issues_list`. Disabled by default.
 
 Follow these steps to filter the **Issues** and **Merge requests** list pages in projects and
@@ -127,14 +128,14 @@ the dropdown list) **Approved-By** and select the user.
 
 ![Filter MRs by approved by](img/filter_approved_by_merge_requests_v14_6.png)
 
-### Filtering merge requests by reviewer **(FREE)**
+### Filtering merge requests by reviewer
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47605) in GitLab 13.7.
 
 To filter review requested merge requests for a specific individual, you can type (or select from
 the dropdown list) **Reviewer** and select the user.
 
-### Filtering merge requests by environment or deployment date **(FREE)**
+### Filtering merge requests by environment or deployment date
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44041) in GitLab 13.6.
 
@@ -307,7 +308,7 @@ GitLab instance.
 ## Search settings
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/292941) in GitLab 13.8 [with a flag](../../administration/feature_flags.md) named `search_settings_in_page`. Disabled by default.
-> - [Added to Group, Administrator, and User settings](https://gitlab.com/groups/gitlab-org/-/epics/4842) in GitLab 13.9.
+> - [Added](https://gitlab.com/groups/gitlab-org/-/epics/4842) to Group, Administrator, and User settings in GitLab 13.9.
 > - [Feature flag `search_settings_in_page` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/294025) in GitLab 13.11.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/294025) in GitLab 13.11.
 
diff --git a/doc/user/snippets.md b/doc/user/snippets.md
index fc6ae11c724..1750e2c8d10 100644
--- a/doc/user/snippets.md
+++ b/doc/user/snippets.md
@@ -37,8 +37,7 @@ You can create snippets in multiple ways, depending on whether you want to creat
      **New snippet**, or:
      - *If you're on a project's page,* select the plus icon (**{plus-square-o}**)
        in the top navigation bar, and then select **New snippet** from the
-       **GitLab** (GitLab SaaS) or **Your Instance** (self-managed) section
-       of the same dropdown list.
+       **GitLab** section of the same dropdown list.
      - *For all other pages,* select the plus icon (**{plus-square-o}**)
        in the top navigation bar, then select **New snippet** from the dropdown list.
      - If you installed the [GitLab Workflow VS Code extension](project/repository/vscode.md),
@@ -153,8 +152,7 @@ To delete a file from your snippet through the GitLab UI:
 
 1. Go to your snippet in the GitLab UI.
 1. Select **Edit** in the top right corner.
-1. Select **Delete file** alongside the filename of each file
-you wish to delete.
+1. Select **Delete file** alongside the filename of each file you wish to delete.
 1. Select **Save changes**.
 
 ## Clone snippets