diff --git a/help/add-or-remove-users-from-a-channel.md b/help/add-or-remove-users-from-a-channel.md index bd6cb0424d..281c91ed79 100644 --- a/help/add-or-remove-users-from-a-channel.md +++ b/help/add-or-remove-users-from-a-channel.md @@ -152,7 +152,7 @@ subscribe the user. * [Unsubscribe from a channel][unsubscribe] * [Manage a user's channel subscriptions](/help/manage-user-channel-subscriptions) * [Restrict channel invitations](/help/configure-who-can-invite-to-channels) -* [Set default streams for new users](/help/set-default-streams-for-new-users) +* [Set default channels for new users](/help/set-default-channels-for-new-users) * [Roles and permissions](/help/roles-and-permissions) * [Mention a user or group](/help/mention-a-user-or-group) * [View channel subscribers](/help/view-channel-subscribers) diff --git a/help/channel-posting-policy.md b/help/channel-posting-policy.md index 347b78318e..e2ca53be32 100644 --- a/help/channel-posting-policy.md +++ b/help/channel-posting-policy.md @@ -4,7 +4,7 @@ By default, anyone who belongs to a channel can also send messages to the channel. However, sometimes it's useful to have a channel (often a -[default stream](/help/set-default-streams-for-new-users)) where only +[default channel](/help/set-default-channels-for-new-users)) where only certain users can send messages. {start_tabs} diff --git a/help/configure-default-new-user-settings.md b/help/configure-default-new-user-settings.md index 74064be04d..f2899b7788 100644 --- a/help/configure-default-new-user-settings.md +++ b/help/configure-default-new-user-settings.md @@ -69,5 +69,5 @@ API](/api/create-user). * [Setting up your organization](/help/getting-your-organization-started-with-zulip) * [Customize settings for new users](/help/customize-settings-for-new-users) -* [Set default streams for new users](/help/set-default-streams-for-new-users) +* [Set default channels for new users](/help/set-default-channels-for-new-users) * [Invite users to join](/help/invite-users-to-join) diff --git a/help/create-a-channel.md b/help/create-a-channel.md index 3caf6af5be..07e7a16859 100644 --- a/help/create-a-channel.md +++ b/help/create-a-channel.md @@ -28,8 +28,8 @@ There are several parameters you can set while creating a channel. All but * **Who can access the stream?**: See [Channel permissions](/help/channel-permissions). -* **Default stream for new users**: Whether new users will be [automatically - subscribed](/help/set-default-streams-for-new-users) to the new stream. +* **Default channel for new users**: Whether new users will be [automatically + subscribed](/help/set-default-channels-for-new-users) to the new channel. * **Who can post to the stream?**: See [Channel permissions](/help/channel-permissions). @@ -46,5 +46,5 @@ There are several parameters you can set while creating a channel. All but * [Create channels for a new organization](/help/create-channels) * [Channel permissions](/help/channel-permissions) -* [Set default streams for new users](/help/set-default-streams-for-new-users) +* [Set default channels for new users](/help/set-default-channels-for-new-users) * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) diff --git a/help/create-channels.md b/help/create-channels.md index 68cbbd3599..10643f3f0d 100644 --- a/help/create-channels.md +++ b/help/create-channels.md @@ -17,5 +17,5 @@ For more details about channel settings, see [Create a channel](/help/create-a-c * [Setting up your organization](/help/getting-your-organization-started-with-zulip) * [Create a channel](/help/create-a-channel#channel-options) * [Channel permissions](/help/channel-permissions) -* [Set default streams for new users](/help/set-default-streams-for-new-users) +* [Set default channels for new users](/help/set-default-channels-for-new-users) * [Getting started with Zulip](/help/getting-started-with-zulip) diff --git a/help/include/create-channels-intro.md b/help/include/create-channels-intro.md index 31e8fcc5f1..87c6e63112 100644 --- a/help/include/create-channels-intro.md +++ b/help/include/create-channels-intro.md @@ -3,7 +3,7 @@ channels in IRC/Slack/Discord, chat rooms, and email lists. We recommend setting up some channels before inviting other users to join Zulip, so that you can [automatically subscribe -everyone](/help/set-default-streams-for-new-users) to the right set of +everyone](/help/set-default-channels-for-new-users) to the right set of channels. If you later create additional channels, no worries! You can always add diff --git a/help/include/customize-settings-for-new-users.md b/help/include/customize-settings-for-new-users.md index 14cfa8fe72..7ddf5964b2 100644 --- a/help/include/customize-settings-for-new-users.md +++ b/help/include/customize-settings-for-new-users.md @@ -3,7 +3,7 @@ Customize settings for new users to get them off to a great start. * [Add custom profile fields](/help/custom-profile-fields#add-a-custom-profile-field), such as pronouns or job title. * [Configure default new user settings][default-user-settings]. -* [Set default streams for new users](/help/set-default-streams-for-new-users). +* [Set default channels for new users](/help/set-default-channels-for-new-users). * [Set organization language for automated messages and invitation emails][org-lang], if it should be something other than American English. diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index d1c85a3e02..a555db37be 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -206,7 +206,7 @@ * [Restrict channel creation](/help/configure-who-can-create-channels) * [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) +* [Set default channels for new users](/help/set-default-channels-for-new-users) * [Rename a stream](/help/rename-a-stream) * [Change a stream's description](/help/change-the-stream-description) * [Change the privacy of a stream](/help/change-the-privacy-of-a-stream) diff --git a/help/invite-new-users.md b/help/invite-new-users.md index 1af96e3010..050fe6ec1e 100644 --- a/help/invite-new-users.md +++ b/help/invite-new-users.md @@ -16,8 +16,8 @@ When you invite users, you can: * Set the [role](/help/roles-and-permissions) that they will have when they join. -* Configure which streams they will be added to. The organization's - [default streams](/help/set-default-streams-for-new-users) will be preselected. +* Configure which channels they will be added to. The organization's + [default channels](/help/set-default-channels-for-new-users) will be preselected. Organization administrators can [configure](/help/restrict-account-creation#change-who-can-send-invitations) @@ -39,7 +39,7 @@ permission to invite users. 1. Select what [role](/help/roles-and-permissions) the users will join as. -1. Configure which streams they will be added to. +1. Configure which channels they will be added to. 1. Click **Invite**. @@ -68,7 +68,7 @@ permission to invite users. 1. Select what [role](/help/roles-and-permissions) the users will join as. -1. Configure which streams they will be added to. +1. Configure which channels they will be added to. 1. Click **Generate invite link**. @@ -94,7 +94,7 @@ for invitations for the organization owners role. ## Related articles * [Restrict account creation](/help/restrict-account-creation) -* [Set default streams for new users](/help/set-default-streams-for-new-users) +* [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) diff --git a/help/invite-users-to-join.md b/help/invite-users-to-join.md index 517c81f6ca..ad79369c1d 100644 --- a/help/invite-users-to-join.md +++ b/help/invite-users-to-join.md @@ -21,6 +21,6 @@ to [Getting started with Zulip](/help/getting-started-with-zulip). * [Setting up your organization](/help/getting-your-organization-started-with-zulip) * [Invite new users](/help/invite-new-users) * [Restrict account creation](/help/restrict-account-creation) -* [Set default streams for new users](/help/set-default-streams-for-new-users) +* [Set default channels for new users](/help/set-default-channels-for-new-users) * [Customize settings for new users](/help/customize-settings-for-new-users) * [Getting started with Zulip](/help/getting-started-with-zulip) diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md index 9b3863c410..2ae5ce1150 100644 --- a/help/moderating-open-organizations.md +++ b/help/moderating-open-organizations.md @@ -51,7 +51,7 @@ problematic behavior. 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. -* Create a [default stream](/help/set-default-streams-for-new-users) +* Create a [default channel](/help/set-default-channels-for-new-users) for announcements where [only admins can post](/help/channel-posting-policy). * Restrict who can [send direct messages](/help/restrict-direct-messages). diff --git a/help/restrict-account-creation.md b/help/restrict-account-creation.md index 0d2b4de06c..7f598238d8 100644 --- a/help/restrict-account-creation.md +++ b/help/restrict-account-creation.md @@ -110,5 +110,5 @@ Regardless of whether invitations are required, you can: * [Configure authentication methods](/help/configure-authentication-methods) * [Invite new users](/help/invite-new-users) -* [Set default streams for new users](/help/set-default-streams-for-new-users) +* [Set default channels for new users](/help/set-default-channels-for-new-users) * [Configure default new user settings](/help/configure-default-new-user-settings) diff --git a/help/set-default-channels-for-new-users.md b/help/set-default-channels-for-new-users.md new file mode 100644 index 0000000000..3c256c2dfd --- /dev/null +++ b/help/set-default-channels-for-new-users.md @@ -0,0 +1,29 @@ +# Set default channels for new users + +{!admin-only.md!} + +When new users join a Zulip organization, they are subscribed to a default +set of channels. Organization administrators can add or remove channels from +that default set. + +## Add a new default channel + +{start_tabs} + +{settings_tab|default-streams-list} + +2. Under **Add new default channel**, enter the name of a channel. + +3. Click **Add channel**. + +{end_tabs} + +## Remove a default channel + +{start_tabs} + +{settings_tab|default-streams-list} + +2. Find the channel you would like to remove, and click **Remove from default**. + +{end_tabs} diff --git a/help/set-default-streams-for-new-users.md b/help/set-default-streams-for-new-users.md deleted file mode 100644 index e65c059d7b..0000000000 --- a/help/set-default-streams-for-new-users.md +++ /dev/null @@ -1,29 +0,0 @@ -# Set default streams for new users - -{!admin-only.md!} - -When new users join a Zulip organization, they are subscribed to a default -set of streams. Organization administrators can add or remove streams from -that default set. - -## Add a new default stream - -{start_tabs} - -{settings_tab|default-streams-list} - -2. Under **Add new default stream**, enter the name of a stream. - -3. Click **Add stream**. - -{end_tabs} - -## Remove a default stream - -{start_tabs} - -{settings_tab|default-streams-list} - -2. Find the stream you would like to remove, and click **Remove from default**. - -{end_tabs} diff --git a/help/view-channel-subscribers.md b/help/view-channel-subscribers.md index 323aec92e6..c874366a90 100644 --- a/help/view-channel-subscribers.md +++ b/help/view-channel-subscribers.md @@ -41,4 +41,4 @@ unsubscribe other users to channels. * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel) * [Manage a user's channel subscriptions](/help/manage-user-channel-subscriptions) * [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) +* [Set default channels for new users](/help/set-default-channels-for-new-users) diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index c75c9bb370..e7c6a8092f 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -928,8 +928,8 @@ - - Configure initial streams for new users + + Configure initial channels for new users diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index cad5ac2369..0b4a471c6f 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -424,7 +424,7 @@ and more. -
  • Automatically subscribe users to streams when they join, subscribe a group of users, or copy membership from another stream. Add users to the right streams for their team and role with custom invitation links.
    • +
  • Automatically subscribe users to streams when they join, subscribe a group of users, or copy membership from another stream. Add users to the right streams for their team and role with custom invitation links.
  • Manage your organization with fine-grained permission settings for administrators and moderators, and custom viewing and posting permissions for streams.
  • diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index e2345cfb2a..c6d06bbca5 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -169,7 +169,7 @@
  • Zulip offers dozens of features for moderating discussions.
  • Assign permissions to course staff with fine-grained settings for administrators and moderators.
  • Make an announcement stream where only course staff can post messages.
    • -
  • Quickly add staff and students to the right streams. Automatically subscribe users when they join, subscribe a group of users, or copy membership from another stream.
    • +
  • Quickly add staff and students to the right streams. Automatically subscribe users when they join, subscribe a group of users, or copy membership from another stream.
    • diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index 8f9ea1f8eb..4dccc2d575 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -227,7 +227,7 @@
  • Signing up for Zulip is quick and easy. Participants can make an account, or log in with Google, Apple, etc.
    • -
  • Automatically subscribe members to streams when they join, subscribe a group of users, or copy membership from another stream.
    • +
  • Automatically subscribe members to streams when they join, subscribe a group of users, or copy membership from another stream.
  • Make an announcement stream where only organizers can post messages. Use private streams to plan the event.
    • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index d2248596f5..ad00f518bc 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -560,7 +560,7 @@
  • Automatically subscribe members to - streams when + streams when they join.
    • diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index 2ec269ea91..9991b1f148 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -304,7 +304,7 @@
  • Automatically subscribe members to - streams when + streams when they join.
    • diff --git a/web/src/settings_streams.js b/web/src/settings_streams.js index 34f532ee53..030290b4e7 100644 --- a/web/src/settings_streams.js +++ b/web/src/settings_streams.js @@ -212,7 +212,7 @@ function show_add_default_streams_modal() { html_heading: $t_html({defaultMessage: "Add default channels"}), html_body, html_submit_button: $t_html({defaultMessage: "Add"}), - help_link: "/help/set-default-streams-for-new-users", + help_link: "/help/set-default-channels-for-new-users", id: "add-default-stream-modal", loading_spinner: true, on_click: add_default_streams, diff --git a/web/templates/stream_settings/stream_types.hbs b/web/templates/stream_settings/stream_types.hbs index 0094d0a687..b1fc70f3b4 100644 --- a/web/templates/stream_settings/stream_types.hbs +++ b/web/templates/stream_settings/stream_types.hbs @@ -22,7 +22,7 @@ setting_name="is_default_stream" is_checked=check_default_stream label=(t "Default channel for new users") - help_link="/help/set-default-streams-for-new-users" + help_link="/help/set-default-channels-for-new-users" }} diff --git a/zerver/data_import/slack.py b/zerver/data_import/slack.py index 741a27b9cb..875b6cb97f 100644 --- a/zerver/data_import/slack.py +++ b/zerver/data_import/slack.py @@ -189,7 +189,7 @@ def slack_workspace_to_realm( zerver_realmemoji, emoji_url_map = build_realmemoji(custom_emoji_list, realm_id) realm["zerver_realmemoji"] = zerver_realmemoji - # See https://zulip.com/help/set-default-streams-for-new-users + # See https://zulip.com/help/set-default-channels-for-new-users # for documentation on zerver_defaultstream realm["zerver_userprofile"] = zerver_userprofile diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 55d52c60ac..7849c3936d 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -111,6 +111,9 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect( "/help/configure-who-can-invite-to-streams", "/help/configure-who-can-invite-to-channels" ), + URLRedirect( + "/help/set-default-streams-for-new-users", "/help/set-default-channels-for-new-users" + ), ] LANDING_PAGE_REDIRECTS = [ diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 48096634f9..552d18ac3a 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -6005,7 +6005,7 @@ paths: Add a stream to the set of [default streams][default-streams] for new users joining the organization. - [default-streams]: /help/set-default-streams-for-new-users + [default-streams]: /help/set-default-channels-for-new-users requestBody: required: true content: @@ -6055,7 +6055,7 @@ paths: Remove a stream from the set of [default streams][default-streams] for new users joining the organization. - [default-streams]: /help/set-default-streams-for-new-users + [default-streams]: /help/set-default-channels-for-new-users x-requires-administrator: true requestBody: required: true @@ -9368,7 +9368,7 @@ paths: added as [default streams][default-streams] for new users joining the organization. - [default-streams]: /help/set-default-streams-for-new-users + [default-streams]: /help/set-default-channels-for-new-users **Changes**: New in Zulip 8.0 (feature level 200). Previously, default stream status could only be changed using the [dedicated API endpoint](/api/add-default-stream). @@ -13311,7 +13311,7 @@ paths: Present if `default_streams` is present in `fetch_event_types`. An array of dictionaries where each dictionary contains details - about a single [default stream](/help/set-default-streams-for-new-users) + about a single [default stream](/help/set-default-channels-for-new-users) for the Zulip organization. realm_default_stream_groups: type: array @@ -17697,7 +17697,7 @@ paths: parameter is `true`. Whether the given stream is a - [default stream](/help/set-default-streams-for-new-users). + [default stream](/help/set-default-channels-for-new-users). [include_default]: /api/get-streams#parameter-include_default required: @@ -17967,7 +17967,7 @@ paths: Add or remove the stream as a [default stream][default-stream] for new users joining the organization. - [default-stream]: /help/set-default-streams-for-new-users + [default-stream]: /help/set-default-channels-for-new-users **Changes**: New in Zulip 8.0 (feature level 200). Previously, default stream status could only be changed using the [dedicated API endpoint](/api/add-default-stream).