help: Create an introduction to channels page.

Replaces "Browse and subscribe to channels".

Co-authored-by: Prakhar Pratyush <prakhar@zulip.com>

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

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/
 

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)

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
+{!channels-intro.md!}
-determine who receives a message. Zulip supports a few types of channels:
+
+Zulip supports a few types of channels:
 
 * **Public** (<i class="zulip-icon zulip-icon-hashtag"></i>):
   Members can join and view the complete message history.

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)

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
 

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

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

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)

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.

help/include/create-channels-intro.md

@@ -1,5 +1,4 @@
-In Zulip, channels determine who gets a message. They are similar to
+{!channels-intro.md!}
-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

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 <kbd>Enter</kbd> [to send your message
   or add a new line](/help/mastering-the-compose-box#toggle-between-ctrl-enter-and-enter-to-send-a-message).

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)

help/include/tips-for-creating-channels.md

@@ -7,9 +7,6 @@
   pertaining to the marketing team, `#help/<team name>` for
   `<team name>`'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,

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),

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)

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.
 

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)

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]

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
+we recommend first reading about [channels](introduction-to-channels) and
-topics](/help/channels-and-topics).
+[topics](/help/channels-and-topics).
 
 This article describes a few ways to efficiently read through messages
 in Zulip.

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

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}

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)

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

templates/corporate/comparison_table_integrated.html

@@ -122,7 +122,7 @@
             </tr>
             <tr>
                 <td class="comparison-table-feature">
-                    <a href="/help/channels-and-topics">Channels</a>
+                    <a href="/help/introduction-to-channels">Channels</a>
                 </td>
                 <td class="comparison-value-positive cloud-cell"><i class="icon icon-infinity"></i></td>
                 <td class="comparison-value-positive cloud-cell"><i class="icon icon-infinity"></i></td>

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

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(

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 = [

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)