diff --git a/api_docs/construct-narrow.md b/api_docs/construct-narrow.md index 2f237fa21e..2e98d84a91 100644 --- a/api_docs/construct-narrow.md +++ b/api_docs/construct-narrow.md @@ -147,4 +147,4 @@ user 1234, and user 5678, the correct JSON-encoded query is: ``` [view-profile]: /help/view-someones-profile -[browse-streams]: /help/browse-and-subscribe-to-channels +[browse-streams]: /help/introduction-to-channels#browse-and-subscribe-to-channels diff --git a/api_docs/incoming-webhooks-overview.md b/api_docs/incoming-webhooks-overview.md index 6421a9c48d..b423e31bf0 100644 --- a/api_docs/incoming-webhooks-overview.md +++ b/api_docs/incoming-webhooks-overview.md @@ -212,7 +212,7 @@ For example, `test*` matches every event that starts with `test`. For a list of supported events, see a specific [integration's documentation](/integrations) page. -[browse-streams]: /help/browse-and-subscribe-to-channels +[browse-streams]: /help/introduction-to-channels#browse-and-subscribe-to-channels [add-bot]: /help/add-a-bot-or-integration [url-encoder]: https://www.urlencoder.org/ diff --git a/help/add-or-remove-users-from-a-channel.md b/help/add-or-remove-users-from-a-channel.md index dd4d08fe5d..d39cdd596b 100644 --- a/help/add-or-remove-users-from-a-channel.md +++ b/help/add-or-remove-users-from-a-channel.md @@ -148,7 +148,7 @@ subscribe the user. ## Related articles -* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) +* [Introduction to channels](/help/introduction-to-channels) * [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) diff --git a/help/channel-permissions.md b/help/channel-permissions.md index 45f8f716f2..50c4dd6d91 100644 --- a/help/channel-permissions.md +++ b/help/channel-permissions.md @@ -1,7 +1,8 @@ # Channel privacy settings -Channels are similar to chat rooms, IRC channels, or email lists in that they -determine who receives a message. Zulip supports a few types of channels: +{!channels-intro.md!} + +Zulip supports a few types of channels: * **Public** (): Members can join and view the complete message history. diff --git a/help/create-a-channel.md b/help/create-a-channel.md index 6687363e98..aef2e73eb1 100644 --- a/help/create-a-channel.md +++ b/help/create-a-channel.md @@ -47,4 +47,4 @@ 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 channels for new users](/help/set-default-channels-for-new-users) -* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) +* [Introduction to channels](/help/introduction-to-channels) diff --git a/help/desktop-notifications.md b/help/desktop-notifications.md index 782f30e1d4..19acdb081d 100644 --- a/help/desktop-notifications.md +++ b/help/desktop-notifications.md @@ -41,7 +41,7 @@ By default, Zulip displays a count of your unmuted unread messages on the can configure the badge to only count [direct messages](/help/direct-messages) and [mentions](/help/mention-a-user-or-group), or to include messages in [followed topics](/help/follow-a-topic) but not other -[channel](/help/channels-and-topics) messages. +[channel](/help/introduction-to-channels) messages. ### Configure unread count badge diff --git a/help/direct-messages.md b/help/direct-messages.md index aabda215fe..085a2b824d 100644 --- a/help/direct-messages.md +++ b/help/direct-messages.md @@ -1,7 +1,7 @@ # Direct messages **Direct messages (DMs)** are conversations with other users that happen outside -of a [channel](/help/channels-and-topics). DMs work well for one-off messages, +of a [channel](/help/introduction-to-channels). DMs work well for one-off messages, usually with just one or two others. If you find yourself frequently conversing with the same person or group, it diff --git a/help/guest-users.md b/help/guest-users.md index de49c77d79..0d44d4a0be 100644 --- a/help/guest-users.md +++ b/help/guest-users.md @@ -52,7 +52,7 @@ following cases: - The user belongs to a [direct message](/help/direct-messages) thread with the guest. -- The user is subscribed to one or more [channels](/help/channels-and-topics) with +- The user is subscribed to one or more [channels](/help/introduction-to-channels) with the guest. When a guest cannot see information about a user, the guest's experience will be diff --git a/help/inbox.md b/help/inbox.md index ac11581100..91ea241c8a 100644 --- a/help/inbox.md +++ b/help/inbox.md @@ -54,4 +54,4 @@ In the web app, you can control whether the **Inbox** includes all topics, just * [Combined feed](/help/combined-feed) * [Mute or unmute a channel](/help/mute-a-channel) * [Mute or unmute a topic](/help/mute-a-topic) -* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) +* [Introduction to channels](/help/introduction-to-channels) diff --git a/help/include/channels-intro.md b/help/include/channels-intro.md new file mode 100644 index 0000000000..a3675915dc --- /dev/null +++ b/help/include/channels-intro.md @@ -0,0 +1,5 @@ +Channels organize conversations based on who needs to see them. For example, it +is common to have a channel for each team in an organization. Because Zulip +further organizes messages into conversations labeled with +[topics](/help/channels-and-topics), there is generally no need to create +dedicated channels for specific projects. diff --git a/help/include/create-channels-intro.md b/help/include/create-channels-intro.md index 87c6e63112..46c1bf0fa0 100644 --- a/help/include/create-channels-intro.md +++ b/help/include/create-channels-intro.md @@ -1,5 +1,4 @@ -In Zulip, channels determine who gets a message. They are similar to -channels in IRC/Slack/Discord, chat rooms, and email lists. +{!channels-intro.md!} We recommend setting up some channels before inviting other users to join Zulip, so that you can [automatically subscribe diff --git a/help/include/set-up-your-account.md b/help/include/set-up-your-account.md index 7c6277b5ec..7601de51a3 100644 --- a/help/include/set-up-your-account.md +++ b/help/include/set-up-your-account.md @@ -15,7 +15,7 @@ [pick your favorite emoji theme](/help/emoji-and-emoticons#change-your-emoji-set), [change your language](/help/change-your-language), and make other tweaks to your Zulip experience. -- [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels). +- [Browse and subscribe to channels](/help/introduction-to-channels#browse-and-subscribe-to-channels). - Decide whether you want Enter [to send your message or add a new line](/help/mastering-the-compose-box#toggle-between-ctrl-enter-and-enter-to-send-a-message). diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 5aa8867ccc..bc51983c18 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -124,7 +124,7 @@ * [Find administrators](/help/find-administrators) ## Channels -* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) +* [Introduction to channels](/help/introduction-to-channels) * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel) * [Create a channel](/help/create-a-channel) * [View channel subscribers](/help/view-channel-subscribers) diff --git a/help/include/tips-for-creating-channels.md b/help/include/tips-for-creating-channels.md index 3ee5d38b2b..6b8cdb2f7b 100644 --- a/help/include/tips-for-creating-channels.md +++ b/help/include/tips-for-creating-channels.md @@ -7,9 +7,6 @@ pertaining to the marketing team, `#help/` for ``'s internal support channel, etc. -* 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 channels like `#announce` for announcements, `#new members` for new members to introduce themselves and be welcomed, diff --git a/help/include/trying-out-zulip.md b/help/include/trying-out-zulip.md index b2a6b237e4..113b3061f0 100644 --- a/help/include/trying-out-zulip.md +++ b/help/include/trying-out-zulip.md @@ -34,7 +34,7 @@ It's also easy to try out Zulip for yourself. plan to adjust the details as you go. - [Create](/help/create-channels) your initial - [channels](/help/channels-and-topics), including a dedicated channel for + [channels](/help/introduction-to-channels), including a dedicated channel for questions and feedback about using Zulip. - Educate others about how to use Zulip's [topics](/help/channels-and-topics), diff --git a/help/browse-and-subscribe-to-channels.md b/help/introduction-to-channels.md similarity index 86% rename from help/browse-and-subscribe-to-channels.md rename to help/introduction-to-channels.md index 836c7e7693..e48df23064 100644 --- a/help/browse-and-subscribe-to-channels.md +++ b/help/introduction-to-channels.md @@ -1,4 +1,8 @@ -# Browse and subscribe to channels +# Introduction to channels + +{!channels-intro.md!} + +## Browse and subscribe to channels {start_tabs} @@ -40,3 +44,5 @@ ## Related articles * [Channels and topics](/help/channels-and-topics) +* [Create channels](/help/create-channels) +* [Channel permissions](/help/channel-permissions) diff --git a/help/marking-messages-as-unread.md b/help/marking-messages-as-unread.md index 67f172d735..0734d3537f 100644 --- a/help/marking-messages-as-unread.md +++ b/help/marking-messages-as-unread.md @@ -10,7 +10,7 @@ There are many ways to use this feature, including: action items, mark messages as unread to return to them later. - You can mark messages as unread when you [subscribe to a - channel](/help/browse-and-subscribe-to-channels). This makes it + channel](/help/introduction-to-channels#browse-and-subscribe-to-channels). This makes it [convenient](/help/reading-strategies) to review all the recent conversations in that channel. diff --git a/help/pin-a-channel.md b/help/pin-a-channel.md index a17da17406..dbdf1f27be 100644 --- a/help/pin-a-channel.md +++ b/help/pin-a-channel.md @@ -72,5 +72,5 @@ which is especially handy if you are subscribed to a large number of channels. ## Related articles -* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) +* [Introduction to channels](/help/introduction-to-channels) * [Mute or unmute a channel](/help/mute-a-channel) diff --git a/help/read-receipts.md b/help/read-receipts.md index 24a826362b..bdb2cfce13 100644 --- a/help/read-receipts.md +++ b/help/read-receipts.md @@ -1,7 +1,7 @@ # Read receipts Read receipts let you check who has read a message. You can see read receipts -for any message, including both [channel messages](/help/channels-and-topics) +for any message, including both [channel messages](/help/introduction-to-channels) and [direct messages](/help/direct-messages). With privacy in mind, Zulip lets you [control][configure-personal-read-recipts] diff --git a/help/reading-strategies.md b/help/reading-strategies.md index 00aabb6ff5..2e4c4adcec 100644 --- a/help/reading-strategies.md +++ b/help/reading-strategies.md @@ -2,8 +2,8 @@ In Zulip, channels determine who gets a message. Topics tell you what the message is about. If you are not yet familiar with Zulip's topics, -we recommend first reading about [channels and -topics](/help/channels-and-topics). +we recommend first reading about [channels](introduction-to-channels) and +[topics](/help/channels-and-topics). This article describes a few ways to efficiently read through messages in Zulip. diff --git a/help/using-zulip-for-a-class.md b/help/using-zulip-for-a-class.md index 29f9f469cd..8dd457f285 100644 --- a/help/using-zulip-for-a-class.md +++ b/help/using-zulip-for-a-class.md @@ -42,7 +42,7 @@ from today’s lecture. [lecture notes 10/2.pdf]() You can view a recording of t In Zulip, channels determine who receives a message. Topics are light-weight subjects for individual conversations. You can more about -channels and topics [here](/help/channels-and-topics). +[channels](introduction-to-channels) and [topics](/help/channels-and-topics). Zulip works best when each conversation has its own topic. When you have a question to ask, simply start a new topic! For example, one diff --git a/help/using-zulip-via-email.md b/help/using-zulip-via-email.md index 3e39d3ed9c..6aab90ddda 100644 --- a/help/using-zulip-via-email.md +++ b/help/using-zulip-via-email.md @@ -31,7 +31,7 @@ If you want to interact with Zulip primarily (or entirely) via your email client {start_tabs} -1. [Subscribe](/help/browse-and-subscribe-to-channels) to any channels you are +1. [Subscribe](/help/introduction-to-channels#browse-and-subscribe-to-channels) to any channels you are interested in. {settings_tab|notifications} diff --git a/help/view-channel-subscribers.md b/help/view-channel-subscribers.md index 1dc73b0614..95747e67ce 100644 --- a/help/view-channel-subscribers.md +++ b/help/view-channel-subscribers.md @@ -37,7 +37,7 @@ unsubscribe other users to channels. ## Related articles -* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) +* [Introduction to channels](/help/introduction-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) diff --git a/templates/corporate/case-studies/end-point-case-study.md b/templates/corporate/case-studies/end-point-case-study.md index 3b546d8946..437f10f3fe 100644 --- a/templates/corporate/case-studies/end-point-case-study.md +++ b/templates/corporate/case-studies/end-point-case-study.md @@ -66,7 +66,7 @@ busy topics,” Jon says. For the past six years, the Zulip chat has been a virtual office for End Point’s distributed team, a place to show up and be present at work. Discussing projects -in Zulip [channels](/help/channels-and-topics) (similar to channels in other chat +in Zulip [channels](/help/introduction-to-channels) (similar to channels in other chat tools) keeps everyone informed. “Zulip is my lifeline,” says [Joanne diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index 466d69567a..4f2dc5f945 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -122,7 +122,7 @@ - Channels + Channels diff --git a/templates/corporate/try-zulip-part1.md b/templates/corporate/try-zulip-part1.md index b39c762d2b..4ddd3bb12d 100644 --- a/templates/corporate/try-zulip-part1.md +++ b/templates/corporate/try-zulip-part1.md @@ -10,7 +10,7 @@ You can: app, and you can always get back to it by clicking on “Recent conversations” in the upper left. - **Click on the name of a** - [**channel**](/help/channels-and-topics) on the left to open a + [**channel**](/help/introduction-to-channels) on the left to open a list of recent conversation topics. For example, you can explore discussions of changes to the design of the Zulip app in [#design](https://chat.zulip.org/#narrow/stream/101-design), or see ongoing diff --git a/zerver/lib/onboarding.py b/zerver/lib/onboarding.py index e0c4d103a7..1a7a282a89 100644 --- a/zerver/lib/onboarding.py +++ b/zerver/lib/onboarding.py @@ -173,7 +173,7 @@ def select_welcome_bot_response(human_response_lower: str) -> str: return "".join( [ _("In Zulip, channels [determine who gets a message]({help_link}).").format( - help_link="/help/channels-and-topics" + help_link="/help/introduction-to-channels" ) + "\n\n", _("[Browse and subscribe to channels]({settings_link}).").format( diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index c2e16a0f06..2482195865 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -119,6 +119,10 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect("/help/change-the-stream-description", "/help/change-the-channel-description"), URLRedirect("/help/change-the-privacy-of-a-stream", "/help/change-the-privacy-of-a-channel"), URLRedirect("/help/starting-a-new-topic", "/help/channels-and-topics#how-to-start-a-new-topic"), + URLRedirect( + "/help/browse-and-subscribe-to-channels", + "/help/introduction-to-channels#browse-and-subscribe-to-channels", + ), ] LANDING_PAGE_REDIRECTS = [ diff --git a/zerver/tests/test_tutorial.py b/zerver/tests/test_tutorial.py index 267d3b5356..40bbb1eabb 100644 --- a/zerver/tests/test_tutorial.py +++ b/zerver/tests/test_tutorial.py @@ -93,7 +93,7 @@ class TutorialTests(ZulipTestCase): for content in messages: self.send_personal_message(user, bot, content) expected_response = ( - "In Zulip, channels [determine who gets a message](/help/channels-and-topics).\n\n" + "In Zulip, channels [determine who gets a message](/help/introduction-to-channels).\n\n" "[Browse and subscribe to channels](#channels/all)." ) self.assertEqual(most_recent_message(user).content, expected_response)