Merge branch 'docs-delete-redirects-3' into 'master'

Delete redirect files in docs

See merge request gitlab-org/gitlab!56169

doc/.vale/gitlab/Admin.yml

@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: substitution
 message: 'Verify this use of the word "admin". Can it be updated to "administration", "administrator", "administer", or "Admin Area"?'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html
 level: suggestion
 ignorecase: true
 swap:

doc/.vale/gitlab/AlertBoxStyle.yml

@@ -10,7 +10,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Alert box "%s" must use the formatting in the style guide.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#alert-boxes
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#alert-boxes
 level: error
 nonword: true
 scope: raw

doc/development/documentation/styleguide.md

----
-redirect_to: 'styleguide/index.md'
----
-
-This document was moved to [another location](styleguide/index.md).
-
-<!-- This redirect file can be deleted after <2022-02-13>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/user/admin_area/analytics/instance_statistics.md

----
-redirect_to: 'usage_trends.md'
----
-
-This document was moved to [another location](usage_trends.md).
-
-<!-- This redirect file can be deleted after <2022-03-20>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/user/markdown.md

@@ -1322,7 +1322,7 @@ Examples:
 <!--
 The "2." and "4." in the example above are changed to "1." below, to match the style
 standards on docs.gitlab.com.
-See https://docs.gitlab.com/ee/development/documentation/styleguide.html#lists
+See https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#lists
 -->
 
 1. First ordered list item
@@ -1356,7 +1356,7 @@ They can even:
 <!--
 The "*" and "+" in the example above are changed to "-" below, to match the style
 standards on docs.gitlab.com.
-See https://docs.gitlab.com/ee/development/documentation/styleguide.html#lists
+See https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#lists
 -->
 
 Unordered lists can:

doc/user/search/advanced_global_search.md

----
-redirect_to: advanced_search.md
----
-
-This document was moved to [another location](advanced_search.md).
-
-<!-- This redirect file can be deleted after <2021-02-12>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

doc/user/search/advanced_search_syntax.md

----
-redirect_to: advanced_search.md
----
-
-This document was moved to [another location](advanced_search.md).
-
-<!-- This redirect file can be deleted after <2021-02-12>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->

ee/app/views/shared/promotions/_promote_advanced_search.html.haml

@@ -13,6 +13,6 @@
             = _('Improve search with Advanced Search and GitLab Enterprise Edition.')
         %p
           = _('The Advanced Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project.')
-          = link_to _('Read more'), help_page_path('user/search/advanced_global_search.md'), target: '_blank'
+          = link_to _('Read more'), help_page_path('user/search/advanced_search.md'), target: '_blank'
 
         = render 'shared/promotions/promotion_link_project'

ee/changelogs/unreleased/docs-delete-redirects-3.yml

+---
+title: Delete redirect files
+merge_request: 56169
+author:
+type: other

scripts/lint-doc.sh

@@ -78,7 +78,7 @@ then
   echo
   echo '  ✖ ERROR: The number of README.md file(s) has changed. Use index.md instead of README.md.' >&2
   echo '  ✖        If removing a README.md file, update NUMBER_READMES in lint-doc.sh.' >&2
-  echo '  https://docs.gitlab.com/ee/development/documentation/styleguide.html#work-with-directories-and-files'
+  echo '  https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#work-with-directories-and-files'
   echo
   ((ERRORCODE++))
 fi