From 24d630c2ca40385e0893447bba28589b35e714c4 Mon Sep 17 00:00:00 2001 From: Suzanne Selhorn <sselhorn@gitlab.com> Date: Tue, 18 Jul 2023 20:12:50 +0000 Subject: [PATCH] Changed user/admin to admin path Related to: https://gitlab.com/gitlab-org/gitlab/-/issues/384335 --- doc/administration/geo/replication/configuration.md | 2 +- .../geo/replication/multiple_servers.md | 6 +++--- doc/administration/geo/setup/database.md | 2 +- doc/administration/geo/setup/external_database.md | 2 +- doc/administration/monitoring/ip_allowlist.md | 2 +- .../reference_architectures/10k_users.md | 2 +- .../reference_architectures/25k_users.md | 2 +- .../reference_architectures/2k_users.md | 2 +- .../reference_architectures/3k_users.md | 2 +- .../reference_architectures/50k_users.md | 2 +- .../reference_architectures/5k_users.md | 2 +- doc/administration/settings/help_page.md | 4 ++-- doc/administration/settings/index.md | 12 ++++++------ doc/administration/settings/usage_statistics.md | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/administration/geo/replication/configuration.md b/doc/administration/geo/replication/configuration.md index 063b992d67328..a5d851878124a 100644 --- a/doc/administration/geo/replication/configuration.md +++ b/doc/administration/geo/replication/configuration.md @@ -190,7 +190,7 @@ keys must be manually replicated to the **secondary** site. ```ruby ## ## The unique identifier for the Geo site. See - ## https://docs.gitlab.com/ee/user/admin_area/geo_nodes.html#common-settings + ## https://docs.gitlab.com/ee/administration/geo_nodes.html#common-settings ## gitlab_rails['geo_node_name'] = '<site_name_here>' ``` diff --git a/doc/administration/geo/replication/multiple_servers.md b/doc/administration/geo/replication/multiple_servers.md index 4e597a2192282..29edac1be8370 100644 --- a/doc/administration/geo/replication/multiple_servers.md +++ b/doc/administration/geo/replication/multiple_servers.md @@ -67,7 +67,7 @@ The following steps enable a GitLab site to serve as the Geo **primary** site. ```ruby ## ## The unique identifier for the Geo site. See - ## https://docs.gitlab.com/ee/user/admin_area/geo_nodes.html#common-settings + ## https://docs.gitlab.com/ee/administration/geo_nodes.html#common-settings ## gitlab_rails['geo_node_name'] = '<site_name_here>' @@ -217,7 +217,7 @@ then make the following modifications: ## ## The unique identifier for the Geo site. See - ## https://docs.gitlab.com/ee/user/admin_area/geo_nodes.html#common-settings + ## https://docs.gitlab.com/ee/administration/geo_nodes.html#common-settings ## gitlab_rails['geo_node_name'] = '<site_name_here>' @@ -318,7 +318,7 @@ application nodes above, with some changes to run only the `sidekiq` service: ## ## The unique identifier for the Geo site. See - ## https://docs.gitlab.com/ee/user/admin_area/geo_nodes.html#common-settings + ## https://docs.gitlab.com/ee/administration/geo_nodes.html#common-settings ## gitlab_rails['geo_node_name'] = '<site_name_here>' diff --git a/doc/administration/geo/setup/database.md b/doc/administration/geo/setup/database.md index 1e582ee5f611c..be6e327732d8e 100644 --- a/doc/administration/geo/setup/database.md +++ b/doc/administration/geo/setup/database.md @@ -75,7 +75,7 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o ```ruby ## ## The unique identifier for the Geo site. See - ## https://docs.gitlab.com/ee/user/admin_area/geo_nodes.html#common-settings + ## https://docs.gitlab.com/ee/administration/geo_nodes.html#common-settings ## gitlab_rails['geo_node_name'] = '<site_name_here>' ``` diff --git a/doc/administration/geo/setup/external_database.md b/doc/administration/geo/setup/external_database.md index 81541d1cb9c21..50383546da3c3 100644 --- a/doc/administration/geo/setup/external_database.md +++ b/doc/administration/geo/setup/external_database.md @@ -39,7 +39,7 @@ developed and tested. We aim to be compatible with most external ## ## The unique identifier for the Geo site. See - ## https://docs.gitlab.com/ee/user/admin_area/geo_nodes.html#common-settings + ## https://docs.gitlab.com/ee/administration/geo_nodes.html#common-settings ## gitlab_rails['geo_node_name'] = '<site_name_here>' ``` diff --git a/doc/administration/monitoring/ip_allowlist.md b/doc/administration/monitoring/ip_allowlist.md index 89caea691bb73..364c1b27d3365 100644 --- a/doc/administration/monitoring/ip_allowlist.md +++ b/doc/administration/monitoring/ip_allowlist.md @@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # IP whitelist **(FREE SELF)** -GitLab provides some [monitoring endpoints](../../user/admin_area/monitoring/health_check.md) +GitLab provides some [monitoring endpoints](health_check.md) that provide health check information when probed. To control access to those endpoints via IP whitelisting, you can add single diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index fdb6302aa5be8..e9a77d15a6cfd 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -232,7 +232,7 @@ spread connections equally in practice. ### Readiness checks Ensure the external load balancer only routes to working services with built -in monitoring endpoints. The [readiness checks](../../user/admin_area/monitoring/health_check.md) +in monitoring endpoints. The [readiness checks](../monitoring/health_check.md) all require [additional configuration](../monitoring/ip_allowlist.md) on the nodes being checked, otherwise, the external load balancer will not be able to connect. diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 4fd32061f733c..0e608a953b83b 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -243,7 +243,7 @@ spread connections equally in practice. ### Readiness checks Ensure the external load balancer only routes to working services with built -in monitoring endpoints. The [readiness checks](../../user/admin_area/monitoring/health_check.md) +in monitoring endpoints. The [readiness checks](../monitoring/health_check.md) all require [additional configuration](../monitoring/ip_allowlist.md) on the nodes being checked, otherwise, the external load balancer will not be able to connect. diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index fd45524c5059c..e3e361db13319 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -134,7 +134,7 @@ spread connections equally in practice. ### Readiness checks Ensure the external load balancer only routes to working services with built -in monitoring endpoints. The [readiness checks](../../user/admin_area/monitoring/health_check.md) +in monitoring endpoints. The [readiness checks](../monitoring/health_check.md) all require [additional configuration](../monitoring/ip_allowlist.md) on the nodes being checked, otherwise, the external load balancer will not be able to connect. diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index c90bea97e6238..4b7563d9d8d79 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -243,7 +243,7 @@ spread connections equally in practice. ### Readiness checks Ensure the external load balancer only routes to working services with built -in monitoring endpoints. The [readiness checks](../../user/admin_area/monitoring/health_check.md) +in monitoring endpoints. The [readiness checks](../monitoring/health_check.md) all require [additional configuration](../monitoring/ip_allowlist.md) on the nodes being checked, otherwise, the external load balancer will not be able to connect. diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index 1982ec64572a4..6dc7f7affabd1 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -241,7 +241,7 @@ spread connections equally in practice. ### Readiness checks Ensure the external load balancer only routes to working services with built -in monitoring endpoints. The [readiness checks](../../user/admin_area/monitoring/health_check.md) +in monitoring endpoints. The [readiness checks](../monitoring/health_check.md) all require [additional configuration](../monitoring/ip_allowlist.md) on the nodes being checked, otherwise, the external load balancer will not be able to connect. diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index c3a19c31ca398..754a844df3f6f 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -240,7 +240,7 @@ spread connections equally in practice. ### Readiness checks Ensure the external load balancer only routes to working services with built -in monitoring endpoints. The [readiness checks](../../user/admin_area/monitoring/health_check.md) +in monitoring endpoints. The [readiness checks](../monitoring/health_check.md) all require [additional configuration](../monitoring/ip_allowlist.md) on the nodes being checked, otherwise, the external load balancer will not be able to connect. diff --git a/doc/administration/settings/help_page.md b/doc/administration/settings/help_page.md index febd794b04c42..46c2c395102e2 100644 --- a/doc/administration/settings/help_page.md +++ b/doc/administration/settings/help_page.md @@ -95,8 +95,8 @@ When redirecting `/help`, GitLab: - Appends `.html` to the URL, and removes `.md` if necessary. For example, if the URL is set to `https://docs.gitlab.com`, requests for -`/help/user/admin_area/settings/help_page.md` redirect to: -`https://docs.gitlab.com/${VERSION}/ee/user/admin_area/settings/help_page.html`. +`/help/administration/settings/help_page.md` redirect to: +`https://docs.gitlab.com/${VERSION}/ee/administration/settings/help_page.html`. <!-- ## Troubleshooting diff --git a/doc/administration/settings/index.md b/doc/administration/settings/index.md index 09c23dae2010b..5fc0c029c3060 100644 --- a/doc/administration/settings/index.md +++ b/doc/administration/settings/index.md @@ -41,7 +41,7 @@ The **General** settings contain: restrict visibility levels. Configure import sources and Git access protocol. - [Account and limit](../settings/account_and_limit_settings.md) - Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan. -- [Diff limits](../../user/admin_area/diff_limits.md) - Diff content limits. +- [Diff limits](../diff_limits.md) - Diff content limits. - [Sign-up restrictions](../settings/sign_up_restrictions.md) - Configure the way a user creates a new account. - [Sign in restrictions](../settings/sign_in_restrictions.md) - Set requirements for a user to sign in. Enable mandatory two-factor authentication. @@ -161,10 +161,10 @@ The **Reporting** settings contain: - Spam and Anti-bot protection: - Anti-spam services, such as [reCAPTCHA](../../integration/recaptcha.md), - [Akismet](../../integration/akismet.md), or [Spamcheck](../../user/admin_area/reporting/spamcheck.md). - - [IP address restrictions](../../user/admin_area/reporting/ip_addr_restrictions.md). -- [Abuse reports](../../user/admin_area/review_abuse_reports.md) - Set notification email for abuse reports. -- [Git abuse rate limit](../../user/admin_area/reporting/git_abuse_rate_limit.md) - Configure Git abuse rate limit settings. **(ULTIMATE SELF)** + [Akismet](../../integration/akismet.md), or [Spamcheck](../reporting/spamcheck.md). + - [IP address restrictions](../reporting/ip_addr_restrictions.md). +- [Abuse reports](../review_abuse_reports.md) - Set notification email for abuse reports. +- [Git abuse rate limit](../reporting/git_abuse_rate_limit.md) - Configure Git abuse rate limit settings. **(ULTIMATE SELF)** ### Repository @@ -192,7 +192,7 @@ The **Repository** settings contain: The **Templates** settings contain: - [Templates](instance_template_repository.md#configuration) - Set instance-wide template repository. -- [Custom project templates](../../user/admin_area/custom_project_templates.md) - Select the custom project template source group. +- [Custom project templates](../custom_project_templates.md) - Select the custom project template source group. ## Default first day of the week diff --git a/doc/administration/settings/usage_statistics.md b/doc/administration/settings/usage_statistics.md index df9cf60f6aefd..ba15ee4e33e08 100644 --- a/doc/administration/settings/usage_statistics.md +++ b/doc/administration/settings/usage_statistics.md @@ -43,7 +43,7 @@ tier. Users can continue to access the features in a paid tier without sharing u ### Features available in 14.1 and later -- [Email from GitLab](../../user/admin_area/email_from_gitlab.md). +- [Email from GitLab](../email_from_gitlab.md). ### Features available in 14.4 and later -- GitLab