diff --git a/help/channels-and-topics.md b/help/channels-and-topics.md index 9d6d3d5def..75aca5b39c 100644 --- a/help/channels-and-topics.md +++ b/help/channels-and-topics.md @@ -10,7 +10,7 @@ * [Reading conversations](/help/reading-conversations) * [Starting a new topic](/help/starting-a-new-topic) * [Replying to messages](/help/replying-to-messages) -* [Creating streams for your organization](/help/getting-your-organization-started-with-zulip#create-streams) +* [Creating channels for your organization](/help/getting-your-organization-started-with-zulip#create-channels) * [Stream permissions](/help/stream-permissions) * Browse the articles under **Channels & topics** and **Channel management** on the left sidebar. diff --git a/help/create-a-stream.md b/help/create-a-stream.md index 39597c5617..f6a1e075f0 100644 --- a/help/create-a-stream.md +++ b/help/create-a-stream.md @@ -5,11 +5,11 @@ By default, all users other than guests can create streams. Administrators can [roles](/help/roles-and-permissions). If you are an administrator setting up streams for the first time, check out our -[guide to setting up streams for a new organization](/help/create-streams). +[guide to setting up channels for a new organization](/help/create-channels). -## Create a stream +## Create a channel -{!create-a-stream-instructions.md!} +{!create-a-channel-instructions.md!} ## Stream options @@ -44,7 +44,7 @@ There are several parameters you can set while creating a stream. All but ## Related articles -* [Create streams for a new organization](/help/create-streams) +* [Create channels for a new organization](/help/create-channels) * [Stream permissions](/help/stream-permissions) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams) diff --git a/help/create-streams.md b/help/create-channels.md similarity index 56% rename from help/create-streams.md rename to help/create-channels.md index f1240a6dc2..33ace94838 100644 --- a/help/create-streams.md +++ b/help/create-channels.md @@ -1,16 +1,16 @@ -# Create streams +# Create channels -{!create-streams-intro.md!} +{!create-channels-intro.md!} -## How to create a stream +## How to create a channel -{!create-a-stream-instructions.md!} +{!create-a-channel-instructions.md!} -For more details about stream settings, see [Create a stream](/help/create-a-stream#stream-options). +For more details about channel settings, see [Create a channel](/help/create-a-stream#stream-options). -## Tips for creating streams +## Tips for creating channels -{!tips-for-creating-streams.md!} +{!tips-for-creating-channels.md!} ## Related articles diff --git a/help/create-your-organization-profile.md b/help/create-your-organization-profile.md index f0404deedd..9c1784a5b6 100644 --- a/help/create-your-organization-profile.md +++ b/help/create-your-organization-profile.md @@ -26,6 +26,6 @@ For more details, see [Communities directory](/help/communities-directory). * [Setting up your organization](/help/getting-your-organization-started-with-zulip) * [Customize organization settings](/help/customize-organization-settings) -* [Create streams](/help/create-streams) +* [Create channels](/help/create-channels) * [Communities directory](/help/communities-directory) * [Getting started with Zulip](/help/getting-started-with-zulip) diff --git a/help/customize-organization-settings.md b/help/customize-organization-settings.md index e11f997d0e..d409156806 100644 --- a/help/customize-organization-settings.md +++ b/help/customize-organization-settings.md @@ -6,5 +6,5 @@ * [Setting up your organization](/help/getting-your-organization-started-with-zulip) * [Create your organization profile](/help/create-your-organization-profile) -* [Create streams](/help/create-streams) +* [Create channels](/help/create-channels) * [Getting started with Zulip](/help/getting-started-with-zulip) diff --git a/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md index 920d2e8ac3..cd7767eba3 100644 --- a/help/getting-your-organization-started-with-zulip.md +++ b/help/getting-your-organization-started-with-zulip.md @@ -49,9 +49,9 @@ us know! {!customize-organization-settings.md!} -## Create streams +## Create channels -{!create-streams-intro.md!} +{!create-channels-intro.md!} ### How to create a stream @@ -68,9 +68,9 @@ us know! For more details about stream settings, see [Create a stream](/help/create-a-stream#stream-options). -### Tips for creating streams +### Tips for creating channels -{!tips-for-creating-streams.md!} +{!tips-for-creating-channels.md!} ## Customize settings for new users diff --git a/help/include/create-a-stream-instructions.md b/help/include/create-a-channel-instructions.md similarity index 100% rename from help/include/create-a-stream-instructions.md rename to help/include/create-a-channel-instructions.md diff --git a/help/include/create-streams-intro.md b/help/include/create-channels-intro.md similarity index 100% rename from help/include/create-streams-intro.md rename to help/include/create-channels-intro.md diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index a0ea17b149..bdf69a183e 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -24,7 +24,7 @@ * [Migrating from other chat tools](/help/migrating-from-other-chat-tools) * [Create your organization profile](/help/create-your-organization-profile) * [Customize organization settings](/help/customize-organization-settings) -* [Create streams](/help/create-streams) +* [Create channels](/help/create-channels) * [Customize settings for new users](/help/customize-settings-for-new-users) * [Invite users to join](/help/invite-users-to-join) * [Create user groups](/help/create-user-groups) diff --git a/help/include/tips-for-creating-streams.md b/help/include/tips-for-creating-channels.md similarity index 50% rename from help/include/tips-for-creating-streams.md rename to help/include/tips-for-creating-channels.md index 50b28c0e52..3ee5d38b2b 100644 --- a/help/include/tips-for-creating-streams.md +++ b/help/include/tips-for-creating-channels.md @@ -1,17 +1,17 @@ -* It's often best to start with just a few streams, and add more as - needed. For small teams, you can start with the default streams and - go from there. +* It's often best to start with just a few channels, and add more as + needed. For small teams, you can start with the default channels + and go from there. * For large organizations, we recommend using a consistent naming - scheme, like `#marketing/` or `#mk/` for all streams + scheme, like `#marketing/` or `#mk/` for all channels pertaining to the marketing team, `#help/` for - ``'s internal support stream, etc. + ``'s internal support channel, etc. -* A `#zulip help` stream can be useful for providing internal Zulip +* A `#zulip help` channel can be useful for providing internal Zulip support and answering questions about Zulip. * For open source projects or other volunteer organizations, consider - adding default streams like `#announce` for announcements, `#new + adding default channels like `#announce` for announcements, `#new members` for new members to introduce themselves and be welcomed, and `#help` so that there's a clear place users stopping by with just a single question can post. diff --git a/help/include/trying-out-zulip.md b/help/include/trying-out-zulip.md index 60e1d6656b..b2a6b237e4 100644 --- a/help/include/trying-out-zulip.md +++ b/help/include/trying-out-zulip.md @@ -33,7 +33,7 @@ It's also easy to try out Zulip for yourself. and [settings for new users](/help/customize-settings-for-new-users), but plan to adjust the details as you go. - - [Create](/help/create-streams) your initial + - [Create](/help/create-channels) your initial [channels](/help/channels-and-topics), including a dedicated channel for questions and feedback about using Zulip. diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index 2c3f498760..1a925aa618 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -205,9 +205,9 @@ how to assign roles and permissions for a class. - Set [who can create and manage user groups][user-group-permissions]. (Recommended: Admins and moderators) -## Create streams +## Create channels -{!create-streams-intro.md!} +{!create-channels-intro.md!} ### How to create a stream diff --git a/web/templates/stream_settings/stream_settings_overlay.hbs b/web/templates/stream_settings/stream_settings_overlay.hbs index da418abfc9..f4b92804ae 100644 --- a/web/templates/stream_settings/stream_settings_overlay.hbs +++ b/web/templates/stream_settings/stream_settings_overlay.hbs @@ -57,7 +57,7 @@ {{#tr}} First time? Read our guidelines for creating and naming channels. - {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} + {{#*inline "z-link"}}{{> @partial-block}}{{/inline}} {{/tr}} {{/if}} diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 927fbb696a..459f568ca2 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -85,6 +85,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect("/help/bots-and-integrations", "/help/bots-overview"), URLRedirect("/help/configure-notification-bot", "/help/configure-automated-notices"), URLRedirect("/help/all-messages", "/help/combined-feed"), + URLRedirect("/help/create-streams", "/help/create-channels"), ] LANDING_PAGE_REDIRECTS = [