Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

36 files changed, 203 insertions, 97 deletions

diff --git a/data/deprecations/14-10-dependency-scanning-default-java-version.yml b/data/deprecations/14-10-dependency-scanning-default-java-version.yml
index c589f2bb3ac..1717c452891 100644
--- a/data/deprecations/14-10-dependency-scanning-default-java-version.yml
+++ b/data/deprecations/14-10-dependency-scanning-default-java-version.yml
@@ -2,7 +2,7 @@
   announcement_milestone: "14.10"
   announcement_date: "2022-04-22"
   removal_milestone: "15.0"
-  removal_date: "2021-05-22"
+  removal_date: "2022-05-22"
   breaking_change: true
   reporter: NicoleSchwartz
   body: |
diff --git a/data/deprecations/14-10-old-search-migration-removal.yml b/data/deprecations/14-10-old-search-migration-removal.yml
index d7036150059..a0074c53ffb 100644
--- a/data/deprecations/14-10-old-search-migration-removal.yml
+++ b/data/deprecations/14-10-old-search-migration-removal.yml
@@ -2,7 +2,7 @@
   announcement_milestone: "14.10"
   announcement_date: "2021-04-22"
   removal_milestone: "15.0"
-  removal_date: "2021-05-22"
+  removal_date: "2022-05-22"
   breaking_change: true
   body: |
     As Advanced Search migrations usually require support multiple code paths for a long period of time, it’s important to clean those up when we safely can. We use GitLab major version upgrades as a safe time to remove backward compatibility for indices that have not been fully migrated. See the [upgrade documentation](https://docs.gitlab.com/ee/update/index.html#upgrading-to-a-new-major-version) for details.
diff --git a/data/deprecations/14-5-certificate-based-integration-with-kubernetes.yml b/data/deprecations/14-5-certificate-based-integration-with-kubernetes.yml
index 6ab678c4199..43a071ff746 100644
--- a/data/deprecations/14-5-certificate-based-integration-with-kubernetes.yml
+++ b/data/deprecations/14-5-certificate-based-integration-with-kubernetes.yml
@@ -7,7 +7,7 @@
   body: |
     The certificate-based integration with Kubernetes [will be deprecated and removed](https://about.gitlab.com/blog/2021/11/15/deprecating-the-cert-based-kubernetes-integration/).
 
-    As a self-managed customer, we are introducing a feature flag in GitLab 15.0 so you can keep your certificate-based integration enabled. However, the feature flag will be disabled by default, so this change is a **breaking change**.
+    As a self-managed customer, we are introducing the [feature flag](../administration/feature_flags.md#enable-or-disable-the-feature) `certificate_based_clusters` in GitLab 15.0 so you can keep your certificate-based integration enabled. However, the feature flag will be disabled by default, so this change is a **breaking change**.
 
     In GitLab 16.0 we will remove both the feature and its related code. Until the final removal in 16.0, features built on this integration will continue to work, if you enable the feature flag. Until the feature is removed, GitLab will continue to fix security and critical issues as they arise.
 
diff --git a/data/deprecations/14-5-deprecate-defaultMergeCommitMessageWithDescription-graphql.yml b/data/deprecations/14-5-deprecate-defaultMergeCommitMessageWithDescription-graphql.yml
index 85cb235f445..17ce084ada6 100644
--- a/data/deprecations/14-5-deprecate-defaultMergeCommitMessageWithDescription-graphql.yml
+++ b/data/deprecations/14-5-deprecate-defaultMergeCommitMessageWithDescription-graphql.yml
@@ -10,7 +10,7 @@
   stage: create
   reporter: phikai
   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]
-  issue_url:  # (optional) This is a link to the deprecation issue in GitLab
-  documentation_url:  # (optional) This is a link to the current documentation page
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345451  # (optional) This is a link to the deprecation issue in GitLab
+  documentation_url: https://docs.gitlab.com/ee/api/graphql/removed_items.html#graphql-types  # (optional) This is a link to the current documentation page
   image_url:  # (optional) This is a link to a thumbnail image depicting the feature
   video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/data/deprecations/14-5-runner-s3-authenticationtype-nonexplicit-config-deprecation.yml b/data/deprecations/14-5-runner-s3-authenticationtype-nonexplicit-config-deprecation.yml
deleted file mode 100644
index 7026438f649..00000000000
--- a/data/deprecations/14-5-runner-s3-authenticationtype-nonexplicit-config-deprecation.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-- name: "Must explicitly assign `AuthenticationType` for `[runners.cache.s3]`"
-  announcement_milestone: "14.5"  # The milestone when this feature was first announced as deprecated.
-  announcement_date: "2021-11-22"
-  removal_milestone: "15.0"  # the milestone when this feature is planned to be removed
-  removal_date: "2022-05-22"  # the date of the milestone release when this feature is planned to be removed
-  breaking_change: true
-  body: |  # Do not modify this line, instead modify the lines below.
-    In GitLab 15.0 and later, to access the AWS S3 cache, you must specify the `AuthenticationType` for [`[runners.cache.s3]`](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnerscaches3-section). The `AuthenticationType` must be `IAM` or `credentials`.
-
-    Prior to 14.5, if you did not define the `AuthenticationType`, GitLab Runner chose a type for you.
-  stage: Verify
-  tiers: [Core, Premium, Ultimate]
-  issue_url: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/28171
-  documentation_url: https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnerscaches3-section
diff --git a/data/deprecations/14-8-ci-build-variables.yml b/data/deprecations/14-8-ci-build-variables.yml
index a87c6a2fa17..dba841841f2 100644
--- a/data/deprecations/14-8-ci-build-variables.yml
+++ b/data/deprecations/14-8-ci-build-variables.yml
@@ -1,6 +1,6 @@
 - name: "`CI_BUILD_*` predefined variables"
   announcement_milestone: "14.8"
-  announcement_date: "2021-02-22"
+  announcement_date: "2022-02-22"
   removal_milestone: "16.0"
   removal_date: "2023-04-22"
   breaking_change: true
diff --git a/data/deprecations/14-8-compliance-required-pipeline-configuration-premium.yml b/data/deprecations/14-8-compliance-required-pipeline-configuration-premium.yml
index 104dbc5f72d..aabd330d567 100644
--- a/data/deprecations/14-8-compliance-required-pipeline-configuration-premium.yml
+++ b/data/deprecations/14-8-compliance-required-pipeline-configuration-premium.yml
@@ -1,6 +1,6 @@
 - name: "Required pipeline configurations in Premium tier"
   announcement_milestone: "14.8"
-  announcement_date: "2021-02-22"
+  announcement_date: "2022-02-22"
   removal_milestone: "15.0"
   removal_date: "2022-05-22"
   breaking_change: true
diff --git a/data/deprecations/14-8-compliance-status-check-api-field.yml b/data/deprecations/14-8-compliance-status-check-api-field.yml
index b98dab9e905..ba8c84343bd 100644
--- a/data/deprecations/14-8-compliance-status-check-api-field.yml
+++ b/data/deprecations/14-8-compliance-status-check-api-field.yml
@@ -1,6 +1,6 @@
 - name: "External status check API breaking changes"
   announcement_milestone: "14.8"
-  announcement_date: "2021-02-22"
+  announcement_date: "2022-02-22"
   removal_milestone: "15.0"
   removal_date: "2022-05-22"
   breaking_change: true
diff --git a/data/deprecations/14-8-remove-support-for-fixup-in-commit-message-triggering-draft-status.yml b/data/deprecations/14-8-remove-support-for-fixup-in-commit-message-triggering-draft-status.yml
deleted file mode 100644
index f738b71f1b7..00000000000
--- a/data/deprecations/14-8-remove-support-for-fixup-in-commit-message-triggering-draft-status.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- name: "`fixup!` commit messages setting draft status of associated Merge Request"  # 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
-  removal_date: "2022-06-22"  # This should almost always be the 22nd of a month (YYYY-MM-22), the date of the milestone release when this feature is planned to be removed.
-  body: |  # Do not modify this line, instead modify the lines below.
-    The use of `fixup!` as a commit message to trigger draft status
-    of the associated Merge Request is generally unused, and can cause
-    confusion with other uses of the term. "Draft" is the preferred
-    and supported trigger for triggering draft status from commit
-    messages, as part of our streamlining of the feature.
-    Support for `fixup!` is now considered deprecated, and will be
-    removed in GitLab 15.0.
-  documentation_url: "https://docs.gitlab.com/ee/user/project/merge_requests/drafts.html#mark-merge-requests-as-drafts"
-  issue_url: "https://gitlab.com/gitlab-org/gitlab/-/issues/342937"
diff --git a/data/deprecations/14-8-request-profiling.yml b/data/deprecations/14-8-request-profiling.yml
index 82d2aadd149..ea3833d98ef 100644
--- a/data/deprecations/14-8-request-profiling.yml
+++ b/data/deprecations/14-8-request-profiling.yml
@@ -1,6 +1,6 @@
 - name: "Request profiling"
   announcement_milestone: "14.8"
-  announcement_date: "2021-02-22"
+  announcement_date: "2022-02-22"
   removal_milestone: "15.0"
   removal_date: "2022-05-22"
   breaking_change: true
diff --git a/data/deprecations/14-8-secure-and-protect-analyzer-bump.yml b/data/deprecations/14-8-secure-and-protect-analyzer-bump.yml
index b8eedeeaadb..dafa8b4cdc7 100644
--- a/data/deprecations/14-8-secure-and-protect-analyzer-bump.yml
+++ b/data/deprecations/14-8-secure-and-protect-analyzer-bump.yml
@@ -11,7 +11,7 @@
     - Those released prior to May 22, 2022, which generate reports that _are not_ subject to stringent schema validation.
     - Those released after May 22, 2022, which generate reports that _are_ subject to stringent schema validation.
 
-    If you are not using the default inclusion templates, or have pinned your analyzer version(s) you will need to update your CI/CD job definition to either remove the pinned version or to update the latest major version.
+    If you are not using the default inclusion templates, or have pinned your analyzer versions you will need to update your CI/CD job definition to either remove the pinned version or to update the latest major version.
     Users of GitLab 12.0-14.10 will continue to experience analyzer updates as normal until the release of GitLab 15.0, following which all newly fixed bugs and newly released features in the new major versions of the analyzers will not be available in the deprecated versions because we do not backport bugs and new features as per our [maintenance policy](https://docs.gitlab.com/ee/policy/maintenance.html). As required security patches will be backported within the latest 3 minor releases.
     Specifically, the following are being deprecated and will no longer be updated after 15.0 GitLab release:
 
diff --git a/data/deprecations/14-8-secure-ca-python-deprecation.yml b/data/deprecations/14-8-secure-ca-python-deprecation.yml
index c97271e4db2..21b3b01a590 100644
--- a/data/deprecations/14-8-secure-ca-python-deprecation.yml
+++ b/data/deprecations/14-8-secure-ca-python-deprecation.yml
@@ -2,7 +2,7 @@
   announcement_milestone: "14.8"  # The milestone when this feature was first announced as deprecated.
   announcement_date: "2021-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
-  removal_date: "2021-05-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_date: "2022-05-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.
   breaking_change: true  # If this deprecation is a breaking change, set this value to true
   body: |  # Do not modify this line, instead modify the lines below.
     For those using Dependency Scanning for Python projects, we are deprecating the default `gemnasium-python:2` image which uses Python 3.6 as well as the custom `gemnasium-python:2-python-3.9` image which uses Python 3.9. The new default image as of GitLab 15.0 will be for Python 3.9 as it is a [supported version](https://endoflife.date/python) and 3.6 [is no longer supported](https://endoflife.date/python).
diff --git a/data/deprecations/14-9-background-upload.yml b/data/deprecations/14-9-background-upload.yml
index 337d5f89c77..ae9b1bd9a4a 100644
--- a/data/deprecations/14-9-background-upload.yml
+++ b/data/deprecations/14-9-background-upload.yml
@@ -6,7 +6,7 @@
   breaking_change: true
   reporter: fzimmer
   body: |  # Do not modify this line, instead modify the lines below.
-    To reduce the overall complexity and maintenance burden of GitLab's [object storage feature](https://docs.gitlab.com/ee/administration/object_storage.html), support for using `background_upload` to upload files is deprecated and will be fully removed in GitLab 15.0.
+    To reduce the overall complexity and maintenance burden of GitLab's [object storage feature](https://docs.gitlab.com/ee/administration/object_storage.html), support for using `background_upload` to upload files is deprecated and will be fully removed in GitLab 15.0. Review the [15.0 specific changes](https://docs.gitlab.com/omnibus/update/gitlab_15_changes.html) for the [removed background uploads settings for object storage](https://docs.gitlab.com/omnibus/update/gitlab_15_changes.html#removed-background-uploads-settings-for-object-storage).
 
     This impacts a small subset of object storage providers:
 
diff --git a/data/deprecations/15-1-deprecate-maintainer_note.yml b/data/deprecations/15-1-deprecate-maintainer_note.yml
new file mode 100644
index 00000000000..9656e62f3db
--- /dev/null
+++ b/data/deprecations/15-1-deprecate-maintainer_note.yml
@@ -0,0 +1,17 @@
+- name: "REST API Runner maintainer_note"  # (required) The name of the feature to be deprecated
+  announcement_milestone: "15.1"  # (required) The milestone when this feature was first announced as deprecated.
+  announcement_date: "2022-06-22"  # (required) 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: "16.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2023-05-22"  # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
+  reporter: pedropombeiro  # (required) GitLab username of the person reporting the deprecation
+  stage: Verify  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/363192  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    The `maintainer_note` argument in the `POST /runners` REST endpoint was deprecated in  GitLab 14.8 and replaced with the `maintenance_note` argument.
+    The `maintainer_note` argument will be removed in GitLab 16.0.
+# The following items are not published on the docs page, but may be used in the future.
+  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]
+  documentation_url: https://docs.gitlab.com/ee/api/runners.html#register-a-new-runner  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/data/deprecations/15-1-jira-github-enterprise-dvcs.yml b/data/deprecations/15-1-jira-github-enterprise-dvcs.yml
new file mode 100644
index 00000000000..ac8b630c1ff
--- /dev/null
+++ b/data/deprecations/15-1-jira-github-enterprise-dvcs.yml
@@ -0,0 +1,16 @@
+- name: "Jira GitHub Enterprise DVCS integration"  # The name of the feature to be deprecated
+  announcement_milestone: "15.1"  # The milestone when this feature was first announced as deprecated.
+  announcement_date: "2022-06-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: "16.0"  # The milestone when this feature is planned to be removed
+  removal_date: "2023-05-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.
+  breaking_change: true  # If this deprecation is a breaking change, set this value to true
+  body: |  # Do not modify this line, instead modify the lines below.
+    The [Jira DVCS Connector](https://docs.gitlab.com/ee/integration/jira/dvcs.html) (which enables the [Jira Development Panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/)), will no longer support Jira Cloud users starting with GitLab 16.0. The [GitLab for Jira App](https://docs.gitlab.com/ee/integration/jira/connect-app.html) has always been recommended for Jira Cloud users, and it will be required instead of the DVCS connector. If you are a Jira Cloud user, we recommended you begin migrating to the GitLab for Jira App.
+    Any Jira Server and Jira Data Center users will need to confirm they are not using the GitHub Enterprise Connector to enable the GitLab DVCS integration, but they may continue to use the [native GitLab DVCS integration](https://docs.gitlab.com/ee/integration/jira/dvcs.html) (supported in Jira 8.14 and later).
+# The following items are not published on the docs page, but may be used in the future.
+  stage: Ecosystem  # (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]
+  issue_url: https://gitlab.com/groups/gitlab-org/-/epics/7508  # (optional) This is a link to the deprecation issue in GitLab
+  documentation_url: https://docs.gitlab.com/ee/integration/jira/dvcs.html  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/data/deprecations/15-1-pipelinesecurityreportfinding-name.yml b/data/deprecations/15-1-pipelinesecurityreportfinding-name.yml
new file mode 100644
index 00000000000..bc2df85c1c5
--- /dev/null
+++ b/data/deprecations/15-1-pipelinesecurityreportfinding-name.yml
@@ -0,0 +1,16 @@
+- name: "PipelineSecurityReportFinding name GraphQL field"  # (required) The name of the feature to be deprecated
+  announcement_milestone: "15.1"  # (required) The milestone when this feature was first announced as deprecated.
+  announcement_date: "2022-06-22"  # (required) 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: "16.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2023-05-22"  # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
+  reporter: matt_wilson  # (required) GitLab username of the person reporting the deprecation
+  stage: Secure  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/346335  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    Previously, the [PipelineSecurityReportFinding GraphQL type was updated](https://gitlab.com/gitlab-org/gitlab/-/issues/335372) to include a new `title` field. This field is an alias for the current `name` field, making the less specific `name` field redundant. The `name` field will be removed from the PipelineSecurityReportFinding type in GitLab 16.0.
+# The following items are not published on the docs page, but may be used in the future.
+  tiers: Ultimate  # (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]
+  documentation_url:  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/data/deprecations/15-1-pipelinesecurityreportfinding-projectfingerprint.yml b/data/deprecations/15-1-pipelinesecurityreportfinding-projectfingerprint.yml
new file mode 100644
index 00000000000..511f691f6bb
--- /dev/null
+++ b/data/deprecations/15-1-pipelinesecurityreportfinding-projectfingerprint.yml
@@ -0,0 +1,16 @@
+- name: "PipelineSecurityReportFinding projectFingerprint GraphQL field"  # (required) The name of the feature to be deprecated
+  announcement_milestone: "15.1"  # (required) The milestone when this feature was first announced as deprecated.
+  announcement_date: "2022-06-22"  # (required) 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: "16.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2023-05-22"  # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
+  reporter: matt_wilson  # (required) GitLab username of the person reporting the deprecation
+  stage: Secure  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343475  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    The [`project_fingerprint`](https://gitlab.com/groups/gitlab-org/-/epics/2791) attribute of vulnerability findings is being deprecated in favor of a `uuid` attribute. By using UUIDv5 values to identify findings, we can easily associate any related entity with a finding. The `project_fingerprint` attribute is no longer being used to track findings, and will be removed in GitLab 16.0.
+# The following items are not published on the docs page, but may be used in the future.
+  tiers: Ultimate  # (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]
+  documentation_url:  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/data/deprecations/15-1-project-pipeline-securityReportFindings.yml b/data/deprecations/15-1-project-pipeline-securityReportFindings.yml
new file mode 100644
index 00000000000..3d93c94770b
--- /dev/null
+++ b/data/deprecations/15-1-project-pipeline-securityReportFindings.yml
@@ -0,0 +1,16 @@
+- name: "project.pipeline.securityReportFindings GraphQL query"  # (required) The name of the feature to be deprecated
+  announcement_milestone: "15.1"  # (required) The milestone when this feature was first announced as deprecated.
+  announcement_date: "2022-06-22"  # (required) 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: "16.0"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2023-05-22"  # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  breaking_change: true  # (required) If this deprecation is a breaking change, set this value to true
+  reporter: matt_wilson  # (required) GitLab username of the person reporting the deprecation
+  stage: Secure  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343475  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    Previous work helped [align the vulnerabilities calls for pipeline security tabs](https://gitlab.com/gitlab-org/gitlab/-/issues/343469) to match the vulnerabilities calls for project-level and group-level vulnerability reports. This helped the frontend have a more consistent interface. The old `project.pipeline.securityReportFindings` query was formatted differently than other vulnerability data calls. Now that it has been replaced with the new `project.pipeline.vulnerabilities` field, the old `project.pipeline.securityReportFindings` is being deprecated and will be removed in GitLab 16.0.
+# The following items are not published on the docs page, but may be used in the future.
+  tiers: Ultimate  # (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]
+  documentation_url:  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/data/deprecations/15-3-deprecation-vulnerability-report-tool-sort.yml b/data/deprecations/15-3-deprecation-vulnerability-report-tool-sort.yml
new file mode 100644
index 00000000000..326070667f2
--- /dev/null
+++ b/data/deprecations/15-3-deprecation-vulnerability-report-tool-sort.yml
@@ -0,0 +1,19 @@
+- name: "Vulnerability Report sort by Tool"  # (required) The name of the feature to be deprecated
+  announcement_milestone: "15.1"  # (required) The milestone when this feature was first announced as deprecated.
+  announcement_date: "2022-06-22"  # (required) 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.3"  # (required) The milestone when this feature is planned to be removed
+  removal_date: "2022-08-22"  # (required) The date of the milestone release when this feature is planned to be removed. This should almost always be the 22nd of a month (YYYY-MM-22), unless you did an out of band blog post.
+  breaking_change: false  # (required) If this deprecation is a breaking change, set this value to true
+  reporter: matt_wilson  # (required) GitLab username of the person reporting the deprecation
+  stage: Secure  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362962  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    The ability to sort the Vulnerability Report by the `Tool` column (scan type) was disabled and put behind a feature flag in GitLab 14.10 due to a refactor
+    of the underlying data model. The feature flag has remained off by default as further refactoring will be required to ensure sorting
+    by this value remains performant. Due to very low usage of the `Tool` column for sorting, the feature flag will instead be removed in
+    GitLab 15.3 to simplify the codebase and prevent any unwanted performance degradation.
+# The following items are not published on the docs page, but may be used in the future.
+  tiers: Ultimate  # (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]
+  documentation_url:  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/data/deprecations/distribution_deprecations_14-4.yml b/data/deprecations/distribution_deprecations_14-4.yml
index 5b7163d5b4d..e54108d2947 100644
--- a/data/deprecations/distribution_deprecations_14-4.yml
+++ b/data/deprecations/distribution_deprecations_14-4.yml
@@ -1,6 +1,6 @@
 - name: "Move `custom_hooks_dir` setting from GitLab Shell to Gitaly"  # The name of the feature to be deprecated
   announcement_milestone: "14.9"  # The milestone when this feature was first announced as deprecated.
-  announcement_date: "2021-10-22"
+  announcement_date: "2022-03-22"
   removal_milestone: "15.0"  # the milestone when this feature is planned to be removed
   removal_date: "2022-05-22"
   body: |  # Do not modify this line, instead modify the lines below.
diff --git a/data/deprecations/templates/_deprecation_template.md.erb b/data/deprecations/templates/_deprecation_template.md.erb
index 46eb152d86a..7c11e6706ba 100644
--- a/data/deprecations/templates/_deprecation_template.md.erb
+++ b/data/deprecations/templates/_deprecation_template.md.erb
@@ -4,15 +4,7 @@ group: none
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments-to-development-guidelines"
 ---
 
-# Deprecations by milestone
-
-DISCLAIMER:
-This page contains information related to upcoming products, features, and functionality.
-It is important to note that the information presented is for informational purposes only.
-Please do not rely on this information for purchasing or planning purposes.
-As with all projects, the items mentioned on this page are subject to change or delay.
-The development, release, and timing of any products, features, or functionality remain at the
-sole discretion of GitLab Inc.
+# Deprecations by version
 
 <!-- vale off -->
 
@@ -38,33 +30,41 @@ For deprecation reviewers (Technical Writers only):
 
 {::options parse_block_html="true" /}
 
-View deprecations by the product versions in which they were announced.
-
-Each deprecation has a **planned removal milestone** and indicates whether it is a breaking change.
+In each release, GitLab announces features that are deprecated and no longer recommended for use.
+Each deprecated feature will be removed in a future release.
+Some features cause breaking changes when they are removed.
 
-Most of the deprecations are **planned for removal in 15.0**, and many of them are **breaking changes**.
+DISCLAIMER:
+This page contains information related to upcoming products, features, and functionality.
+It is important to note that the information presented is for informational purposes only.
+Please do not rely on this information for purchasing or planning purposes.
+As with all projects, the items mentioned on this page are subject to change or delay.
+The development, release, and timing of any products, features, or functionality remain at the
+sole discretion of GitLab Inc.
 <div class="js-deprecation-filters"></div>
 <% if milestones.any? -%>
   <%- milestones.each do |milestone| %>
 <div class="announcement-milestone">
 
-## <%= milestone %>
+## Announced in <%= milestone %>
     <%- entries.select{|d| d["announcement_milestone"] == milestone}.each do |deprecation| %>
 <div class="deprecation removal-<%= deprecation["removal_milestone"].gsub('.', '') %><% if deprecation["breaking_change"] -%> breaking-change<% end %>">
 
 ### <%= deprecation["name"]%>
+
+<% if deprecation["end_of_support_milestone"] -%>
+End of Support: GitLab <span class="removal-milestone"><%= deprecation["end_of_support_milestone"]%></span> (<%= deprecation["end_of_support_date"]%>)
+<% end -%>
+Planned removal: GitLab <span class="removal-milestone"><%= deprecation["removal_milestone"]%></span> (<%= deprecation["removal_date"]%>)
 <% if deprecation["breaking_change"] -%>
 
 WARNING:
-This feature will be changed or removed in <%= deprecation["removal_milestone"]%>
-as a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
-Before updating GitLab, review the details carefully to determine if you need to make any
-changes to your code, settings, or workflow.
+This is a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
+Review the details carefully before upgrading.
 
 <%= deprecation["body"] -%><% else %>
 <%= deprecation["body"] -%><% end %><%- if deprecation["removal_milestone"] -%>
 
-**Planned removal milestone: <span class="removal-milestone"><%= deprecation["removal_milestone"]%></span> (<%= deprecation["removal_date"]%>)**
 </div>
       <%- end -%>
     <%- end -%>
diff --git a/data/deprecations/templates/example.yml b/data/deprecations/templates/example.yml
index 190235b0e3c..c69ebe2c768 100644
--- a/data/deprecations/templates/example.yml
+++ b/data/deprecations/templates/example.yml
@@ -1,15 +1,22 @@
-# This is a template for a feature deprecation
-# A deprecation typically occurs when a feature or capability is planned to be removed in a future release.
-# Deprecations should be announced at least two releases prior to removal.  Any breaking changes should only be done in major releases.
+# This is a template for a feature deprecation.
 #
-# Below is an example of what a single entry should look like, it's required attributes,
-# and what types we expect those attribute values to be.
+# Please refer to the deprecation guidelines to confirm your understanding of GitLab's definitions.
+# https://docs.gitlab.com/ee/development/deprecation_guidelines/#terminology
+#
+# Deprecations must be announced at least three releases prior to removal.
+#
+# If an End of Support period applies, the announcement should be shared with GitLab Support
+# in the `#spt_managers` on Slack and mention `@gitlab-com/support` in this MR.
+#
+# Breaking changes must happen in a major release.
 #
 # For more information please refer to the handbook documentation here:
 # https://about.gitlab.com/handbook/marketing/blog/release-posts/#deprecations
 #
 # Please delete this line and above before submitting your merge request.
-
+#
+# REQUIRED FIELDS
+#
 - name: "Feature name"  # (required) The name of the feature to be deprecated
   announcement_milestone: "XX.YY"  # (required) The milestone when this feature was first announced as deprecated.
   announcement_date: "YYYY-MM-DD"  # (required) 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.
@@ -27,7 +34,11 @@
     When ready, assign to your tech writer for review. When ready, they will run `bin/rake gitlab:docs:compile_deprecations` to update the deprecations doc, then merge.
 
     END OF BODY COMMENT -->
-# The following items are not published on the docs page, but may be used in the future.
+#
+# OPTIONAL FIELDS
+#
+  end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  end_of_support_date:  # (optional) The date of the milestone release when support for this feature will end.
   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]
   documentation_url:  # (optional) This is a link to the current documentation page
   image_url:  # (optional) This is a link to a thumbnail image depicting the feature
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-merge-commit-message.yml b/data/removals/15_0/15-0-merge-commit-message.yml
new file mode 100644
index 00000000000..ff6acd62304
--- /dev/null
+++ b/data/removals/15_0/15-0-merge-commit-message.yml
@@ -0,0 +1,16 @@
+- name: "`defaultMergeCommitMessageWithDescription` GraphQL API field"
+  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
+  removal_date: "2022-05-22"  # the date of the milestone release when this feature is planned to be removed
+  breaking_change: true  # (required) Change to true if this removal is a breaking change.
+  reporter: phikai  # (required) GitLab username of the person reporting the removal
+  stage: create  # (required) String value of the stage that the feature was created in. e.g., Growth
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345451  # (required) Link to the deprecation issue in GitLab
+  body: |  # (required) Do not modify this line, instead modify the lines below.
+    The GraphQL API field `defaultMergeCommitMessageWithDescription` has been removed in GitLab 15.0. For projects with a commit message template set, it will ignore the template.
+# The following items are not published on the docs page, but may be used in the future.
+  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]
+  documentation_url: https://docs.gitlab.com/ee/api/graphql/removed_items.html#graphql-types  # (optional) This is a link to the current documentation page
+  image_url:  # (optional) This is a link to a thumbnail image depicting the feature
+  video_url:  # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
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-runner_api_new_stale_status_breaking_change.yml b/data/removals/15_0/15-0-runner_api_new_stale_status_breaking_change.yml
index 905bc3befce..182c492f17b 100644
--- a/data/removals/15_0/15-0-runner_api_new_stale_status_breaking_change.yml
+++ b/data/removals/15_0/15-0-runner_api_new_stale_status_breaking_change.yml
@@ -5,12 +5,12 @@
   removal_date: "2022-05-22"
   breaking_change: true
   body: |  # Do not modify this line, instead modify the lines below.
-    A breaking change was made to the Runner [API](https://docs.gitlab.com/ee/api/runners.html#runners-api) endpoints
-    in 15.0.
+    The Runner [API](https://docs.gitlab.com/ee/api/runners.html#runners-api) endpoints have changed in 15.0.
 
-    Instead of the GitLab Runner API endpoints returning `offline` and `not_connected` for runners that have not
-    contacted the GitLab instance in the past three months, the API endpoints now return the `stale` value,
-    which was introduced in 14.6.
+    If a runner has not contacted the GitLab instance in more than three months, the API returns `stale` instead of `offline` or `not_connected`.
+    The `stale` status was introduced in 14.6.
+
+    The `not_connected` status is no longer valid. It was replaced with `never_contacted`. Available statuses are `online`, `offline`, `stale`, and `never_contacted`.
   stage: Verify
   tiers: [Core, Premium, Ultimate]
   issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/347303
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
diff --git a/data/removals/templates/_removal_template.md.erb b/data/removals/templates/_removal_template.md.erb
index 5243f4fdcd8..8bee1d69e42 100644
--- a/data/removals/templates/_removal_template.md.erb
+++ b/data/removals/templates/_removal_template.md.erb
@@ -4,7 +4,10 @@ group: none
 info: "See the Technical Writers assigned to Development Guidelines: https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments-to-development-guidelines"
 ---
 
-# Removals by milestone
+# Removals by version
+
+In each release, GitLab removes features that were deprecated in an earlier release.
+Some features cause breaking changes when they are removed.
 
 <!-- vale off -->
 
@@ -29,19 +32,17 @@ For removal reviewers (Technical Writers only):
 -->
 <% if milestones.any? -%>
   <%- milestones.each do |milestone| %>
-## <%= milestone %>
+## Removed in <%= milestone %>
     <%- entries.select{|entry| entry["removal_milestone"] == milestone}.each do |removal| %>
 ### <%= removal["name"]%>
 <% if removal["breaking_change"] -%>
 
 WARNING:
-This feature was changed or removed in <%= removal["removal_milestone"]%>
-as a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
-Before updating GitLab, review the details carefully to determine if you need to make any
-changes to your code, settings, or workflow.
+This is a [breaking change](https://docs.gitlab.com/ee/development/contributing/#breaking-changes).
+Review the details carefully before upgrading.
 
 <%= removal["body"] -%><% else %>
 <%= removal["body"] -%><% end %><%- end -%><%- end -%>
 <%- else -%>
-Features scheduled for removal will be listed here, sorted by GitLab milestone.
+Features scheduled for removal will be listed here, sorted by GitLab version.
 <% end -%>
diff --git a/data/removals/templates/example.yml b/data/removals/templates/example.yml
index b6c3c75d496..3674583cd7d 100644
--- a/data/removals/templates/example.yml
+++ b/data/removals/templates/example.yml
@@ -1,14 +1,17 @@
-# This is a template for a feature removal
-# Generally, a feature or configuration should be removed in a major release.
-# It should be announced at least 2 releases prior to being removed.
+# This is a template for a feature removal.
 #
-# Below is an example of a removal.
+# Please refer to the deprecation guidelines to confirm your understanding of GitLab's definitions.
+# https://docs.gitlab.com/ee/development/deprecation_guidelines/#terminology
+#
+# If this removal is a breaking change, it must take place in a major release.
 #
 # For more information please refer to the handbook documentation here:
 # https://about.gitlab.com/handbook/marketing/blog/release-posts/#removals
 #
 # Please delete this line and above before submitting your merge request.
-
+#
+# REQUIRED FIELDS
+#
 - name: "Feature name"  # (required) the name of the feature being removed. Avoid the words `deprecation`, `deprecate`, `removal`, and `remove` in this field because these are implied.
   announcement_milestone: "XX.YY"  # (required) The milestone when this feature was deprecated.
   announcement_date: "YYYY-MM-DD"  # (required) 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.
@@ -26,7 +29,11 @@
     When ready, assign to your tech writer for review. When ready, they will run `bin/rake gitlab:docs:compile_removals` to update the removals doc, then merge.
 
     END OF BODY COMMENT -->
-# The following items are not published on the docs page, but may be used in the future.
+#
+# OPTIONAL FIELDS
+#
+  end_of_support_milestone:  # (optional) Use "XX.YY" format. The milestone when support for this feature will end.
+  end_of_support_date:  # (optional) The date of the milestone release when support for this feature will end.
   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]
   documentation_url:  # (optional) This is a link to the current documentation page
   image_url:  # (optional) This is a link to a thumbnail image depicting the feature
diff --git a/data/whats_new/templates/YYYYMMDD0001_XX_YY.yml b/data/whats_new/templates/YYYYMMDD0001_XX_YY.yml
index 0e34b37a32b..31d2312809d 100644
--- a/data/whats_new/templates/YYYYMMDD0001_XX_YY.yml
+++ b/data/whats_new/templates/YYYYMMDD0001_XX_YY.yml
@@ -25,7 +25,7 @@
   stage:  # String value of the stage that the feature was created in. e.g., Growth
   self-managed:  # Boolean value (true or false)
   gitlab-com:  # Boolean value (true or false)
-  packages:  # Array of strings. The Array brackets are required here. e.g., [Core, Starter, Premium, Ultimate]
+  packages:  # Array of strings. The Array brackets are required here. e.g., [Free, Premium, Ultimate]
   url:  # This is the documentation URL, but can be a URL to a video if there is one
   image_url:  # This should be a full URL, generally taken from the release post content. If a video, use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
   published_at:  # YYYY-MM-DD