diff --git a/help/configure-who-can-create-streams.md b/help/configure-who-can-create-channels.md similarity index 62% rename from help/configure-who-can-create-streams.md rename to help/configure-who-can-create-channels.md index 929ffaa16a..cf0670f738 100644 --- a/help/configure-who-can-create-streams.md +++ b/help/configure-who-can-create-channels.md @@ -1,22 +1,22 @@ -# Restrict stream creation +# Restrict channel creation {!admin-only.md!} Zulip allows you to separately control [permissions](/help/roles-and-permissions) for creating [web-public](/help/public-access-option), public and private -streams. +channels. For corporations and other organizations with controlled access, we -recommend keeping stream creation open to make it easy for users to +recommend keeping channel creation open to make it easy for users to self-organize. Only users in trusted roles (moderators and administrators) can be -given permission to create web-public streams. This is intended +given permission to create web-public channels. This is intended [to help manage abuse](/help/public-access-option#managing-abuse) by making it hard for an attacker to host malicious content in an -unadvertised web-public stream in a legitimate organization. +unadvertised web-public channel in a legitimate organization. -### Manage who can create streams +### Manage who can create channels {start_tabs} @@ -24,7 +24,7 @@ unadvertised web-public stream in a legitimate organization. {settings_tab|organization-permissions} -1. Under **Stream permissions**, configure **Who can create public streams**. +1. Under **Channel permissions**, configure **Who can create public channels**. {!save-changes.md!} @@ -32,7 +32,7 @@ unadvertised web-public stream in a legitimate organization. {settings_tab|organization-permissions} -1. Under **Stream permissions**, configure **Who can create private streams**. +1. Under **Channel permissions**, configure **Who can create private channels**. {!save-changes.md!} @@ -40,7 +40,7 @@ unadvertised web-public stream in a legitimate organization. {settings_tab|organization-permissions} -1. Under **Stream permissions**, configure **Who can create web-public streams**. +1. Under **Channel permissions**, configure **Who can create web-public channels**. {!save-changes.md!} diff --git a/help/create-a-channel.md b/help/create-a-channel.md index 65b4103a9a..525f0dbba4 100644 --- a/help/create-a-channel.md +++ b/help/create-a-channel.md @@ -1,7 +1,7 @@ # Create a channel By default, all users other than guests can create channels. Administrators can -[restrict the ability to create a channel](/help/configure-who-can-create-streams) to specific +[restrict the ability to create a channel](/help/configure-who-can-create-channels) to specific [roles](/help/roles-and-permissions). If you are an administrator setting up channels for the first time, check out our diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 9c146afbcb..7a6f0883ef 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -203,7 +203,7 @@ * [Channel permissions](/help/channel-permissions) * [Public access option](/help/public-access-option) * [Channel posting policy](/help/channel-posting-policy) -* [Restrict stream creation](/help/configure-who-can-create-streams) +* [Restrict channel creation](/help/configure-who-can-create-channels) * [Restrict stream membership management](/help/configure-who-can-invite-to-streams) * [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) diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md index c2228a0167..9b3863c410 100644 --- a/help/moderating-open-organizations.md +++ b/help/moderating-open-organizations.md @@ -26,7 +26,7 @@ problematic behavior. ### Restrict permissions for making changes -* Restrict who can [create streams](/help/configure-who-can-create-streams), or +* Restrict who can [create channels](/help/configure-who-can-create-channels), or monitor new streams by enabling [new stream announcements](/help/configure-automated-notices#new-stream-announcements). * Restrict who can [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji). diff --git a/help/public-access-option.md b/help/public-access-option.md index 9e7bf4d7db..3020dddc30 100644 --- a/help/public-access-option.md +++ b/help/public-access-option.md @@ -174,4 +174,4 @@ with [Zulip's Rules of Use](https://zulip.com/policies/rules). * [Moderating open organizations](/help/moderating-open-organizations) * [Channel permissions](/help/channel-permissions) -* [Restrict stream creation](/help/configure-who-can-create-streams) +* [Restrict channel creation](/help/configure-who-can-create-channels) diff --git a/help/restrict-direct-messages.md b/help/restrict-direct-messages.md index 3e6651f8b2..f9febfe346 100644 --- a/help/restrict-direct-messages.md +++ b/help/restrict-direct-messages.md @@ -35,4 +35,4 @@ Zulip's new user onboarding experience). Consider also [restricting bot creation](/help/restrict-bot-creation) when using this feature. * Restricting direct messages does not automatically [restrict creating -private streams](/help/configure-who-can-create-streams). +private channels](/help/configure-who-can-create-channels). diff --git a/help/restrict-permissions-of-new-members.md b/help/restrict-permissions-of-new-members.md index 0f756ee287..2437c084da 100644 --- a/help/restrict-permissions-of-new-members.md +++ b/help/restrict-permissions-of-new-members.md @@ -13,7 +13,7 @@ You can configure how long the waiting period is, as well as which actions requi being a full member. For some features, Zulip supports restricting access to only full members. These -features include [creating streams](/help/configure-who-can-create-streams), +features include [creating channels](/help/configure-who-can-create-channels), [inviting users to the organization](/help/invite-new-users), [adding custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji), and many more. diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index 43ba7b6645..e956d8c364 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -163,7 +163,7 @@ how to assign roles and permissions for a class. (Recommended: Admins) - Set [who can access user email addresses](/help/configure-email-visibility). (Recommended: Admins only) -- Set [who can create streams](/help/configure-who-can-create-streams). +- 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). (Recommended: Admins and moderators) @@ -193,7 +193,7 @@ how to assign roles and permissions for a class. (Recommended: Admins and moderators) - Set [who can access user email addresses](/help/configure-email-visibility). (Recommended: Admins only) -- Set [who can create streams](/help/configure-who-can-create-streams). +- 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). diff --git a/templates/corporate/security.md b/templates/corporate/security.md index f7462fe874..6a9e38895f 100644 --- a/templates/corporate/security.md +++ b/templates/corporate/security.md @@ -53,7 +53,7 @@ priority. - Zulip can limit the features that new users have access to until their 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-streams), + [create streams](/help/configure-who-can-create-channels), [invite to streams](/help/configure-who-can-invite-to-streams), [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji), [add integrations and bots](/help/restrict-bot-creation), diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 8a65c49575..b778b2a8a9 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -105,6 +105,9 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ ), URLRedirect("/help/stream-permissions", "/help/channel-permissions"), URLRedirect("/help/stream-sending-policy", "/help/channel-posting-policy"), + URLRedirect( + "/help/configure-who-can-create-streams", "/help/configure-who-can-create-channels" + ), ] LANDING_PAGE_REDIRECTS = [ diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 2bac6824ba..f35bec5391 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -16215,7 +16215,7 @@ paths: Whether the current user is allowed to create at least one type of stream with the organization's [stream creation - policy](/help/configure-who-can-create-streams). Its value will + policy](/help/configure-who-can-create-channels). Its value will always equal `can_create_public_streams || can_create_private_streams`. **Changes**: Deprecated in Zulip 5.0 (feature level 102), when @@ -16230,7 +16230,7 @@ paths: Present if `realm_user` is present in `fetch_event_types`. Whether the current user is allowed to create public streams with - the organization's [stream creation policy](/help/configure-who-can-create-streams). + the organization's [stream creation policy](/help/configure-who-can-create-channels). **Changes**: New in Zulip 5.0 (feature level 102). In older versions, the deprecated `can_create_streams` property should be @@ -16241,7 +16241,7 @@ paths: Present if `realm_user` is present in `fetch_event_types`. Whether the current user is allowed to create private streams with - the organization's [stream creation policy](/help/configure-who-can-create-streams). + the organization's [stream creation policy](/help/configure-who-can-create-channels). **Changes**: New in Zulip 5.0 (feature level 102). In older versions, the deprecated `can_create_streams` property should be @@ -16252,7 +16252,7 @@ paths: Present if `realm_user` is present in `fetch_event_types`. Whether the current user is allowed to create public streams with - the organization's [stream creation policy](/help/configure-who-can-create-streams). + the organization's [stream creation policy](/help/configure-who-can-create-channels). Note that this will be false if the Zulip server does not have the `WEB_PUBLIC_STREAMS_ENABLED` setting enabled or if the organization has