diff --git a/doc/.vale/gitlab/Admin.yml b/doc/.vale/gitlab/Admin.yml index d74621bde8e1e988684286ed7f82781cba181dd4..560752594d59430d1d1d919395e22fc593c77f87 100644 --- a/doc/.vale/gitlab/Admin.yml +++ b/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: diff --git a/doc/.vale/gitlab/AlertBoxStyle.yml b/doc/.vale/gitlab/AlertBoxStyle.yml index 92c3a16cab8354b5e8301fe72064403a6dc34796..5912c4707fd93d86327e95f153b5671f55e5f6e1 100644 --- a/doc/.vale/gitlab/AlertBoxStyle.yml +++ b/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 diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md deleted file mode 100644 index ade0b89a92cb0af4c0978db43d0042f8ab1fb977..0000000000000000000000000000000000000000 --- a/doc/development/documentation/styleguide.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 --> diff --git a/doc/user/admin_area/analytics/instance_statistics.md b/doc/user/admin_area/analytics/instance_statistics.md deleted file mode 100644 index e44dd8910296ba1bb608cca1efca3767b2666f2b..0000000000000000000000000000000000000000 --- a/doc/user/admin_area/analytics/instance_statistics.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 --> diff --git a/doc/user/markdown.md b/doc/user/markdown.md index 8e34fb17c8ecc0965a90c55097c7c1943f85b2cb..9a50dcb6abd67b9328e3066a55a4117f28eb7a4b 100644 --- a/doc/user/markdown.md +++ b/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: diff --git a/doc/user/search/advanced_global_search.md b/doc/user/search/advanced_global_search.md deleted file mode 100644 index 44af6f90cd915e06857c6236081d73cb384eca68..0000000000000000000000000000000000000000 --- a/doc/user/search/advanced_global_search.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 --> diff --git a/doc/user/search/advanced_search_syntax.md b/doc/user/search/advanced_search_syntax.md deleted file mode 100644 index 44af6f90cd915e06857c6236081d73cb384eca68..0000000000000000000000000000000000000000 --- a/doc/user/search/advanced_search_syntax.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -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 --> diff --git a/ee/app/views/shared/promotions/_promote_advanced_search.html.haml b/ee/app/views/shared/promotions/_promote_advanced_search.html.haml index 7b818500832279dac7a7e329040cf706f57537f1..29875334d04ad6aba103a455dbba6628b38c554b 100644 --- a/ee/app/views/shared/promotions/_promote_advanced_search.html.haml +++ b/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' diff --git a/ee/changelogs/unreleased/docs-delete-redirects-3.yml b/ee/changelogs/unreleased/docs-delete-redirects-3.yml new file mode 100644 index 0000000000000000000000000000000000000000..256d678096d70a75d1c740f656df15ed8f2962cb --- /dev/null +++ b/ee/changelogs/unreleased/docs-delete-redirects-3.yml @@ -0,0 +1,5 @@ +--- +title: Delete redirect files +merge_request: 56169 +author: +type: other diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh index 17c8cdaabecf752547f104cacf380d0b4048fb80..c94faa8f6f45a2026beefa6b5841bc9de811c43d 100755 --- a/scripts/lint-doc.sh +++ b/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