Add latest changes from gitlab-org/gitlab@master

4 files changed, 22 insertions, 22 deletions

diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 53af18e919c..3950c856b40 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -727,6 +727,8 @@ Alternatively, you can use the CI/CD variable `SECURE_ANALYZERS_PREFIX` to overr
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/218465) in GitLab 13.2.
 > - [Improved](https://gitlab.com/gitlab-org/gitlab/-/issues/218465) in GitLab 13.3.
+> - The saved scans feature was [added](https://gitlab.com/groups/gitlab-org/-/epics/5100) in
+>   GitLab 13.9.
 
 An on-demand DAST scan runs outside the DevOps life cycle. Changes in your repository don't trigger
 the scan. You must start it manually.
@@ -765,9 +767,11 @@ To run an on-demand scan, either:
 - [Create and run an on-demand scan](#create-and-run-an-on-demand-scan).
 - [Run a previously saved on-demand scan](#run-a-saved-on-demand-scan).
 
-### Create and run an on-demand scan
+#### Create and run an on-demand scan
 
-1. From your project's home page, go to **Security & Compliance > On-demand Scans** in the left sidebar.
+1. From your project's home page, go to **Security & Compliance > On-demand Scans** in the left
+   sidebar.
+1. Complete the **Scan name** and **Description** fields.
 1. In **Scanner profile**, select a scanner profile from the dropdown.
 1. In **Site profile**, select a site profile from the dropdown.
 1. To run the on-demand scan now, select **Save and run scan**. Otherwise select **Save scan** to
@@ -775,49 +779,53 @@ To run an on-demand scan, either:
 
 The on-demand DAST scan runs and the project's dashboard shows the results.
 
-#### List saved on-demand scans
+### List saved on-demand scans
 
 To list saved on-demand scans:
 
 1. From your project's home page, go to **Security & Compliance > Configuration**.
 1. Select the **Saved Scans** tab.
 
-#### View details of an on-demand scan
+### View details of an on-demand scan
 
 To view details of an on-demand scan:
 
 1. From your project's home page, go to **Security & Compliance > Configuration**.
+1. Select **Manage DAST scans**.
 1. Select **Manage** in the **DAST Profiles** row.
 1. Select the **Saved Scans** tab.
 1. In the saved scan's row select **More actions** (**{ellipsis_v}**), then select **Edit**.
 
-#### Run a saved on-demand scan
+### Run a saved on-demand scan
 
 To run a saved on-demand scan:
 
 1. From your project's home page, go to **Security & Compliance > Configuration**.
+1. Select **Manage DAST scans**.
 1. Select **Manage** in the **DAST Profiles** row.
 1. Select the **Saved Scans** tab.
 1. In the scan's row select **Run scan**.
 
 The on-demand DAST scan runs and the project's dashboard shows the results.
 
-#### Edit an on-demand scan
+### Edit an on-demand scan
 
 To edit an on-demand scan:
 
 1. From your project's home page, go to **Security & Compliance > Configuration**.
+1. Select **Manage DAST scans**.
 1. Select **Manage** in the **DAST Profiles** row.
 1. Select the **Saved Scans** tab.
 1. In the saved scan's row select **More actions** (**{ellipsis_v}**), then select **Edit**.
 1. Edit the form.
 1. Select **Save scan**.
 
-#### Delete an on-demand scan
+### Delete an on-demand scan
 
 To delete an on-demand scan:
 
 1. From your project's home page, go to **Security & Compliance > Configuration**.
+1. Select **Manage DAST scans**.
 1. Select **Manage** in the **DAST Profiles** row.
 1. Select the **Saved Scans** tab.
 1. In the saved scan's row select **More actions** (**{ellipsis_v}**), then select **Delete**.
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index acd79433e7d..11d27140e42 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -68,17 +68,16 @@ The following languages and dependency managers are supported:
 | [npm](https://www.npmjs.com/) (7 and earlier), [yarn](https://classic.yarnpkg.com/en/) 1.x | JavaScript | `package.json` | [Retire.js](https://retirejs.github.io/retire.js/) |
 | [NuGet](https://www.nuget.org/) 4.9+ | .NET, C# | [`packages.lock.json`](https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files#enabling-lock-file) | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
 | [`setuptools`](https://setuptools.readthedocs.io/en/latest/), [pip](https://pip.pypa.io/en/stable/), [Pipenv](https://pipenv.pypa.io/en/latest/) (*1*) | Python | `setup.py`, `requirements.txt`, `requirements.pip`, `requires.txt`, `Pipfile`, `Pipfile.lock` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
-| [sbt](https://www.scala-sbt.org/) 1.2 and below ([Ivy](http://ant.apache.org/ivy/)) | Scala | `build.sbt` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
+| [sbt](https://www.scala-sbt.org/) (*2*) | Scala | `build.sbt` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) |
 
 1. [Pipenv](https://pipenv.pypa.io/en/latest/) projects are scanned when a `Pipfile` is present.
-   Gemnasium scans the exact package versions listed in `Pipfile.lock` when this file is also present.
+1. Support for [sbt](https://www.scala-sbt.org/) 1.3 and above was added in GitLab 13.9.
 
 Plans are underway for supporting the following languages, dependency managers, and dependency files. For details, see the issue link for each.
 
 | Package Managers    | Languages | Supported files | Scan tools | Issue |
 | ------------------- | --------- | --------------- | ---------- | ----- |
 | [Poetry](https://python-poetry.org/) | Python | `poetry.lock` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | [GitLab#7006](https://gitlab.com/gitlab-org/gitlab/-/issues/7006) |
-| [sbt](https://www.scala-sbt.org/) 1.3+ ([Coursier](https://get-coursier.io/))| Scala | `build.sbt` | [Gemnasium](https://gitlab.com/gitlab-org/security-products/gemnasium) | [GitLab#271345](https://gitlab.com/gitlab-org/gitlab/-/issues/271345) |
 
 ## Contribute your scanner
 
diff --git a/doc/user/group/bulk_editing/index.md b/doc/user/group/bulk_editing/index.md
index 22001b317f7..651bb7c055e 100644
--- a/doc/user/group/bulk_editing/index.md
+++ b/doc/user/group/bulk_editing/index.md
@@ -13,7 +13,6 @@ For more details, see [Bulk editing issues and merge requests at the project lev
 If you want to update attributes across multiple issues, epics, or merge requests in a group, you
 can do it by bulk editing them, that is, editing them together.
 
-NOTE:
 Only the items visible on the current page are selected for bulk editing (up to 20).
 
 ![Bulk editing](img/bulk-editing_v13_2.png)
@@ -25,8 +24,7 @@ Only the items visible on the current page are selected for bulk editing (up to
 > - Editing health status [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/218395) in GitLab 13.2.
 > - Editing iteration [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196806) in GitLab 13.9.
 
-NOTE:
-You need a permission level of [Reporter or higher](../../permissions.md) to manage issues.
+Users with permission level of [Reporter or higher](../../permissions.md) can manage issues.
 
 When bulk editing issues in a group, you can edit the following attributes:
 
@@ -48,8 +46,7 @@ To update multiple project issues at the same time:
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7250) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.2.
 
-NOTE:
-You need a permission level of [Reporter or higher](../../permissions.md) to manage epics.
+Users with permission level of [Reporter or higher](../../permissions.md) can manage epics.
 
 When bulk editing epics in a group, you can edit their labels.
 
@@ -65,8 +62,7 @@ To update multiple epics at the same time:
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/12719) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.2.
 
-NOTE:
-You need a permission level of [Developer or higher](../../permissions.md) to manage merge requests.
+Users with permission level of [Developer or higher](../../permissions.md) can manage merge requests.
 
 When bulk editing merge requests in a group, you can edit the following attributes:
 
diff --git a/doc/user/project/bulk_editing.md b/doc/user/project/bulk_editing.md
index 19f17ad91d7..d7e8133f9ad 100644
--- a/doc/user/project/bulk_editing.md
+++ b/doc/user/project/bulk_editing.md
@@ -14,7 +14,6 @@ For more details, see
 If you want to update attributes across multiple issues or merge requests, you can do it
 by bulk editing them, that is, editing them together.
 
-NOTE:
 Only the items visible on the current page are selected for bulk editing (up to 20).
 
 ![Bulk editing](img/bulk-editing_v13_2.png)
@@ -25,8 +24,7 @@ Only the items visible on the current page are selected for bulk editing (up to
 > - Editing health status [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/218395) in GitLab 13.2.
 > - Editing iteration [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/196806) in GitLab 13.9.
 
-NOTE:
-You need a permission level of [Reporter or higher](../permissions.md) to manage issues.
+Users with permission level of [Reporter or higher](../permissions.md) can manage issues.
 
 When bulk editing issues in a project, you can edit the following attributes:
 
@@ -49,8 +47,7 @@ To update multiple project issues at the same time:
 
 ## Bulk edit merge requests at the project level
 
-NOTE:
-You need a permission level of [Developer or higher](../permissions.md) to manage merge requests.
+Users with permission level of [Developer or higher](../permissions.md) can manage merge requests.
 
 When bulk editing merge requests in a project, you can edit the following attributes: