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

@@ -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.

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:

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)
 

help/change-organization-url.md

@@ -19,7 +19,7 @@ their clients.
 
 Zulip Cloud organizations are generally hosted at `<subdomain>.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}
 

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)
 

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.
 

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)

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)

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).

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}
 

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

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)

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)

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    |
 |-------------------------|---------------|

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 |
 |------------------|------------|

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    |
 |-------------------------|---------------|

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.

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)

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).

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.

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)
 

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)

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

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)

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}

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).

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

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
 

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,

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
 

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:
 

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)

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)

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:

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.

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.

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)

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)

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.

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).

templates/corporate/comparison_table_integrated.html

@@ -928,7 +928,7 @@
             </tr>
             <tr>
                 <td class="comparison-table-feature">
-                    <a href="/help/roles-and-permissions">
+                    <a href="/help/user-roles">
                         Manage permissions by user role
                     </a>
                 </td>
@@ -958,7 +958,7 @@
             </tr>
             <tr>
                 <td class="comparison-table-feature">
-                    <a href="/help/roles-and-permissions#manage-permissions">
+                    <a href="/help/manage-permissions">
                         Grant permissions to individual users
                     </a>
                 </td>

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

templates/corporate/for/business.html

@@ -421,7 +421,7 @@
                         <div class="list-content">Manage your organization with
                             <a href="/help/channel-permissions#detailed-permissions">fine-grained
                             permission settings</a> you can assign
-                            to <a href="/help/roles-and-permissions">user
+                            to <a href="/help/user-roles">user
                             roles</a>, <a href="/help/user-groups">user
                             groups</a>,
                             and <a href="/help/manage-a-user">individual
@@ -438,10 +438,10 @@
                     </li>
                     <li>
                         <div class="list-content">
-                            Add partners, vendors and temporary contractors as <a href="/help/roles-and-permissions">guest users</a>.
+                            Add partners, vendors and temporary contractors as <a href="/help/guest-users">guest users</a>.
                         </div>
                     </li>
-                    <li><div class="list-content">Use Zulip as your employee directory. Sync names, <a href="/help/roles-and-permissions">roles</a>, avatars, and <a href="/help/custom-profile-fields">custom profile fields</a> from LDAP or SAML.</div></li>
+                    <li><div class="list-content">Use Zulip as your employee directory. Sync names, <a href="/help/user-roles">roles</a>, avatars, and <a href="/help/custom-profile-fields">custom profile fields</a> from LDAP or SAML.</div></li>
                     <li>
                         <div class="list-content">Manage compliance with flexible <a
                             href="/help/message-retention-policy">message retention

templates/corporate/for/education.html

@@ -182,7 +182,7 @@
                     <li>
                         <div class="list-content">Assign permissions to course staff with <a
                             href="/help/channel-permissions#detailed-permissions">fine-grained settings</a> for <a
-                            href="/help/roles-and-permissions">user roles</a>, <a
+                            href="/help/user-roles">user roles</a>, <a
                             href="/help/user-groups">user groups</a> (like TAs), and <a
                             href="/help/manage-a-user">individual
                             users</a>.
@@ -299,7 +299,7 @@
                                     <li>File storage up to 5 GB total</li>
                                     <li><a href="/features/">Complete</a> team chat solution</li>
                                     <li><a href="/integrations/">Hundreds of integrations</a></li>
-                                    <li>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/channel-permissions">permissions</a></li>
+                                    <li>Advanced <a href="/help/user-roles">roles</a> and <a href="/help/channel-permissions">permissions</a></li>
                                     <li><a href="/help/guest-users">Guest</a> accounts</li>
                                 </ul>
                             </div>

templates/corporate/for/open-source.html

@@ -569,7 +569,7 @@
                             Manage your community with <a
                             href="/help/channel-permissions#detailed-permissions">fine-grained
                             permission settings</a> you can assign to <a
-                            href="/help/roles-and-permissions">user roles</a>,
+                            href="/help/user-roles">user roles</a>,
                             <a href="/help/user-groups">user groups</a>, and <a
                             href="/help/manage-a-user">individual users</a>.
                         </div>

templates/corporate/for/research.html

@@ -321,7 +321,7 @@
                             Manage your community with <a
                             href="/help/channel-permissions#detailed-permissions">fine-grained
                             permission settings</a> you can assign to <a
-                            href="/help/roles-and-permissions">user roles</a>,
+                            href="/help/user-roles">user roles</a>,
                             <a href="/help/user-groups">user groups</a>, and <a
                             href="/help/manage-a-user">individual users</a>.
                         </div>

templates/corporate/pricing_model.html

@@ -40,7 +40,7 @@
                                 <li><span>File storage up to 5 GB total</span></li>
                                 <li><span><a href="{{ billing_base_url }}/plans/#cloud-plan-comparison">Complete</a> team chat solution</span></li>
                                 <li><span><a href="/integrations/">Hundreds of integrations</a></span></li>
-                                <li><span>Advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/channel-permissions">permissions</a></span></li>
+                                <li><span>Advanced <a href="/help/user-roles">roles</a> and <a href="/help/channel-permissions">permissions</a></span></li>
                                 <li><span><a href="/help/guest-users">Guest</a>
                                 accounts</span></li>
                                 <li><span>Many organizations are eligible for a <a href="{{ billing_base_url }}/plans/#cloud-sponsorships">free Standard plan</a></span></li>

templates/corporate/self-hosting.html

@@ -50,7 +50,7 @@
                         Unlike the competition, you don't pay for
                         <a href="https://zulip.readthedocs.io/en/stable/production/authentication-methods.html">SAML
                             authentication</a>, <a href="https://zulip.readthedocs.io/en/stable/production/authentication-methods.html#synchronizing-data">LDAP
-                        sync</a>, or advanced <a href="/help/roles-and-permissions">roles</a> and <a href="/help/channel-permissions">permissions</a>. There
+                        sync</a>, or advanced <a href="/help/user-roles">roles</a> and <a href="/help/channel-permissions">permissions</a>. There
                         is no “open core” catch — just freely available world-class software.
                     </p>
                 </div>
@@ -82,7 +82,7 @@
                         Zulip's <a
                         href="/help/configure-authentication-methods">authentication</a>
                         and <a
-                        href="/help/roles-and-permissions">permissions</a>
+                        href="/help/manage-permissions">permissions</a>
                         systems are designed to flexibly support every
                         organization's security tools and policies.
                     </p>

web/templates/invite_user_modal.hbs

@@ -54,7 +54,7 @@
     </div>
     <div class="input-group">
         <label for="invite_as" class="modal-field-label">{{t "Users join as" }}
-            {{> help_link_widget link="/help/roles-and-permissions" }}
+            {{> help_link_widget link="/help/user-roles" }}
         </label>
         <select id="invite_as" name="invite_as" class="invite-user-select modal_select bootstrap-focus-style">
             <option value="{{ invite_as_options.guest.code }}">{{t "Guests" }}</option>

web/templates/settings/admin_human_form.hbs

@@ -18,7 +18,7 @@
         </div>
         <div class="input-group">
             <label for="user-role-select" class="modal-field-label">{{t 'User role' }}
-                {{> ../help_link_widget link="/help/roles-and-permissions" }}
+                {{> ../help_link_widget link="/help/user-roles" }}
             </label>
             <select name="user-role-select" class="bootstrap-focus-style modal_select" id="user-role-select" data-setting-widget-type="number" {{#if disable_role_dropdown}}disabled{{/if}}>
                 {{> dropdown_options_widget option_values=user_role_values}}

web/templates/settings/edit_bot_form.hbs

@@ -16,7 +16,7 @@
         </div>
         <div class="input-group">
             <label for="bot-role-select" class="modal-field-label">{{t 'Role' }}
-                {{> ../help_link_widget link="/help/roles-and-permissions" }}
+                {{> ../help_link_widget link="/help/user-roles" }}
             </label>
             <select name="bot-role-select" id="bot-role-select" class="modal_select bootstrap-focus-style" data-setting-widget-type="number" {{#if disable_role_dropdown}}disabled{{/if}}>
                 {{> dropdown_options_widget option_values=user_role_values}}

zerver/lib/home.py

@@ -75,7 +75,7 @@ def promote_sponsoring_zulip_in_realm(realm: Realm) -> bool:
 
 
 def get_billing_info(user_profile: UserProfile | None) -> BillingInfo:
-    # See https://zulip.com/help/roles-and-permissions for clarity.
+    # See https://zulip.com/help/user-roles for clarity.
     show_billing = False
     show_plans = False
     sponsorship_pending = False

zerver/lib/url_redirects.py

@@ -126,6 +126,7 @@ HELP_DOCUMENTATION_REDIRECTS: list[URLRedirect] = [
     URLRedirect("/help/getting-your-organization-started-with-zulip", "/help/moving-to-zulip"),
     URLRedirect("/help/quote-and-reply", "/help/quote-or-forward-a-message"),
     URLRedirect("/help/change-a-users-role", "/help/user-roles"),
+    URLRedirect("/help/roles-and-permissions", "/help/user-roles"),
 ]
 
 LANDING_PAGE_REDIRECTS = [

zerver/openapi/zulip.yaml

@@ -489,7 +489,7 @@ paths:
                                     - type: object
                                       additionalProperties: false
                                       description: |
-                                        When the [role](/help/roles-and-permissions) of a user changes.
+                                        When the [role](/help/user-roles) of a user changes.
                                       properties:
                                         user_id:
                                           type: integer
@@ -839,7 +839,7 @@ paths:
 
                                 Prior to Zulip 8.0 (feature level 205), this event was not sent when
                                 a user gained access to a channel due to their [role
-                                changing](/help/roles-and-permissions).
+                                changing](/help/user-roles).
 
                                 Prior to Zulip 6.0 (feature level 134), this event was not sent when a
                                 private channel was made public.
@@ -1291,7 +1291,7 @@ paths:
 
                                 This event is also sent when a user gains access to a channel they
                                 previously [could not access](/help/channel-permissions), such as
-                                when their [role](/help/roles-and-permissions) changes, a
+                                when their [role](/help/user-roles) changes, a
                                 private channel is made public, or a guest user is subscribed
                                 to a public (or private) channel.
 
@@ -1364,7 +1364,7 @@ paths:
 
                                 This event is also sent when a user loses access to a channel they
                                 previously [could access](/help/channel-permissions) because they
-                                are unsubscribed from a private channel or their [role](/help/roles-and-permissions)
+                                are unsubscribed from a private channel or their [role](/help/user-roles)
                                 has changed.
 
                                 **Changes**: Prior to Zulip 8.0 (feature level 205), this event was
@@ -12850,7 +12850,7 @@ paths:
 
         Supports everything an administrator can do to edit details of another
         user's account, including editing full name,
-        [role](/help/roles-and-permissions), and [custom profile
+        [role](/help/user-roles), and [custom profile
         fields](/help/custom-profile-fields).
       parameters:
         - $ref: "#/components/parameters/UserId"
@@ -21073,7 +21073,7 @@ paths:
         !!! warn ""
 
             **Note**: This endpoint is only available to [members and
-            administrators](/help/roles-and-permissions); bots and guests
+            administrators](/help/user-roles); bots and guests
             cannot use this endpoint.
       requestBody:
         required: false