Add latest changes from gitlab-org/gitlab@master

9 files changed, 10 insertions, 10 deletions

diff --git a/data/removals/15_0/15-0-database-deprecate-legacy-database-conf.yml b/data/removals/15_0/15-0-database-deprecate-legacy-database-conf.yml
index c9c64de7aff..37595f8808d 100644
--- a/data/removals/15_0/15-0-database-deprecate-legacy-database-conf.yml
+++ b/data/removals/15_0/15-0-database-deprecate-legacy-database-conf.yml
@@ -1,4 +1,4 @@
-- name: "Support for legacy format of `config/database.yml` removed"
+- name: "Support for legacy format of `config/database.yml`"
   announcement_milestone: "14.3"
   announcement_date: "2021-09-22"
   removal_milestone: "15.0"
diff --git a/data/removals/15_0/15-0-geo-remove-promote-to-primary-node.yml b/data/removals/15_0/15-0-geo-remove-promote-to-primary-node.yml
index becc7b26b9a..1eb0c1658a2 100644
--- a/data/removals/15_0/15-0-geo-remove-promote-to-primary-node.yml
+++ b/data/removals/15_0/15-0-geo-remove-promote-to-primary-node.yml
@@ -1,4 +1,4 @@
-- name: "Remove `promote-to-primary-node` command from `gitlab-ctl`"
+- name: "`promote-to-primary-node` command from `gitlab-ctl`"
   announcement_milestone: "14.5"
   announcement_date: "2021-11-22"
   removal_milestone: "15.0"
diff --git a/data/removals/15_0/15-0-remove-dependency-proxy-feature-flag.yml b/data/removals/15_0/15-0-remove-dependency-proxy-feature-flag.yml
index 1d43573bb22..577789e7fd2 100644
--- a/data/removals/15_0/15-0-remove-dependency-proxy-feature-flag.yml
+++ b/data/removals/15_0/15-0-remove-dependency-proxy-feature-flag.yml
@@ -1,4 +1,4 @@
-- name: "Remove dependency_proxy_for_private_groups feature flag"  # The name of the feature to be deprecated
+- name: "`dependency_proxy_for_private_groups` feature flag"  # The name of the feature to be deprecated
   announcement_milestone: "14.5"  # The milestone when this feature was first announced as deprecated.
   announcement_date: "2021-11-22"  # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   removal_milestone: "15.0"  # The milestone when this feature is planned to be removed
diff --git a/data/removals/15_0/15-0-remove-versions-packagetype.yml b/data/removals/15_0/15-0-remove-versions-packagetype.yml
index cfce5d8a226..de45444b64a 100644
--- a/data/removals/15_0/15-0-remove-versions-packagetype.yml
+++ b/data/removals/15_0/15-0-remove-versions-packagetype.yml
@@ -1,4 +1,4 @@
-- name: "Remove Versions from PackageType"
+- name: "Versions from `PackageType`"
   announcement_milestone: "14.5"  # The milestone when this feature was first announced as deprecated.
   announcement_date: "2021-11-22"  # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   removal_milestone: "15.0"  # The milestone when this feature is planned to be removed
diff --git a/data/removals/15_0/15-0-remove_ff_push_rules_supersede_code_owners.yml b/data/removals/15_0/15-0-remove_ff_push_rules_supersede_code_owners.yml
index b88b6a3f38f..61a482fe73f 100644
--- a/data/removals/15_0/15-0-remove_ff_push_rules_supersede_code_owners.yml
+++ b/data/removals/15_0/15-0-remove_ff_push_rules_supersede_code_owners.yml
@@ -1,4 +1,4 @@
-- name: "Removed feature flag PUSH_RULES_SUPERSEDE_CODE_OWNERS"  # The name of the feature to be deprecated
+- name: "`push_rules_supersede_code_owners` feature flag"  # The name of the feature to be deprecated
   announcement_milestone: "14.8"  # The milestone when this feature was first announced as deprecated.
   announcement_date: "2022-02-22"  # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   removal_milestone: "15.0"  # The milestone when this feature is planned to be removed
