From ecdd52dbb120da3c9210074ef07cc07018f571c2 Mon Sep 17 00:00:00 2001 From: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Date: Tue, 3 May 2022 08:21:09 -0500 Subject: [PATCH] docs: backport alias fixes (#48464) * backport alias fixes * Delete about-rbac.md * Delete assign-rbac-roles.md * Delete plan-rbac-rollout-strategy.md * Delete manage-rbac-roles.md * revert to 8.5 --- docs/sources/administration/manage-organizations/_index.md | 4 ++-- docs/sources/administration/manage-user-preferences/_index.md | 2 +- .../administration/manage-users-and-permissions/_index.md | 2 +- .../about-users-and-permissions.md | 2 +- .../manage-dashboard-permissions/_index.md | 2 +- .../manage-users-and-permissions/manage-org-users/_index.md | 2 +- .../manage-org-users/change-user-org-permissions.md | 2 +- .../manage-org-users/invite-user-join-org.md | 2 +- .../manage-org-users/manage-pending-invites.md | 2 +- .../manage-org-users/remove-user-from-org.md | 2 +- .../manage-org-users/view-list-org-users.md | 2 +- .../manage-server-users/_index.md | 2 +- .../manage-server-users/add-remove-user-to-org.md | 2 +- .../manage-server-users/add-user.md | 2 +- .../assign-remove-server-admin-privileges.md | 2 +- .../manage-server-users/change-user-org-permissions.md | 2 +- .../manage-server-users/force-user-logout.md | 2 +- .../manage-server-users/grant-editor-admin-permissions.md | 2 +- .../manage-server-users/view-edit-user-account.md | 2 +- .../manage-server-users/view-list-users.md | 2 +- .../manage-users-and-permissions/manage-teams/_index.md | 2 +- docs/sources/administration/preferences/_index.md | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/sources/administration/manage-organizations/_index.md b/docs/sources/administration/manage-organizations/_index.md index 621f325c461..aac6f08c193 100644 --- a/docs/sources/administration/manage-organizations/_index.md +++ b/docs/sources/administration/manage-organizations/_index.md @@ -5,8 +5,8 @@ description: 'Describes how to use organizations to isolate dashboard to users a weight: 300 aliases: [ - docs/grafana/latest/manage-users/server-admin/_index.md, - docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs.md, + '/docs/grafana/latest/manage-users/server-admin/', + '/docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/', ] keywords: - organizations diff --git a/docs/sources/administration/manage-user-preferences/_index.md b/docs/sources/administration/manage-user-preferences/_index.md index 6c4089851af..e802b2d8710 100644 --- a/docs/sources/administration/manage-user-preferences/_index.md +++ b/docs/sources/administration/manage-user-preferences/_index.md @@ -3,7 +3,7 @@ title = "Manage user preferences" weight = 400 description = "Learn how to update your user preferences and switch organizations" keywords = ["password", "change", "organization", "change"] -aliases = ["/docs/grafana/latest/administration/change-your-password/", "docs/sources/administration/manage-user-preferences/_index.md"] +aliases = ["/docs/grafana/latest/administration/change-your-password/", "/docs/grafana/latest/administration/manage-user-preferences/"] +++ # Manage user preferences diff --git a/docs/sources/administration/manage-users-and-permissions/_index.md b/docs/sources/administration/manage-users-and-permissions/_index.md index cc6a6b5c4d1..e1285b659fe 100644 --- a/docs/sources/administration/manage-users-and-permissions/_index.md +++ b/docs/sources/administration/manage-users-and-permissions/_index.md @@ -1,6 +1,6 @@ +++ title = "Manage users and permissions" -aliases = ["docs/sources/administration/manage-users-and-permissions/_index.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/"] weight = 200 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md b/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md index 418e6be1bd4..93de8ca7341 100644 --- a/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md +++ b/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md @@ -1,6 +1,6 @@ +++ title = "About users and permissions" -aliases = ["docs/grafana/latest/manage-users/", "docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions", "/docs/grafana/latest/permissions/overview/", "docs/grafana/latest/permissions/", "docs/grafana/latest/permissions/organization_roles"] +aliases = ["/docs/grafana/latest/manage-users/", "/docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/", "/docs/grafana/latest/permissions/overview/", "/docs/grafana/latest/permissions/", "/docs/grafana/latest/permissions/organization_roles/"] weight = 100 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md index d70a89c4aef..6f513c7dc2d 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md @@ -1,6 +1,6 @@ +++ title = "Manage dashboard permissions" -aliases = ["/docs/grafana/latest/permissions/dashboard_folder_permissions/", "docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md"] +aliases = ["/docs/grafana/latest/permissions/dashboard_folder_permissions/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/"] weight = 500 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md index dd88d4f23b2..fbfcb25e226 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md @@ -1,6 +1,6 @@ +++ title = "Manage users in an organization" -aliases = ["docs/sources/manage-users/org-admin/index.md", "docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md"] +aliases = ["/docs/grafana/latest/manage-users/org-admin/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/"] weight = 400 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md index 1ee0fe3a7a4..f592bc7d9c0 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md @@ -1,6 +1,6 @@ +++ title = "Change a user's organization permissions" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/"] weight = 30 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md index c7c1fa6814a..fa7f9c6aeb1 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md @@ -1,6 +1,6 @@ +++ title = "Invite a user to join an organization" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/"] weight = 10 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md index 308a366b2c4..b01548074c4 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md @@ -1,6 +1,6 @@ +++ title = "Manage a pending invitation" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/"] weight = 20 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md index 285fee4a6c6..3426a29eb47 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md @@ -1,6 +1,6 @@ +++ title = "Remove a user from an organization" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/"] weight = 40 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md b/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md index f9a5ed5974e..d4dce2de3df 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md @@ -1,6 +1,6 @@ +++ title = "View a list of organization users" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/"] weight = 50 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md index 9f3f5840999..3939f87e5ed 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md @@ -1,6 +1,6 @@ +++ title = "Manage users globally" -aliases = ["docs/grafana/latest/manage-users/server-admin/", "docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/", "docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/"] +aliases = ["/docs/grafana/latest/manage-users/server-admin/", "/docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/"] weight = 300 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md index 039a885fec2..3b0fddc9e16 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md @@ -1,6 +1,6 @@ +++ title = "Add or remove a user from an organization" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user-to-org.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/"] weight = 30 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md index 8bc9b52b9b1..7091419739b 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md @@ -1,6 +1,6 @@ +++ title = "Add a user" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/"] weight = 10 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md index 823d2702523..5aaf2633872 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md @@ -1,6 +1,6 @@ +++ title = "Assign or remove Grafana server administrator privileges" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/"] weight = 20 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md index d07537da7ad..0f9b5c33a89 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md @@ -1,6 +1,6 @@ +++ title = "Change a user's organization permissions" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/"] weight = 50 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md index 20183240152..82f81a0e99d 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md @@ -1,6 +1,6 @@ +++ title = "Force a user to logout from Grafana" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/"] weight = 90 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md index 838d11eaf94..9e3243cef47 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md @@ -1,6 +1,6 @@ +++ title = "Grant editors administrator permissions" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/"] weight = 60 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md index 5c8ba54080b..3ff0d74dc55 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md @@ -1,6 +1,6 @@ +++ title = "View and edit a user account" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/view-user-account-details.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/"] weight = 110 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md index 296b840c31a..53eb97acfd5 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md @@ -1,6 +1,6 @@ +++ title = "View a list of users" -aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md"] +aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/"] weight = 100 +++ diff --git a/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md b/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md index e5ad217e8d0..9f0ef123fb2 100644 --- a/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md +++ b/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md @@ -1,6 +1,6 @@ +++ title = "Manage teams" -aliases = ["/docs/grafana/latest/manage-users/add-or-remove-user-from-team/","/docs/grafana/latest/manage-users/create-or-remove-team/", "docs/sources/manage-users/manage-teams/index.md", "docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md"] +aliases = ["/docs/grafana/latest/manage-users/add-or-remove-user-from-team/","/docs/grafana/latest/manage-users/create-or-remove-team/", "/docs/grafana/latest/manage-users/manage-teams/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/"] weight = 600 +++ diff --git a/docs/sources/administration/preferences/_index.md b/docs/sources/administration/preferences/_index.md index 74dd1337eba..0dc916a1323 100644 --- a/docs/sources/administration/preferences/_index.md +++ b/docs/sources/administration/preferences/_index.md @@ -1,6 +1,6 @@ +++ title = "Preferences" -aliases =["/docs/grafana/latest/administration/preferences.md"] +aliases =["/docs/grafana/latest/administration/preferences/"] weight = 50 +++