Merge branch 'docs-clean-redirects-2021-10-13' into 'master'

Clean up docs redirects - 2021-10-13

See merge request gitlab-org/gitlab!72304

doc/administration/auth/index.md

@@ -31,7 +31,7 @@ providers:
 - [Salesforce](../../integration/salesforce.md)
 - [SAML](../../integration/saml.md)
 - [SAML for GitLab.com groups](../../user/group/saml_sso/index.md) **(PREMIUM SAAS)**
-- [Shibboleth](../../integration/shibboleth.md)
+- [Shibboleth](../../integration/saml.md)
 - [Smartcard](smartcard.md) **(PREMIUM SELF)**
 - [Twitter](../../integration/twitter.md)
 

doc/ci/merge_request_pipelines/index.md

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

doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md

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

doc/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md

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

doc/ci/multi_project_pipelines.md

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

doc/ci/parent_child_pipelines.md

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

doc/development/fe_guide/editor_lite.md

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

doc/development/usage_ping/index.md

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

doc/development/usage_ping/metrics_dictionary.md

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

doc/development/usage_ping/metrics_instrumentation.md

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

doc/development/usage_ping/product_intelligence_review.md

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

doc/development/usage_ping/review_guidelines.md

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

doc/integration/omniauth.md

@@ -47,7 +47,7 @@ contains some settings that are common for all providers.
 | [OpenID Connect](../administration/auth/oidc.md)                    | `openid_connect`           |
 | [Salesforce](salesforce.md)                                         | `salesforce`               |
 | [SAML](saml.md)                                                     | `saml`                     |
-| [Shibboleth](shibboleth.md)                                         | `shibboleth`               |
+| [Shibboleth](saml.md)                                         | `shibboleth`               |
 | [Twitter](twitter.md)                                               | `twitter`                  |
 
 ## Initial OmniAuth Configuration

doc/integration/shibboleth.md

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