From fc810655e67b0bd5faeb8421d529efc71f1e71a1 Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Wed, 11 Dec 2024 13:56:26 +0100 Subject: [PATCH] help: Rename "roles-and-permissions.md" to "manage-permissions.md". Renames file and redirects existing links to "help/user-roles" as the previous content tracks to that current file's content. Updates existing links (excluding ReadtheDocs) to go to either "help/user-roles" or "help/manage-permissions" depending on which help center article applies to the content. --- api_docs/changelog.md | 2 +- api_docs/roles-and-permissions.md | 2 +- help/add-or-remove-users-from-a-channel.md | 4 ++-- help/change-organization-url.md | 2 +- help/channel-permissions.md | 4 ++-- help/configure-email-visibility.md | 2 +- help/configure-who-can-create-channels.md | 4 ++-- help/configure-who-can-invite-to-channels.md | 4 ++-- help/create-a-channel.md | 2 +- help/custom-emoji.md | 2 +- help/edit-a-bot.md | 2 +- help/find-administrators.md | 4 ++-- help/guest-users.md | 2 +- help/import-from-mattermost.md | 2 +- help/import-from-rocketchat.md | 2 +- help/import-from-slack.md | 2 +- help/include/self-hosted-billing-admin-only.md | 2 +- help/include/sidebar_index.md | 2 +- help/include/user-groups-intro.md | 2 +- help/include/user-roles-intro.md | 2 +- help/invite-new-users.md | 8 ++++---- ...oles-and-permissions.md => manage-permissions.md} | 0 help/manage-user-channel-subscriptions.md | 2 +- help/manage-user-group-membership.md | 2 +- help/manage-user-groups.md | 2 +- help/mobile-notifications.md | 2 +- help/moderating-open-organizations.md | 2 +- help/move-content-to-another-channel.md | 2 +- help/move-content-to-another-topic.md | 2 +- help/moving-to-zulip.md | 2 +- help/rename-a-topic.md | 2 +- help/restrict-account-creation.md | 2 +- help/restrict-moving-messages.md | 4 ++-- help/restrict-permissions-of-new-members.md | 2 +- help/scim.md | 2 +- help/setting-up-zulip-for-a-class.md | 4 ++-- help/user-cards.md | 2 +- help/user-groups.md | 2 +- help/user-roles.md | 4 ++-- help/view-all-bots-in-your-organization.md | 2 +- help/view-someones-profile.md | 2 +- templates/corporate/comparison_table_integrated.html | 4 ++-- templates/corporate/development-community.md | 2 +- templates/corporate/for/business.html | 6 +++--- templates/corporate/for/education.html | 4 ++-- templates/corporate/for/open-source.html | 2 +- templates/corporate/for/research.html | 2 +- templates/corporate/pricing_model.html | 2 +- templates/corporate/self-hosting.html | 4 ++-- web/templates/invite_user_modal.hbs | 2 +- web/templates/settings/admin_human_form.hbs | 2 +- web/templates/settings/edit_bot_form.hbs | 2 +- zerver/lib/home.py | 2 +- zerver/lib/url_redirects.py | 1 + zerver/openapi/zulip.yaml | 12 ++++++------ 55 files changed, 75 insertions(+), 74 deletions(-) rename help/{roles-and-permissions.md => manage-permissions.md} (100%) diff --git a/api_docs/changelog.md b/api_docs/changelog.md index 55ac589f35..5976e570eb 100644 --- a/api_docs/changelog.md +++ b/api_docs/changelog.md @@ -1227,7 +1227,7 @@ No changes; feature level used for Zulip 8.0 release. now includes [web-public streams](/help/public-access-option) as well. * [`GET /events`](/api/get-events): Events for stream creation and deletion are now sent to clients when a user gains or loses access to any streams - due to a change in their [role](/help/roles-and-permissions). + due to a change in their [role](/help/user-roles). * [`GET /events`](/api/get-events): The `subscription` events for `op: "peer_add"` are now sent to clients when a user gains access to a stream due to a change in their role. diff --git a/api_docs/roles-and-permissions.md b/api_docs/roles-and-permissions.md index 52dcd852a5..efa1b0f09e 100644 --- a/api_docs/roles-and-permissions.md +++ b/api_docs/roles-and-permissions.md @@ -1,7 +1,7 @@ # Roles and permissions Zulip offers several levels of permissions based on a -[user's role](/help/roles-and-permissions) in a Zulip organization. +[user's role](/help/user-roles) in a Zulip organization. Here are some important details to note when working with these roles and permissions in Zulip's API: diff --git a/help/add-or-remove-users-from-a-channel.md b/help/add-or-remove-users-from-a-channel.md index d39cdd596b..51d17ad33b 100644 --- a/help/add-or-remove-users-from-a-channel.md +++ b/help/add-or-remove-users-from-a-channel.md @@ -7,7 +7,7 @@ channel. Anyone can always [unsubscribe themselves from a channel][unsubscribe]. Organization administrators can also unsubscribe *other* users from any channel, including channels the admin is not subscribed to. They can also configure which -[roles](/help/roles-and-permissions) have access to [add other users to a +[roles](/help/user-roles) have access to [add other users to a channel][add-users] or [remove other users from a channel][remove-users]. [add-users]: /help/configure-who-can-invite-to-channels#configure-who-can-add-users @@ -153,7 +153,7 @@ subscribe the user. * [Manage a user's channel subscriptions](/help/manage-user-channel-subscriptions) * [Restrict channel invitations](/help/configure-who-can-invite-to-channels) * [Set default channels for new users](/help/set-default-channels-for-new-users) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) * [Mention a user or group](/help/mention-a-user-or-group) * [View channel subscribers](/help/view-channel-subscribers) diff --git a/help/change-organization-url.md b/help/change-organization-url.md index c7daf31390..2c560617ec 100644 --- a/help/change-organization-url.md +++ b/help/change-organization-url.md @@ -19,7 +19,7 @@ their clients. Zulip Cloud organizations are generally hosted at `.zulipchat.com`, with the subdomain chosen when the organization was created. Organization -[owners](/help/roles-and-permissions) can request to change the subdomain. +[owners](/help/user-roles) can request to change the subdomain. {start_tabs} diff --git a/help/channel-permissions.md b/help/channel-permissions.md index 1beadb1209..2e88a9a96f 100644 --- a/help/channel-permissions.md +++ b/help/channel-permissions.md @@ -35,7 +35,7 @@ At a high level: channel messages, like adding new subscribers or changing the channel privacy settings. -* [Organization members and moderators](/help/roles-and-permissions) +* [Organization members and moderators](/help/user-roles) cannot easily see which private channels exist, or interact with them in any way until they are added. Given a channel name, they can figure out whether a channel with that name exists, but cannot see @@ -123,7 +123,7 @@ for details. ## Related articles -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) * [Channel sending policy](/help/channel-posting-policy) * [Web-public channels](/help/public-access-option) diff --git a/help/configure-email-visibility.md b/help/configure-email-visibility.md index 07d0f8a5d9..078e7f896c 100644 --- a/help/configure-email-visibility.md +++ b/help/configure-email-visibility.md @@ -1,7 +1,7 @@ # Configure email visibility With privacy in mind, Zulip lets you control which -[roles](/help/roles-and-permissions) in the organization can view your email +[roles](/help/user-roles) in the organization can view your email address. Administrators can set the default email visibility configuration for new users in the organization. diff --git a/help/configure-who-can-create-channels.md b/help/configure-who-can-create-channels.md index 6d539544dc..0aeb367d2d 100644 --- a/help/configure-who-can-create-channels.md +++ b/help/configure-who-can-create-channels.md @@ -2,7 +2,7 @@ {!admin-only.md!} -Zulip allows you to separately control [permissions](/help/roles-and-permissions) +Zulip allows you to separately control [permissions](/help/manage-permissions) for creating [web-public](/help/public-access-option), public and private channels. @@ -49,4 +49,4 @@ unadvertised web-public channel in a legitimate organization. ## Related articles * [Create a channel](/help/create-a-channel) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) diff --git a/help/configure-who-can-invite-to-channels.md b/help/configure-who-can-invite-to-channels.md index 1f9a49d55c..3ad5852e66 100644 --- a/help/configure-who-can-invite-to-channels.md +++ b/help/configure-who-can-invite-to-channels.md @@ -4,7 +4,7 @@ By default, anyone other than guests can add other users to channels. However, you can restrict the ability to do so to specific -[roles](/help/roles-and-permissions). You can also can configure who can remove +[roles](/help/user-roles). You can also can configure who can remove other users from a public channel. For private channels, administrators must be subscribed to the channel to configure these settings. @@ -40,4 +40,4 @@ subscribed to the channel to configure these settings. ## Related articles * [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) diff --git a/help/create-a-channel.md b/help/create-a-channel.md index 7d0f495d2c..7a61123f75 100644 --- a/help/create-a-channel.md +++ b/help/create-a-channel.md @@ -2,7 +2,7 @@ By default, all users other than guests can create channels. Administrators can [restrict the ability to create a channel](/help/configure-who-can-create-channels) to specific -[roles](/help/roles-and-permissions). +[roles](/help/user-roles). If you are an administrator setting up channels for the first time, check out our [guide to setting up channels for a new organization](/help/create-channels). diff --git a/help/custom-emoji.md b/help/custom-emoji.md index 8940c202e5..732e1a9afe 100644 --- a/help/custom-emoji.md +++ b/help/custom-emoji.md @@ -66,7 +66,7 @@ administrators can deactivate anyone's custom emoji. By default, anyone other than guests can [add custom emoji](/help/custom-emoji) to the organization. However, you can restrict the ability to do so to specific -[roles](/help/roles-and-permissions). +[roles](/help/user-roles). {start_tabs} diff --git a/help/edit-a-bot.md b/help/edit-a-bot.md index 7c03fb923e..de2271cc89 100644 --- a/help/edit-a-bot.md +++ b/help/edit-a-bot.md @@ -1,7 +1,7 @@ # Edit a bot Zulip lets you edit the properties of any bot for which you are the owner. -Organization [administrators](/help/roles-and-permissions) can also edit any +Organization [administrators](/help/user-roles) can also edit any active bot in the organization. ## Edit your bot diff --git a/help/find-administrators.md b/help/find-administrators.md index f135656d0e..72af07e489 100644 --- a/help/find-administrators.md +++ b/help/find-administrators.md @@ -1,6 +1,6 @@ # Find administrators -[Administrators](/help/roles-and-permissions) can take actions other users are +[Administrators](/help/user-roles) can take actions other users are not permitted to, such as managing your organization's permissions settings. !!! tip "" @@ -11,5 +11,5 @@ not permitted to, such as managing your organization's permissions settings. ## Related articles -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) * [Customize organization settings](/help/customize-organization-settings) diff --git a/help/guest-users.md b/help/guest-users.md index 531777bd0e..e99c56d1f1 100644 --- a/help/guest-users.md +++ b/help/guest-users.md @@ -98,7 +98,7 @@ is which user IDs exist, and ## Related articles -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) * [Invite new users](/help/invite-new-users) * [Change a user's role](/help/user-roles#change-a-users-role) * [Zulip Cloud billing](/help/zulip-cloud-billing) diff --git a/help/import-from-mattermost.md b/help/import-from-mattermost.md index 2c9025a8a3..a68bdda501 100644 --- a/help/import-from-mattermost.md +++ b/help/import-from-mattermost.md @@ -263,7 +263,7 @@ keep in mind about the import process: and [how users can join your organization](/help/restrict-account-creation). - Mattermost's user roles are mapped to Zulip's [user - roles](/help/roles-and-permissions) in the following way: + roles](/help/user-roles) in the following way: | Mattermost role | Zulip role | |-------------------------|---------------| diff --git a/help/import-from-rocketchat.md b/help/import-from-rocketchat.md index 5a81fdde7e..9b10adb027 100644 --- a/help/import-from-rocketchat.md +++ b/help/import-from-rocketchat.md @@ -112,7 +112,7 @@ keep in mind about the import process: want to [customize their account settings](/help/getting-started-with-zulip). - Rocket.Chat user roles are mapped to Zulip's [user - roles](/help/roles-and-permissions) in the following way: + roles](/help/user-roles) in the following way: | Rocket.Chat role | Zulip role | |------------------|------------| diff --git a/help/import-from-slack.md b/help/import-from-slack.md index b15fa49418..892d2c03d9 100644 --- a/help/import-from-slack.md +++ b/help/import-from-slack.md @@ -142,7 +142,7 @@ in mind about the import process: [customize their account settings](/help/getting-started-with-zulip). - Slack's user roles are mapped to Zulip's [user - roles](/help/roles-and-permissions) in the following way: + roles](/help/user-roles) in the following way: | Slack role | Zulip role | |-------------------------|---------------| diff --git a/help/include/self-hosted-billing-admin-only.md b/help/include/self-hosted-billing-admin-only.md index 31524aa439..62a2a475a7 100644 --- a/help/include/self-hosted-billing-admin-only.md +++ b/help/include/self-hosted-billing-admin-only.md @@ -1,3 +1,3 @@ !!! warn "" - This feature is only available to organization [owners](/help/roles-and-permissions) and billing administrators. + This feature is only available to organization [owners](/help/user-roles) and billing administrators. diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 8302a60b66..be4092c039 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -186,7 +186,7 @@ * [GDPR compliance](/help/gdpr-compliance) ## Users -* [Manage permissions](/help/roles-and-permissions) +* [Manage permissions](/help/manage-permissions) * [Invite new users](/help/invite-new-users) * [Restrict account creation](/help/restrict-account-creation) * [User roles](/help/user-roles) diff --git a/help/include/user-groups-intro.md b/help/include/user-groups-intro.md index 0618ab30ff..a1cb927d08 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/roles-and-permissions), [groups](/help/user-groups), and +[roles](/help/user-roles), [groups](/help/user-groups), and individual [users](/help/manage-a-user). diff --git a/help/include/user-roles-intro.md b/help/include/user-roles-intro.md index 3caa527a70..973c607cbb 100644 --- a/help/include/user-roles-intro.md +++ b/help/include/user-roles-intro.md @@ -1,5 +1,5 @@ Most permissions in Zulip can be granted to any combination of -[roles](/help/roles-and-permissions), [groups](/help/user-groups), and +[roles](/help/user-roles), [groups](/help/user-groups), and individual [users](/help/manage-a-user). User roles make it convenient to configure permissions for your organization. diff --git a/help/invite-new-users.md b/help/invite-new-users.md index 1970e36ea4..f72455d9fc 100644 --- a/help/invite-new-users.md +++ b/help/invite-new-users.md @@ -13,7 +13,7 @@ Prior to inviting users to your organization, it is recommended that administrat When you invite users, you can: -* Set the [role](/help/roles-and-permissions) that they will have when +* Set the [role](/help/user-roles) that they will have when they join. * Configure which [channels](/help/introduction-to-channels) they will be @@ -40,7 +40,7 @@ users** menu option if you have permission to invite users. 1. Select when the invitations will expire. -1. Select what [role](/help/roles-and-permissions) the users will join as. +1. Select what [role](/help/user-roles) the users will join as. 1. Configure which [channels](/help/introduction-to-channels) they will be subscribed to. @@ -75,7 +75,7 @@ users** menu option if you have permission to invite users. 1. Select when the invitation will expire. -1. Select what [role](/help/roles-and-permissions) the users will join as. +1. Select what [role](/help/user-roles) the users will join as. 1. Configure which [channels](/help/introduction-to-channels) they will be subscribed to. @@ -111,7 +111,7 @@ for invitations for the organization owners role. * [Set default channels for new users](/help/set-default-channels-for-new-users) * [Configure default new user settings](/help/configure-default-new-user-settings) * [Configure organization language for automated messages and invitation emails][org-lang] -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) * [User groups](/help/user-groups) * [Joining a Zulip organization](/help/join-a-zulip-organization) diff --git a/help/roles-and-permissions.md b/help/manage-permissions.md similarity index 100% rename from help/roles-and-permissions.md rename to help/manage-permissions.md diff --git a/help/manage-user-channel-subscriptions.md b/help/manage-user-channel-subscriptions.md index f1da58d3e5..1ce41285e5 100644 --- a/help/manage-user-channel-subscriptions.md +++ b/help/manage-user-channel-subscriptions.md @@ -86,7 +86,7 @@ channel](/help/unsubscribe-from-a-channel). ## Related articles * [Channel permissions](/help/channel-permissions) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) * [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel) * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel) * [View channel subscribers](/help/view-channel-subscribers) diff --git a/help/manage-user-group-membership.md b/help/manage-user-group-membership.md index f41dd12897..5c42eb0152 100644 --- a/help/manage-user-group-membership.md +++ b/help/manage-user-group-membership.md @@ -28,6 +28,6 @@ * [Manage user groups](/help/user-groups) * [Mention a user or group](/help/mention-a-user-or-group) * [Create user groups](/help/create-user-groups) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) [configure-invites]: /help/configure-who-can-invite-to-channels diff --git a/help/manage-user-groups.md b/help/manage-user-groups.md index 68e049117a..d74446d69c 100644 --- a/help/manage-user-groups.md +++ b/help/manage-user-groups.md @@ -184,4 +184,4 @@ group. * [Mention a user or group](/help/mention-a-user-or-group) * [Create user groups](/help/create-user-groups) * [Moving to Zulip](/help/moving-to-zulip) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) diff --git a/help/mobile-notifications.md b/help/mobile-notifications.md index 1adae7bfb4..2c4a1e731f 100644 --- a/help/mobile-notifications.md +++ b/help/mobile-notifications.md @@ -147,7 +147,7 @@ To enable push notifications for your organization: Service](https://zulip.readthedocs.io/en/stable/production/mobile-push-notifications.html). 1. For organizations with more than 10 users, an - [owner](/help/roles-and-permissions) or billing administrator needs to sign + [owner](/help/user-roles) or billing administrator needs to sign up for a [plan](https://zulip.com/plans/#self-hosted) for your organization. {end_tabs} diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md index 40c742d615..9b683e585f 100644 --- a/help/moderating-open-organizations.md +++ b/help/moderating-open-organizations.md @@ -50,7 +50,7 @@ problematic behavior. * [Configure email visibility](/help/configure-email-visibility) to prevent off-platform spam. * [Restrict wildcard mentions](/help/restrict-wildcard-mentions) - so only [moderators](/help/roles-and-permissions) can mention everyone in your organization. + so only [moderators](/help/user-roles) can mention everyone in your organization. * Create a [default channel](/help/set-default-channels-for-new-users) for announcements where [only admins can post](/help/channel-posting-policy). diff --git a/help/move-content-to-another-channel.md b/help/move-content-to-another-channel.md index e6396ed0c9..6a024dc1e4 100644 --- a/help/move-content-to-another-channel.md +++ b/help/move-content-to-another-channel.md @@ -2,7 +2,7 @@ Zulip makes it possible to move messages, or an entire topic, to another channel. Organizations can [configure][configure-moving-permissions] which -[roles](/help/roles-and-permissions) have permission to move messages between +[roles](/help/user-roles) have permission to move messages between channels. [configure-moving-permissions]: /help/restrict-moving-messages#configure-who-can-move-messages-to-another-channel diff --git a/help/move-content-to-another-topic.md b/help/move-content-to-another-topic.md index 508d203e70..77372e2b9a 100644 --- a/help/move-content-to-another-topic.md +++ b/help/move-content-to-another-topic.md @@ -12,7 +12,7 @@ topics](/help/mute-a-topic) are automatically migrated when an entire topic is moved. Organizations can [configure](/help/restrict-moving-messages) which -[roles](/help/roles-and-permissions) have permission to modify topics. +[roles](/help/user-roles) have permission to modify topics. ## Move messages to another topic diff --git a/help/moving-to-zulip.md b/help/moving-to-zulip.md index 93d3eec27a..09414810f0 100644 --- a/help/moving-to-zulip.md +++ b/help/moving-to-zulip.md @@ -119,7 +119,7 @@ you will need to upgrade your plan. 1. [Create user groups](/help/create-user-groups), which offer a flexible way to manage permissions. -1. Review [organization permissions](/help/roles-and-permissions), such as who +1. Review [organization permissions](/help/manage-permissions), such as who can invite users, create channels, etc. 1. If your organization uses an issue tracker (e.g., GitHub, Salesforce, diff --git a/help/rename-a-topic.md b/help/rename-a-topic.md index 595f75e5bf..73e1a53a00 100644 --- a/help/rename-a-topic.md +++ b/help/rename-a-topic.md @@ -11,7 +11,7 @@ will automatically redirect to the new location of the message. [Muted topics](/help/mute-a-topic) are automatically migrated when a topic is renamed. Organizations can [configure](/help/restrict-moving-messages) which -[roles](/help/roles-and-permissions) have permission to rename topics. +[roles](/help/user-roles) have permission to rename topics. ## Rename a topic diff --git a/help/restrict-account-creation.md b/help/restrict-account-creation.md index 7063522d80..7af99cbae3 100644 --- a/help/restrict-account-creation.md +++ b/help/restrict-account-creation.md @@ -17,7 +17,7 @@ account and how users access their accounts: join](#set-whether-invitations-are-required-to-join) without an invitation. * You can [restrict the ability to invite new users](#change-who-can-send-invitations) to - join your Zulip organization to specific [roles](/help/roles-and-permissions). + join your Zulip organization to specific [roles](/help/user-roles). Regardless of whether invitations are required, you can: diff --git a/help/restrict-moving-messages.md b/help/restrict-moving-messages.md index 3cc56b307d..fd805ffd9f 100644 --- a/help/restrict-moving-messages.md +++ b/help/restrict-moving-messages.md @@ -2,7 +2,7 @@ {!admin-only.md!} -Zulip lets you configure which [roles](/help/roles-and-permissions) can edit +Zulip lets you configure which [roles](/help/user-roles) can edit message topics and move topics between channels. In general, allowing all organization members to edit message topics is highly recommended because: @@ -85,4 +85,4 @@ Permissions for moving messages between channels can be configured separately. * [Move content to another channel](/help/move-content-to-another-channel) * [Restrict message editing and deletion](/help/restrict-message-editing-and-deletion) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) diff --git a/help/restrict-permissions-of-new-members.md b/help/restrict-permissions-of-new-members.md index 2437c084da..bf536c4f87 100644 --- a/help/restrict-permissions-of-new-members.md +++ b/help/restrict-permissions-of-new-members.md @@ -33,4 +33,4 @@ and many more. ## Related articles -- [Roles and permissions](/help/roles-and-permissions) +- [User roles](/help/user-roles) diff --git a/help/scim.md b/help/scim.md index ae250ed00f..92e74d106e 100644 --- a/help/scim.md +++ b/help/scim.md @@ -66,7 +66,7 @@ Zulip's SCIM integration has the following limitations: * **givenName** * **familyName** -1. **Optional:** If you'd like to also sync [user role](/help/roles-and-permissions), +1. **Optional:** If you'd like to also sync [user role](/help/user-roles), you can do it by adding a custom attribute in Okta. Go to the **Profile Editor**, click into the entry of the SCIM app you've just set up and **Add Attribute**. Configure the following: diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index 897b1bf661..14f91c9870 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -138,7 +138,7 @@ A few settings to highlight: ### Roles and permissions Zulip offers [several levels of permissions based on user -roles](/help/roles-and-permissions). Here are some recommendations for +roles](/help/user-roles). Here are some recommendations for how to assign roles and permissions for a class. #### Recommended roles and permissions for a single-class Zulip organization @@ -228,7 +228,7 @@ For most classes, the following channels are recommended: - **#announcements**: For general announcements about the class. When creating this channel, [restrict posting permissions](/help/channel-posting-policy) so that only course staff - ([administrators and moderators](/help/roles-and-permissions)) are + ([administrators and moderators](/help/user-roles)) are allowed to post. - **#staff (private)**: For discussions among course staff. - **#general**: For random topics, e.g., students forming study groups. diff --git a/help/user-cards.md b/help/user-cards.md index 145cd600a2..e466dd4f8c 100644 --- a/help/user-cards.md +++ b/help/user-cards.md @@ -15,7 +15,7 @@ sent](/help/view-messages-sent-by-a-user). - Their name. - Their email address, if you [have permission](/help/configure-email-visibility) to view it. -- Their [role](/help/roles-and-permissions) in the organization. +- Their [role](/help/user-roles) in the organization. - The custom profile fields [selected](/help/custom-profile-fields#display-custom-fields-on-user-card) by administrators to be featured on user cards. diff --git a/help/user-groups.md b/help/user-groups.md index daa690e3af..c427dff29e 100644 --- a/help/user-groups.md +++ b/help/user-groups.md @@ -56,4 +56,4 @@ organization's structure in Zulip's permissions system. * [Create user groups](/help/create-user-groups) * [Manage user groups](/help/manage-user-groups) * [Moving to Zulip](/help/moving-to-zulip) -* [Roles and permissions](/help/roles-and-permissions) +* [User roles](/help/user-roles) diff --git a/help/user-roles.md b/help/user-roles.md index 325c57fa58..9a11e31d10 100644 --- a/help/user-roles.md +++ b/help/user-roles.md @@ -15,7 +15,7 @@ You can also manage permissions with [custom user groups](/help/user-groups). owner's role. * **Moderator**: Can do anything that members can do, plus additional - permissions [configured](/help/roles-and-permissions#manage-permissions) by + permissions [configured](/help/manage-permissions) by your organization. * **Member**: This is the default role for most users. Members have access to @@ -78,6 +78,6 @@ existing owner's role. * [Guest users](/help/guest-users) * [User groups](/help/user-groups) -* [Roles and permissions](/help/roles-and-permissions#manage-permissions) +* [Manage permissions](/help/manage-permissions) * [Manage a user](/help/manage-a-user) * [Deactivate or reactivate a user](/help/deactivate-or-reactivate-a-user) diff --git a/help/view-all-bots-in-your-organization.md b/help/view-all-bots-in-your-organization.md index 9ac33042ed..e2a0991ef4 100644 --- a/help/view-all-bots-in-your-organization.md +++ b/help/view-all-bots-in-your-organization.md @@ -2,7 +2,7 @@ You can view a list of all bots in your organization, including deactivated bots. -Organization [administrators](/help/roles-and-permissions) can also +Organization [administrators](/help/user-roles) can also [deactivate](/help/deactivate-or-reactivate-a-bot), [reactivate](/help/deactivate-or-reactivate-a-bot) or [edit](/help/edit-a-bot#edit-a-bot-in-your-organization) any bot on the list. diff --git a/help/view-someones-profile.md b/help/view-someones-profile.md index ead4e5f6da..bb5150d4e3 100644 --- a/help/view-someones-profile.md +++ b/help/view-someones-profile.md @@ -12,7 +12,7 @@ A user's profile displays key information about the user. - Their email address, if you [have permission](/help/configure-email-visibility) to view it. - Their user ID. -- Their [role](/help/roles-and-permissions) in the organization. +- Their [role](/help/user-roles) in the organization. - The date they joined the organization. - Their current [local time](/help/change-your-timezone). - Their [availability](/help/status-and-availability#availability). diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index c896def1a2..7f6df92496 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -928,7 +928,7 @@ - + Manage permissions by user role @@ -958,7 +958,7 @@ - + Grant permissions to individual users diff --git a/templates/corporate/development-community.md b/templates/corporate/development-community.md index 11a036a575..e4081b5975 100644 --- a/templates/corporate/development-community.md +++ b/templates/corporate/development-community.md @@ -85,7 +85,7 @@ This section describes popular public channels on chat.zulip.org. Kick off the discussion by starting a [new topic](/help/introduction-to-topics) in the appropriate channel! Don’t stress too much about picking the right place if you’re not sure; anyone in the community can edit a -topic name, and [moderators](/help/roles-and-permissions) can [move a +topic name, and [moderators](/help/user-roles) can [move a topic to a different channel](/help/move-content-to-another-channel). ## Channels for everyone diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 8c276d3a8c..d12d59e9c5 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -421,7 +421,7 @@
Manage your organization with fine-grained permission settings you can assign - to user + to user roles, user groups, and individual @@ -438,10 +438,10 @@
  • - Add partners, vendors and temporary contractors as guest users. + Add partners, vendors and temporary contractors as guest users.
    • -
  • Use Zulip as your employee directory. Sync names, roles, avatars, and custom profile fields from LDAP or SAML.
    • +
  • Use Zulip as your employee directory. Sync names, roles, avatars, and custom profile fields from LDAP or SAML.
  • Manage compliance with flexible message retention diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index accebc717a..9bdbf47ff4 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -182,7 +182,7 @@
  • Assign permissions to course staff with fine-grained settings for user roles, user roles, user groups (like TAs), and individual users. @@ -299,7 +299,7 @@
  • File storage up to 5 GB total
  • Complete team chat solution
  • Hundreds of integrations
    • -
  • Advanced roles and permissions
    • +
  • Advanced roles and permissions
  • Guest accounts
    • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index 0e00992f7e..e85681aa6d 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -569,7 +569,7 @@ Manage your community with fine-grained permission settings you can assign to user roles, + href="/help/user-roles">user roles, user groups, and individual users. diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 2d3b542594..f1b77db175 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -321,7 +321,7 @@ Manage your community with fine-grained permission settings you can assign to user roles, + href="/help/user-roles">user roles, user groups, and individual users. diff --git a/templates/corporate/pricing_model.html b/templates/corporate/pricing_model.html index ff2f97148c..c38c8fe45a 100644 --- a/templates/corporate/pricing_model.html +++ b/templates/corporate/pricing_model.html @@ -40,7 +40,7 @@
  • File storage up to 5 GB total
  • Complete team chat solution
  • Hundreds of integrations
    • -
  • Advanced roles and permissions
    • +
  • Advanced roles and permissions
  • Guest accounts
  • Many organizations are eligible for a free Standard plan
    • diff --git a/templates/corporate/self-hosting.html b/templates/corporate/self-hosting.html index fc79ffe0bc..8918383168 100644 --- a/templates/corporate/self-hosting.html +++ b/templates/corporate/self-hosting.html @@ -50,7 +50,7 @@ Unlike the competition, you don't pay for SAML authentication, LDAP - sync, or advanced roles and permissions. There + sync, or advanced roles and permissions. There is no “open core” catch — just freely available world-class software.

    @@ -82,7 +82,7 @@ Zulip's authentication and permissions + href="/help/manage-permissions">permissions systems are designed to flexibly support every organization's security tools and policies.

    diff --git a/web/templates/invite_user_modal.hbs b/web/templates/invite_user_modal.hbs index 3b4063458f..c7d0c656b6 100644 --- a/web/templates/invite_user_modal.hbs +++ b/web/templates/invite_user_modal.hbs @@ -54,7 +54,7 @@
    {{> dropdown_options_widget option_values=user_role_values}} diff --git a/web/templates/settings/edit_bot_form.hbs b/web/templates/settings/edit_bot_form.hbs index 582d5b8d54..289419f332 100644 --- a/web/templates/settings/edit_bot_form.hbs +++ b/web/templates/settings/edit_bot_form.hbs @@ -16,7 +16,7 @@