Add latest changes from gitlab-org/gitlab@master

4 files changed, 14 insertions, 12 deletions

diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md
index afc7a017e96..e32989c2915 100644
--- a/doc/user/application_security/api_fuzzing/index.md
+++ b/doc/user/application_security/api_fuzzing/index.md
@@ -98,17 +98,16 @@ a YAML snippet that you can paste in your GitLab CI/CD configuration.
 
 To generate an API Fuzzing configuration snippet:
 
-1. From your project's home page, go to **Security & Compliance > Configuration** in the left
-   sidebar.
-1. Select **Configure** in the **API Fuzzing** row.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Security & Compliance > Configuration**.
+1. In the **API Fuzzing** row, select **Configure**.
 1. Complete the form as needed. Read below for more information on available configuration options.
 1. Select **Generate code snippet**.
    A modal opens with the YAML snippet corresponding to the options you've selected in the form.
 1. Choose one of the following actions:
-   1. Select **Copy code and open `.gitlab-ci.yml` file** to copy the snippet to your clipboard and
-      be redirected to your project's `.gitlab-ci.yml` file where you can paste the YAML
-      configuration.
-   1. Select **Copy code only** to copy the snippet to your clipboard and close the modal.
+   1. To copy the snippet to your clipboard and be redirected to your project's `.gitlab-ci.yml` file,
+      where you can paste the YAML configuration, select **Copy code and open `.gitlab-ci.yml` file**.
+   1. To copy the snippet to your clipboard and close the modal, select **Copy code only**.
 
 ### OpenAPI Specification
 
@@ -995,7 +994,7 @@ Follow these steps to view details of a fuzzing fault:
      **API Fuzzing detected N potential vulnerabilities**. Click the title to display the fault
      details.
 
-1. Click the fault's title to display the fault's details. The table below describes these details.
+1. Select the fault's title to display the fault's details. The table below describes these details.
 
    | Field               | Description                                                                             |
    |:--------------------|:----------------------------------------------------------------------------------------|
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index baec5678b25..7b95769a81f 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -223,7 +223,8 @@ For this approval group, you must set the number of approvals required to greate
 
 Follow these steps to enable `Vulnerability-Check`:
 
-1. Go to your project and select **Settings > General**.
+1. On the top bar, select **Menu > Projects** and find your project.
+1. On the left sidebar, select **Settings > General**.
 1. Expand **Merge request approvals**.
 1. Select **Enable** or **Edit**.
 1. Set the **Security scanners** that the rule applies to.
diff --git a/doc/user/application_security/secret_detection/index.md b/doc/user/application_security/secret_detection/index.md
index f5d9977c2c2..cd1014d36a6 100644
--- a/doc/user/application_security/secret_detection/index.md
+++ b/doc/user/application_security/secret_detection/index.md
@@ -89,12 +89,13 @@ However not all features are available on every tier. See the breakdown below fo
 Different features are available in different [GitLab tiers](https://about.gitlab.com/pricing/),
 as shown in the following table:
 
-| Capability                                                      | In Free             | In Ultimate        |
+| Capability                                                      | In Free & Premium   | In Ultimate        |
 |:----------------------------------------------------------------|:--------------------|:-------------------|
 | [Configure Secret Detection Scanners](#configuration)           | **{check-circle}**  | **{check-circle}** |
 | [Customize Secret Detection Settings](#customizing-settings)    | **{check-circle}**  | **{check-circle}** |
 | View [JSON Report](../sast/index.md#reports-json-format)        | **{check-circle}**  | **{check-circle}** |
 | Presentation of JSON Report in Merge Request                    | **{dotted-circle}** | **{check-circle}** |
+| View identified secrets in the pipelines' **Security** tab      | **{dotted-circle}** | **{check-circle}** |
 | [Interaction with Vulnerabilities](../vulnerabilities/index.md) | **{dotted-circle}** | **{check-circle}** |
 | [Access to Security Dashboard](../security_dashboard/index.md)  | **{dotted-circle}** | **{check-circle}** |
 
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md
index ca6b2ba686e..fb32579f40e 100644
--- a/doc/user/project/clusters/serverless/index.md
+++ b/doc/user/project/clusters/serverless/index.md
@@ -4,9 +4,10 @@ group: Configure
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Serverless **(FREE)**
+# Serverless (DEPRECATED) **(FREE)**
 
-> Introduced in GitLab 11.5.
+> - Introduced in GitLab 11.5.
+> - [Deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/6) in GitLab 14.3.
 
 WARNING:
 Serverless is currently in [alpha](https://about.gitlab.com/handbook/product/gitlab-the-product/#alpha).