Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 6 deletions

diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md
index 4f812712651..74767fe202f 100644
--- a/doc/development/documentation/styleguide/index.md
+++ b/doc/development/documentation/styleguide/index.md
@@ -112,7 +112,7 @@ features is limited by our linters, so, use regular Markdown and follow the rule
 linked style guide. You can't use Kramdown-specific markup (for example, `{:.class}`).
 
 For a complete Kramdown reference, see the
-[GitLab Markdown Guide](https://about.gitlab.com/handbook/markdown-guide/).
+[GitLab Markdown Guide](https://handbook.gitlab.com/handbook/markdown-guide/).
 
 The Markdown format is [tested](../testing.md) by using markdownlint and Vale.
 
diff --git a/doc/development/documentation/versions.md b/doc/development/documentation/versions.md
index 0168cd39f01..883de58eb46 100644
--- a/doc/development/documentation/versions.md
+++ b/doc/development/documentation/versions.md
@@ -115,13 +115,13 @@ To deprecate a page or topic:
 
    WARNING:
    This feature was [deprecated](<link-to-issue>) in GitLab 14.8
-   and is planned for removal in 15.4. Use [feature X](<link-to-issue>) instead.
+   and is planned for removal in 15.4. Use [feature X](<link-to-docs>) instead.
    ```
 
    If you're not sure when the feature will be removed or no
    replacement feature exists, you don't need to add this information.
 
-1. If the deprecation is a breaking change, add this text:
+1. If the deprecation is a [breaking change](../../update/terminology.md#breaking-change), add this text:
 
    ```markdown
    This change is a breaking change.
@@ -139,7 +139,7 @@ To deprecate a page or topic:
 
    WARNING:
    This feature was [deprecated](<link-to-issue>) in GitLab 14.8
-   and is planned for removal in 15.4. Use [feature X](<link-to-issue>) instead.
+   and is planned for removal in 15.4. Use [feature X](<link-to-docs>) instead.
 
    <!--- end_remove -->
    ```
@@ -174,7 +174,7 @@ To remove a page:
 
    This feature was [deprecated](<link-to-issue>) in GitLab X.Y
    and [removed](<link-to-issue>) in X.Y.
-   Use [feature X](<link-to-issue>) instead.
+   Use [feature X](<link-to-docs>) instead.
    ```
 
 1. Remove the page's entry from the global navigation by editing [`navigation.yaml`](https://gitlab.com/gitlab-org/gitlab-docs/blob/main/content/_data/navigation.yaml) in `gitlab-docs`.
@@ -199,7 +199,7 @@ To remove a topic:
 
    This feature was [deprecated](<link-to-issue>) in GitLab X.Y
    and [removed](<link-to-issue>) in X.Y.
-   Use [feature X](<link-to-issue>) instead.
+   Use [feature X](<link-to-docs>) instead.
 
    <!--- end_remove -->
    ```