Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/development/deprecation_guidelines/index.md b/doc/development/deprecation_guidelines/index.md
index be4a3369dcb..f4af005b849 100644
--- a/doc/development/deprecation_guidelines/index.md
+++ b/doc/development/deprecation_guidelines/index.md
@@ -33,7 +33,6 @@ https://about.gitlab.com/handbook/product/gitlab-the-product/#definitions
 - No longer tested internally.
 - Will be removed in a future major release.
 - Begins after an end-of-support date has passed.
-- Ends after all relevant code has been removed.
 
 [Announcing an End of Support period](https://about.gitlab.com/handbook/marketing/blog/release-posts/#announcing-an-end-of-support-period)
 should only be used in special circumstances and is not recommended for general use.
@@ -42,12 +41,11 @@ Most features should be deprecated and then removed.
 **Removal**:
 
 - Feature usage impossible.
+- Feature no longer supported (if End of Support period hasn't already been announced).
 - Happens in a major release in line with our
   [semantic versioning policy](../../policy/maintenance.md).
 - Begins after removal date has passed.
 
-![Deprecation, End of Support, Removal process](img/deprecation_removal_process.png)
-
 **Breaking change**:
 
 A "breaking change" is any change that requires users to make a corresponding change to their code, settings, or workflow. "Users" might be humans, API clients, or even code classes that "use" another class. Examples of breaking changes include:
@@ -58,6 +56,8 @@ A "breaking change" is any change that requires users to make a corresponding ch
 
 A breaking change can be considered major if it affects many users, or represents a significant change in behavior.
 
+![Deprecation, End of Support, Removal process](img/deprecation_removal_process.png)
+
 ## When can a feature be deprecated?
 
 Deprecations should be announced on the [Deprecated feature removal schedule](../../update/deprecations.md).