@@ -6,7 +6,7 @@
   breaking_change: true  # If this deprecation is a breaking change, set this value to true
   reporter: tlinz  # GitLab username of the person reporting the deprecation
   body: |  # Do not modify this line, instead modify the lines below.
-    The feature flag `PUSH_RULES_SUPERSEDE_CODE_OWNERS` has been removed in GitLab 15.0. From now on, push rules will supersede CODEOWNERS. The CODEOWNERS feature is no longer available for access control.
+    The `push_rules_supersede_code_owners` feature flag has been removed in GitLab 15.0. From now on, push rules will supersede the `CODEOWNERS` file. The code owners feature is no longer available for access control.
 # The following items are not published on the docs page, but may be used in the future.
   stage: create  # (optional - may be required in the future) String value of the stage that the feature was created in. e.g., Growth
   tiers:  # (optional - may be required in the future) An array of tiers that the feature is available in currently.  e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
diff --git a/data/removals/15_0/15-0-tracing.yml b/data/removals/15_0/15-0-tracing.yml
index b2ad2e525c0..1e99bd4cb3c 100644
--- a/data/removals/15_0/15-0-tracing.yml
+++ b/data/removals/15_0/15-0-tracing.yml
@@ -1,4 +1,4 @@
-- name: "Jaeger integration removed in GitLab 15.0"  # The headline announcing the removal. i.e. "`CI_PROJECT_CONFIG_PATH` removed in Gitlab 14.0"
+- name: "Jaeger integration"  # The headline announcing the removal. i.e. "`CI_PROJECT_CONFIG_PATH` removed in Gitlab 14.0"
   announcement_milestone: "14.7"  # The milestone when this feature was first announced as deprecated.
   announcement_date: "2022-01-22"
   removal_milestone: "15.0"  # The milestone when this feature is being removed.
diff --git a/data/removals/15_0/15-0-type.yml b/data/removals/15_0/15-0-type.yml
index bb1b764f823..c80efadc008 100644
--- a/data/removals/15_0/15-0-type.yml
+++ b/data/removals/15_0/15-0-type.yml
@@ -1,4 +1,4 @@
-- name: "Remove `type` and `types` keyword from CI/CD configuration"
+- name: "`type` and `types` keyword from CI/CD configuration"
   announcement_milestone: "14.6"
   announcement_date: "2021-12-22"
   removal_milestone: "15.0"
diff --git a/data/removals/15_0/15_0-logging.yml b/data/removals/15_0/15_0-logging.yml
index 2cff8f39e19..984ffbb0917 100644
--- a/data/removals/15_0/15_0-logging.yml
+++ b/data/removals/15_0/15_0-logging.yml
@@ -1,4 +1,4 @@
-- name: "ELK stack logging removed in GitLab 15.0"  # The headline announcing the removal. i.e. "`CI_PROJECT_CONFIG_PATH` removed in Gitlab 14.0"
+- name: "ELK stack logging"  # The headline announcing the removal. i.e. "`CI_PROJECT_CONFIG_PATH` removed in Gitlab 14.0"
   announcement_milestone: "14.7"  # The milestone when this feature was deprecated.
   announcement_date: "2022-01-22"  # The date of the milestone release when this feature was deprecated. This should almost always be the 22nd of a month (YYYY-MM-DD), unless you did an out of band blog post.
   removal_milestone: "15.0"  # The milestone when this feature is being removed.
diff --git a/data/removals/15_0/15_0-remove-pipelines-from-version-field.yml b/data/removals/15_0/15_0-remove-pipelines-from-version-field.yml
index 46bb76b19e1..df0c4c74e2e 100644
--- a/data/removals/15_0/15_0-remove-pipelines-from-version-field.yml
+++ b/data/removals/15_0/15_0-remove-pipelines-from-version-field.yml
@@ -1,4 +1,4 @@
-- name: "Remove pipelines field from the version field"  # The name of the feature to be deprecated
+- name: "Pipelines field from the version field"  # The name of the feature to be deprecated
   announcement_milestone: "14.5"  # The milestone when this feature was first announced as deprecated.
   announcement_date: "2021-11-22"  # The date of the milestone release when this feature was first announced as deprecated. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
   removal_milestone: "15.0"  # The milestone when this feature is planned to be removed