From 5e7f9ccb0bb1f0dfc8da6b2be0632710e0d2b4fa Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Wed, 26 Feb 2025 15:21:52 +0100 Subject: [PATCH] help: Update links for information about users to new intro article. Updates "help/manage-a-user" links that are contextually for general information about users to go to the new "help/introduction-to-users" article. Adds a link to "Manage a user" in the related articles section of the new intro to users article. --- help/custom-emoji.md | 2 +- help/include/user-groups-intro.md | 2 +- help/include/user-roles-intro.md | 2 +- help/introduction-to-users.md | 1 + help/restrict-account-creation.md | 2 +- help/restrict-bot-creation.md | 2 +- help/restrict-direct-messages.md | 8 ++++---- help/restrict-message-editing-and-deletion.md | 2 +- help/restrict-moving-messages.md | 2 +- help/restrict-wildcard-mentions.md | 2 +- help/view-group-members.md | 4 ++-- templates/corporate/for/business.html | 2 +- templates/corporate/for/education.html | 2 +- templates/corporate/for/open-source.html | 2 +- templates/corporate/for/research.html | 2 +- 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/help/custom-emoji.md b/help/custom-emoji.md index edf150ae8a..99c0ad04a1 100644 --- a/help/custom-emoji.md +++ b/help/custom-emoji.md @@ -66,7 +66,7 @@ administrators can deactivate anyone's custom emoji. You can configure who can add custom emoji. This permission can be granted to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and -individual [users](/help/manage-a-user). +individual [users](/help/introduction-to-users). {start_tabs} diff --git a/help/include/user-groups-intro.md b/help/include/user-groups-intro.md index a1cb927d08..cc37184037 100644 --- a/help/include/user-groups-intro.md +++ b/help/include/user-groups-intro.md @@ -1,4 +1,4 @@ User groups offer a flexible way to manage permissions in your organization. Most permissions in Zulip can be granted to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and -individual [users](/help/manage-a-user). +individual [users](/help/introduction-to-users). diff --git a/help/include/user-roles-intro.md b/help/include/user-roles-intro.md index 973c607cbb..76e4cd5a7d 100644 --- a/help/include/user-roles-intro.md +++ b/help/include/user-roles-intro.md @@ -1,6 +1,6 @@ Most permissions in Zulip can be granted to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and -individual [users](/help/manage-a-user). +individual [users](/help/introduction-to-users). User roles make it convenient to configure permissions for your organization. You can decide what role a user will have when you [send them an diff --git a/help/introduction-to-users.md b/help/introduction-to-users.md index 66808b80a8..ec65805785 100644 --- a/help/introduction-to-users.md +++ b/help/introduction-to-users.md @@ -28,4 +28,5 @@ Users can also be members of [groups](/help/user-groups), and subscribe to * [Status and availability](/help/status-and-availability) * [User cards](/help/user-cards) * [View someone's profile](/help/view-someones-profile) +* [Manage a user](/help/manage-a-user) * [Bots overview](/help/bots-overview) diff --git a/help/restrict-account-creation.md b/help/restrict-account-creation.md index 097ddfe063..6508a23ea8 100644 --- a/help/restrict-account-creation.md +++ b/help/restrict-account-creation.md @@ -19,7 +19,7 @@ account and how users access their accounts: * You can [restrict the ability to invite new users](#change-who-can-send-invitations) to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and individual - [users](/help/manage-a-user). + [users](/help/introduction-to-users). Regardless of whether invitations are required, you can: diff --git a/help/restrict-bot-creation.md b/help/restrict-bot-creation.md index 95b23ea09d..094cc47241 100644 --- a/help/restrict-bot-creation.md +++ b/help/restrict-bot-creation.md @@ -12,7 +12,7 @@ Zulip lets you create three types of [bots](/help/bots-overview): You can configure who can create incoming webhook bots (which are more limited in what they can do), and who can create any bot. Both permissions can be assigned to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and -individual [users](/help/manage-a-user). +individual [users](/help/introduction-to-users). !!! warn "" diff --git a/help/restrict-direct-messages.md b/help/restrict-direct-messages.md index ce4f3d710e..1caeb6b1d3 100644 --- a/help/restrict-direct-messages.md +++ b/help/restrict-direct-messages.md @@ -12,10 +12,10 @@ messages](/help/direct-messages): These permissions can be granted to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and individual -[users](/help/manage-a-user). They are designed so that users can always respond -to a direct message they've received (unless organization permissions change). -They also provide a lot of flexibility for managing DMs in your organization. -For example, you can: +[users](/help/introduction-to-users). They are designed so that users can always +respond to a direct message they've received (unless organization permissions +change). They also provide a lot of flexibility for managing DMs in your +organization. For example, you can: - Prevent 1:1 DMs between [guest users](/help/guest-users). - Allow members to respond to DMs from an admin or moderator, but not to start diff --git a/help/restrict-message-editing-and-deletion.md b/help/restrict-message-editing-and-deletion.md index e422a7564e..6ba86e5775 100644 --- a/help/restrict-message-editing-and-deletion.md +++ b/help/restrict-message-editing-and-deletion.md @@ -36,7 +36,7 @@ irretrievably) removes the message from Zulip. These permissions can be granted to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and individual -[users](/help/manage-a-user). +[users](/help/introduction-to-users). {start_tabs} diff --git a/help/restrict-moving-messages.md b/help/restrict-moving-messages.md index 021317ab14..ff974d0553 100644 --- a/help/restrict-moving-messages.md +++ b/help/restrict-moving-messages.md @@ -5,7 +5,7 @@ Zulip lets you configure who can edit message topics and move topics between channels. These permissions can be granted to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and individual -[users](/help/manage-a-user). +[users](/help/introduction-to-users). In general, allowing all organization members to edit message topics is highly recommended because: diff --git a/help/restrict-wildcard-mentions.md b/help/restrict-wildcard-mentions.md index 2b9f839061..12f2939f06 100644 --- a/help/restrict-wildcard-mentions.md +++ b/help/restrict-wildcard-mentions.md @@ -10,7 +10,7 @@ with more than 15 subscribers, and `@topic` in topics with more than 15 participants. This permission can be granted to any combination of [roles](/help/user-roles), -[groups](/help/user-groups), and individual [users](/help/manage-a-user). +[groups](/help/user-groups), and individual [users](/help/introduction-to-users). {start_tabs} diff --git a/help/view-group-members.md b/help/view-group-members.md index ebd96066a2..09e41393e4 100644 --- a/help/view-group-members.md +++ b/help/view-group-members.md @@ -1,8 +1,8 @@ # View group members User groups can have other [groups](/help/user-groups), -[roles](/help/user-roles), and individual [users](/help/manage-a-user) as -members. +[roles](/help/user-roles), and individual [users](/help/introduction-to-users) +as members. {start_tabs} diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 0d55264868..834579b93c 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -424,7 +424,7 @@ to user roles, user groups, - and individual + and individual users. diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index 79b52a5d27..10c521c9ec 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -184,7 +184,7 @@ href="/help/manage-permissions">fine-grained settings for user roles, user groups (like TAs), and individual + href="/help/introduction-to-users">individual users. diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index b97c1fbe9a..8bc1f89d0b 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -573,7 +573,7 @@ permission settings you can assign to user roles, user groups, and individual users. + href="/help/introduction-to-users">individual users. diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 012a86396a..28856502a4 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -323,7 +323,7 @@ permission settings you can assign to user roles, user groups, and individual users. + href="/help/introduction-to-users">individual users.