Automatic merge of gitlab-org/gitlab-ce master

doc/administration/high_availability/nfs.md

@@ -41,7 +41,6 @@ options:
 
 NOTE: **Note:**
 This is only available starting in certain versions of GitLab:
-
   * 11.5.11
   * 11.6.11
   * 11.7.12
@@ -59,13 +58,13 @@ details.
 To do this, run the Rake task:
 
 ```sh
-gitlab-rake gitlab:features:enable_rugged
+sudo gitlab-rake gitlab:features:enable_rugged
 ```
 
 If you need to undo this setting for some reason, run:
 
 ```sh
-gitlab-rake gitlab:features:disable_rugged
+sudo gitlab-rake gitlab:features:disable_rugged
 ```
 
 ### Known issues

doc/ci/yaml/README.md

@@ -1446,7 +1446,7 @@ be automatically shown in merge requests.
 
 > Introduced in GitLab 11.5. Requires GitLab Runner 11.5 and above.
 
-The `sast` report collects [SAST vulnerabilities](https://docs.gitlab.com/ee/user/project/merge_requests/sast.html)
+The `sast` report collects [SAST vulnerabilities](https://docs.gitlab.com/ee/user/application_security/sast/index.html)
 as artifacts.
 
 The collected SAST report will be uploaded to GitLab as an artifact and will

doc/development/go_guide/index.md

@@ -40,7 +40,7 @@ of possible security breaches in our code:
 - SQL injections
 
 Remember to run
-[SAST](https://docs.gitlab.com/ee/user/project/merge_requests/sast.html)
+[SAST](https://docs.gitlab.com/ee/user/application_security/sast/index)
 **[ULTIMATE]** on your project (or at least the [gosec
 analyzer](https://gitlab.com/gitlab-org/security-products/analyzers/gosec)),
 and to follow our [Security
@@ -96,7 +96,7 @@ dependency should be argued in the merge request, as per our [Approval
 Guidelines](../code_review.md#approval-guidelines). Both [License
 Management](https://docs.gitlab.com/ee/user/project/merge_requests/license_management.html)
 **[ULTIMATE]** and [Dependency
-Scanning](https://docs.gitlab.com/ee/user/project/merge_requests/dependency_scanning.html)
+Scanning](https://docs.gitlab.com/ee/user/application_security/dependency_scanning/index)
 **[ULTIMATE]** should be activated on all projects to ensure new dependencies
 security status and license compatibility.
 

doc/user/application_security/dast/index.md

@@ -138,7 +138,7 @@ variables:
 
 #### Customizing the DAST settings
 
-The SAST settings can be changed through environment variables by using the
+The DAST settings can be changed through environment variables by using the
 [`variables`](../../../ci/yaml/README.md#variables) parameter in `.gitlab-ci.yml`.
 These variables are documented in the [DAST README](https://gitlab.com/gitlab-org/security-products/dast#settings).
 

doc/user/group/custom_project_templates.md

-# Custom group-level project templates **[PREMIUM ONLY]**
+# Custom group-level project templates **[PREMIUM]**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/6861) in [GitLab Premium](https://about.gitlab.com/pricing) 11.6.