diff --git a/help/add-or-remove-users-from-a-channel.md b/help/add-or-remove-users-from-a-channel.md index 8d5ec94dfe..bd6cb0424d 100644 --- a/help/add-or-remove-users-from-a-channel.md +++ b/help/add-or-remove-users-from-a-channel.md @@ -10,8 +10,8 @@ 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 channel][add-users] or [remove other users from a channel][remove-users]. -[add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users -[remove-users]: /help/configure-who-can-invite-to-streams#configure-who-can-remove-users +[add-users]: /help/configure-who-can-invite-to-channels#configure-who-can-add-users +[remove-users]: /help/configure-who-can-invite-to-channels#configure-who-can-remove-users ## Add users to a channel @@ -151,7 +151,7 @@ subscribe the user. * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) * [Unsubscribe from a channel][unsubscribe] * [Manage a user's channel subscriptions](/help/manage-user-channel-subscriptions) -* [Restrict stream invitation](/help/configure-who-can-invite-to-streams) +* [Restrict channel invitations](/help/configure-who-can-invite-to-channels) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Roles and permissions](/help/roles-and-permissions) * [Mention a user or group](/help/mention-a-user-or-group) diff --git a/help/channel-permissions.md b/help/channel-permissions.md index 2e8c9aac46..45f8f716f2 100644 --- a/help/channel-permissions.md +++ b/help/channel-permissions.md @@ -124,5 +124,5 @@ for details. * [Channel sending policy](/help/channel-posting-policy) * [Web-public channels](/help/public-access-option) -[add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users -[remove-users]: /help/configure-who-can-invite-to-streams#configure-who-can-remove-users +[add-users]: /help/configure-who-can-invite-to-channels#configure-who-can-add-users +[remove-users]: /help/configure-who-can-invite-to-channels#configure-who-can-remove-users diff --git a/help/configure-who-can-invite-to-streams.md b/help/configure-who-can-invite-to-channels.md similarity index 55% rename from help/configure-who-can-invite-to-streams.md rename to help/configure-who-can-invite-to-channels.md index 50d1b8a724..cc4cf53f95 100644 --- a/help/configure-who-can-invite-to-streams.md +++ b/help/configure-who-can-invite-to-channels.md @@ -1,12 +1,12 @@ -# Restrict stream membership management +# Restrict channel membership management {!admin-only.md!} -By default, anyone other than guests can add other users to streams. However, +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 -other users from a public stream. For private streams, administrators must be -subscribed to the stream to configure these settings. +other users from a public channel. For private channels, administrators must be +subscribed to the channel to configure these settings. ## Configure who can add users @@ -14,7 +14,7 @@ subscribed to the stream to configure these settings. {settings_tab|organization-permissions} -1. Under **Stream permissions**, configure **Who can add users to streams**. +1. Under **Channel permissions**, configure **Who can add users to channels**. {!save-changes.md!} @@ -26,12 +26,12 @@ subscribed to the stream to configure these settings. {relative|stream|all} -1. Select a stream. +1. Select a channel. {!select-channel-view-general.md!} -1. Under **Stream permissions**, configure - **Who can unsubscribe others from this stream?** +1. Under **Channel permissions**, configure + **Who can unsubscribe others from this channel?** {!save-changes.md!} diff --git a/help/create-a-channel.md b/help/create-a-channel.md index 525f0dbba4..3caf6af5be 100644 --- a/help/create-a-channel.md +++ b/help/create-a-channel.md @@ -34,7 +34,7 @@ There are several parameters you can set while creating a channel. All but * **Who can post to the stream?**: See [Channel permissions](/help/channel-permissions). * **Who can unsubscribe others from this stream?**: See - [Restrict stream membership management](/help/configure-who-can-invite-to-streams#configure-who-can-remove-users). + [Restrict channel membership management](/help/configure-who-can-invite-to-channels#configure-who-can-remove-users). * **Message retention period**: See [Message retention policy](/help/message-retention-policy#configure-message-retention-policy-for-individual-streams). diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 7a6f0883ef..d1c85a3e02 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -204,7 +204,7 @@ * [Public access option](/help/public-access-option) * [Channel posting policy](/help/channel-posting-policy) * [Restrict channel creation](/help/configure-who-can-create-channels) -* [Restrict stream membership management](/help/configure-who-can-invite-to-streams) +* [Restrict channel membership management](/help/configure-who-can-invite-to-channels) * [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Rename a stream](/help/rename-a-stream) diff --git a/help/manage-user-channel-subscriptions.md b/help/manage-user-channel-subscriptions.md index 53855e17e2..770bb34c73 100644 --- a/help/manage-user-channel-subscriptions.md +++ b/help/manage-user-channel-subscriptions.md @@ -93,4 +93,4 @@ channel](/help/unsubscribe-from-a-channel). * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel) * [View channel subscribers](/help/view-channel-subscribers) -[configure-invites]: /help/configure-who-can-invite-to-streams +[configure-invites]: /help/configure-who-can-invite-to-channels diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index e956d8c364..c4353fc590 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -165,7 +165,7 @@ how to assign roles and permissions for a class. (Recommended: Admins only) - Set [who can create channels](/help/configure-who-can-create-channels). (Recommended: Admins for public streams; Admins, moderators and members for private streams) -- Set [who can add users to streams](/help/configure-who-can-invite-to-streams). +- Set [who can add users to channels](/help/configure-who-can-invite-to-channels). (Recommended: Admins and moderators) - Set [who can edit the topic of any message](/help/restrict-moving-messages). (Recommended: (default) Members for small classes; @@ -196,7 +196,7 @@ how to assign roles and permissions for a class. - Set [who can create channels](/help/configure-who-can-create-channels). (Recommended: Admins and moderators for public streams; Admins, moderators and members for private streams) -- Set [who can add users to streams](/help/configure-who-can-invite-to-streams). +- Set [who can add users to channels](/help/configure-who-can-invite-to-channels). (Recommended: Admins and moderators) - Set [who can edit the topic of any message](/help/restrict-moving-messages). (Recommended: Admins and moderators) diff --git a/help/view-channel-subscribers.md b/help/view-channel-subscribers.md index 6c5a00b542..323aec92e6 100644 --- a/help/view-channel-subscribers.md +++ b/help/view-channel-subscribers.md @@ -3,7 +3,7 @@ Who is subscribed to a channel determines who receives the messages sent there. All non-[guest](/help/guest-users) users can view public channels and subscribe themselves. Organization administrators can -[configure](/help/configure-who-can-invite-to-streams) who can subscribe and +[configure](/help/configure-who-can-invite-to-channels) who can subscribe and unsubscribe other users to channels. ## View channel subscribers diff --git a/templates/corporate/security.md b/templates/corporate/security.md index 6a9e38895f..126f94e793 100644 --- a/templates/corporate/security.md +++ b/templates/corporate/security.md @@ -54,7 +54,7 @@ priority. accounts are older than a [configurable waiting period][waiting_period]. - Zulip also supports customizing whether non-admins can [create streams](/help/configure-who-can-create-channels), - [invite to streams](/help/configure-who-can-invite-to-streams), + [invite to streams](/help/configure-who-can-invite-to-channels), [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji), [add integrations and bots](/help/restrict-bot-creation), [edit or delete messages](/help/restrict-message-editing-and-deletion), diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index b778b2a8a9..55d52c60ac 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -108,6 +108,9 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect( "/help/configure-who-can-create-streams", "/help/configure-who-can-create-channels" ), + URLRedirect( + "/help/configure-who-can-invite-to-streams", "/help/configure-who-can-invite-to-channels" + ), ] LANDING_PAGE_REDIRECTS = [ diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index f35bec5391..48096634f9 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -16265,7 +16265,7 @@ paths: Present if `realm_user` is present in `fetch_event_types`. Whether the current user is allowed to subscribe other users to streams with - the organization's [streams policy](/help/configure-who-can-invite-to-streams). + the organization's [streams policy](/help/configure-who-can-invite-to-channels). can_invite_others_to_realm: type: boolean description: |