Automatic merge of gitlab-org/gitlab-ce master

doc/development/background_migrations.md

@@ -61,8 +61,8 @@ migration classes must be defined in the namespace
 
 ## Scheduling
 
-Scheduling a migration can be done in either a regular migration or a
-post-deployment migration. To do so, simply use the following code while
+Scheduling a background migration should be done in a post-deployment migration.
+To do so, simply use the following code while
 replacing the class name and arguments with whatever values are necessary for
 your migration:
 
@@ -283,10 +283,13 @@ the `services.properties` column.
 
 ## Testing
 
-It is required to write tests for background migrations' scheduling migration
-(either a regular migration or a post deployment migration), background
-migration itself and a cleanup migration. You can use the `:migration` RSpec
-tag when testing a regular / post deployment migration.
+It is required to write tests for:
+
+- The background migrations' scheduling migration.
+- The background migration itself.
+- A cleanup migration.
+
+You can use the `:migration` RSpec tag when testing the migrations.
 See [README][migrations-readme].
 
 When you do that, keep in mind that `before` and `after` RSpec hooks are going

doc/user/application_security/dast/index.md

@@ -134,7 +134,7 @@ variables:
 
 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).
+These variables are documented in [available variables](#available-variables).
 
 For example: