help: Rename and redirect streams-and-topics for channel.

help/browse-and-subscribe-to-streams.md

@@ -39,4 +39,4 @@
 
 ## Related articles
 
-* [Streams and topics](/help/streams-and-topics)
+* [Channels and topics](/help/channels-and-topics)

help/channels-and-topics.md

@@ -1,6 +1,6 @@
-# Streams and topics
+# Channels and topics
 
-{!streams-and-topics.md!}
+{!channels-and-topics.md!}
 
 
 ## Further reading
@@ -12,5 +12,5 @@
 * [Replying to messages](/help/replying-to-messages)
 * [Creating streams for your organization](/help/getting-your-organization-started-with-zulip#create-streams)
 * [Stream permissions](/help/stream-permissions)
-* Browse the articles under **Streams & topics** and
+* Browse the articles under **Channels & topics** and
-  **Stream management** on the left sidebar.
+  **Channel management** on the left sidebar.

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
-[stream](/help/streams-and-topics) messages.
+[channel](/help/channels-and-topics) 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 [stream](/help/streams-and-topics). DMs work well for one-off messages,
+of a [channel](/help/channels-and-topics). 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/getting-started-with-zulip.md

@@ -14,7 +14,7 @@ it, you'll never want to use a different team chat app!
 
 ## Learn about Zulip topics
 
-{!streams-and-topics.md!}
+{!channels-and-topics.md!}
 
 ## Reading your messages
 

help/getting-your-organization-started-with-zulip.md

@@ -110,6 +110,6 @@ users at once, [notifying](/help/dm-mention-alert-notifications) them about a me
 ## Further reading
 
 * [Getting started with Zulip](/help/getting-started-with-zulip)
-* [Streams and topics](/help/streams-and-topics)
+* [Channels and topics](/help/channels-and-topics)
 * [Moderating open organizations](/help/moderating-open-organizations)
 * [Setting up Zulip for a class](/help/setting-up-zulip-for-a-class)

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 [streams](/help/streams-and-topics) with
+- The user is subscribed to one or more [channels](/help/channels-and-topics) with
   the guest.
 
 When a guest cannot see information about a user, the guest's experience will be

help/include/channels-and-topics.md

@@ -1,4 +1,4 @@
-In Zulip, streams determine who gets a message. Topics tell you what the
+In Zulip, channels determine who gets a message. Topics tell you what the
 message is about.
 
 Topics are light-weight subjects, very similar to the subject line of an email.
@@ -9,7 +9,7 @@ conversational thread. Here is what it looks like in Zulip.
 
 Topics are one of the most wonderful aspects of using Zulip:
 
-* Lots of conversations can happen in the same stream at the same time, each in
+* Lots of conversations can happen in the same channel at the same time, each in
   its own topic. You never have to worry about interrupting — each conversation
   has its own space.
 * Conversations can last many hours or days, letting everyone respond in their

help/include/conversation-definition.md

@@ -1,3 +1,3 @@
 In Zulip, a **conversation** is a [direct message](/help/direct-messages) thread
 (one-on-one or with a group), or a [topic in a
-stream](/help/streams-and-topics).
+channel](/help/channels-and-topics).

help/include/emoji-and-emoticons-intro.md

@@ -1,4 +1,4 @@
-You can use emoji in Zulip messages and [topics](/help/streams-and-topics).
+You can use emoji in Zulip messages and [topics](/help/channels-and-topics).
 There are several ways to use an emoji in your message:
 
 - [Enter an emoji name](/help/emoji-and-emoticons#use-an-emoji-in-your-message)

help/include/sidebar_index.md

@@ -9,7 +9,7 @@
 ## Getting started
 * [Joining an organization](/help/join-a-zulip-organization)
 * [Set up your account](/help/set-up-your-account)
-* [Streams and topics](/help/streams-and-topics)
+* [Channels and topics](/help/channels-and-topics)
 * [Finding a conversation to read](/help/finding-a-conversation-to-read)
 * [Reading conversations](/help/reading-conversations)
 * [Starting a new topic](/help/starting-a-new-topic)
@@ -125,7 +125,7 @@
 * [Find administrators](/help/find-administrators)
 
 ## Streams & topics
-* [Streams and topics](/help/streams-and-topics)
+* [Channels and topics](/help/channels-and-topics)
 * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
 * [Unsubscribe from a stream](/help/unsubscribe-from-a-stream)
 * [Create a stream](/help/create-a-stream)

help/include/trying-out-zulip.md

@@ -34,10 +34,10 @@ It's also easy to try out Zulip for yourself.
       plan to adjust the details as you go.
 
     - [Create](/help/create-streams) your initial
-      [streams](/help/streams-and-topics), including a dedicated stream for
+      [channels](/help/channels-and-topics), including a dedicated channel for
       questions and feedback about using Zulip.
 
-    - Educate others about how to use Zulip's [topics](/help/streams-and-topics),
+    - Educate others about how to use Zulip's [topics](/help/channels-and-topics),
       and how to [move](/help/move-content-to-another-topic) any messages that
       belong elsewhere.
 

help/marking-messages-as-read.md

@@ -21,8 +21,8 @@ web/desktop app.
   you can choose this option for the mobile app.
 - **Only in conversation views**: In Zulip, a **conversation** is a [direct
   message](/help/direct-messages) thread (one-on-one or with a group), or a
-  [topic in a stream](/help/streams-and-topics). This option makes it convenient
+  [topic in a channel](/help/channels-and-topics). This option makes it
-  to preview new messages in a stream, or skim [Combined
+  convenient to preview new messages in a stream, or skim [Combined
   feed](/help/combined-feed), and later read each topic in detail.
 
 {start_tabs}

help/read-receipts.md

@@ -1,8 +1,8 @@
 # Read receipts
 
 Read receipts let you check who has read a message. You can see read receipts
-for any message, including both [stream messages](/help/streams-and-topics) and
+for any message, including both [channel messages](/help/channels-and-topics)
-[direct messages](/help/direct-messages).
+and [direct messages](/help/direct-messages).
 
 With privacy in mind, Zulip lets you [control][configure-personal-read-recipts]
 whether your read receipts are shared, and administrators can

help/reading-strategies.md

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

help/require-topics.md

@@ -1,10 +1,10 @@
-# Require topics in stream messages
+# Require topics in channel messages
 
 If a user sends a message without a topic, the message's topic is displayed as
-**(no topic)**. Administrators can configure whether stream messages must have a
+**(no topic)**. Administrators can configure whether channel messages must have a
 specified topic.
 
-## Require topics in stream messages
+## Require topics in channel messages
 
 {!admin-only.md!}
 
@@ -13,7 +13,7 @@ specified topic.
 {settings_tab|organization-settings}
 
 1. Under **Other settings**, toggle
-   **Require topics in streams messages**.
+   **Require topics in channel messages**.
 
 {!save-changes.md!}
 
@@ -21,4 +21,4 @@ specified topic.
 
 ## Related articles
 
-* [Streams and topics](/help/streams-and-topics)
+* [Channels and topics](/help/channels-and-topics)

help/resolve-a-topic.md

@@ -1,6 +1,6 @@
 # Resolve a topic
 
-Zulip's [topics](/help/streams-and-topics) are very
+Zulip's [topics](/help/channels-and-topics) are very
 helpful for customer support, answering questions, investigating
 issues and production errors, as well as other workflows.
 Resolving topics makes it easy to track the status of each question,
@@ -21,7 +21,7 @@ Marking a topic as unresolved removes the ✔ and also triggers an
 automated notice from the notification bot.
 
 It's often helpful to define a policy for when to resolve topics that
-fits how topics are used in a given stream. Here are some common
+fits how topics are used in a given channel. Here are some common
 approaches for deciding when to mark a topic as resolved:
 
 * **Support**: When the support interaction is complete. Resolving

help/setting-up-zulip-for-a-class.md

@@ -353,7 +353,7 @@ HTML archive](https://github.com/zulip/zulip-archive) to archive the information
 
 * [Using Zulip for a class](/help/using-zulip-for-a-class)
 * [Getting started with Zulip](/help/getting-started-with-zulip)
-* [Streams and topics](/help/streams-and-topics)
+* [Channels and topics](/help/channels-and-topics)
 * [Moderating open organizations](/help/moderating-open-organizations)
 
 [make-private]: /help/change-the-privacy-of-a-stream

help/trying-out-zulip.md

@@ -8,4 +8,4 @@
 * [Setting up your organization](/help/getting-your-organization-started-with-zulip)
 * [Zulip Cloud or self-hosting?](/help/zulip-cloud-or-self-hosting)
 * [Migrating from other chat tools](/help/migrating-from-other-chat-tools)
-* [Streams and topics](/help/streams-and-topics)
+* [Channels and topics](/help/channels-and-topics)

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, streams determine who receives a message. Topics are
 light-weight subjects for individual conversations. You can more about
-streams and topics [here](/help/streams-and-topics).
+channels and topics [here](/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

templates/corporate/case-studies/atolio-case-study.md

@@ -85,7 +85,7 @@ two and continue from there.
 
 When new team members join the company, the onboarding process welcomes them to
 Zulip and the company’s communication culture. An internal Wiki introduces
-Zulip’s [topic-based threading](/help/streams-and-topics), [search
+Zulip’s [topic-based threading](/help/channels-and-topics), [search
 tools](/help/search-for-messages), and some handy [keyboard
 shortcuts](/help/keyboard-shortcuts), with pointers to [Zulip’s help
 center](/help/) for more information. Gareth hasn’t seen much difference between

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 [streams](/help/streams-and-topics) (similar to channels in other chat
+in Zulip [channels](/help/channels-and-topics) (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/streams-and-topics">Streams</a>
+                    <a href="/help/channels-and-topics">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>
@@ -135,7 +135,7 @@
             </tr>
             <tr>
                 <td class="comparison-table-feature">
-                    <a href="/help/streams-and-topics">Topic-based threading</a>
+                    <a href="/help/channels-and-topics">Topic-based threading</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/for/business.html

@@ -76,7 +76,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            Like email threads, <a href="/help/streams-and-topics">Zulip topics</a> create a separate space for each discussion, so different conversations will never get in each other’s way.
+                            Like email threads, <a href="/help/channels-and-topics">Zulip topics</a> create a separate space for each discussion, so different conversations will never get in each other’s way.
                         </div>
                     </li>
                     <li>

templates/corporate/for/education.html

@@ -56,7 +56,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            <a href="/help/streams-and-topics">Zulip topics</a> create a separate space for each discussion.
+                            <a href="/help/channels-and-topics">Zulip topics</a> create a separate space for each discussion.
                         </div>
                     </li>
                     <li><div class="list-content"> Questions and answers are easy to find, so each question is only asked once.</div></li>

templates/corporate/for/events.html

@@ -58,7 +58,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            <a href="/help/streams-and-topics">Zulip
+                            <a href="/help/channels-and-topics">Zulip
                             topics</a> create a separate space for
                             each discussion or question.
                         </div>

templates/corporate/for/open-source.html

@@ -75,7 +75,7 @@
                     <li>
                         <div class="list-content">
                             Like email threads,
-                            <a href="/help/streams-and-topics">Zulip topics</a>
+                            <a href="/help/channels-and-topics">Zulip topics</a>
                             create a separate space for each discussion, so
                             different conversations will never get in each
                             other’s way.

templates/corporate/for/research.html

@@ -60,7 +60,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            <a href="/help/streams-and-topics">Zulip
+                            <a href="/help/channels-and-topics">Zulip
                             topics</a> create a separate space for each
                             discussion.
                         </div>

templates/corporate/try-zulip-part1.md

@@ -10,12 +10,12 @@ 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**
-  [**stream**](/help/streams-and-topics) on the left to open a
+  [**channel**](/help/channels-and-topics) 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
   issue investigations in
   [#issues](https://chat.zulip.org/#narrow/stream/9-issues).
-- **Click on each topic** in a stream to view conversations one at a time.
+- **Click on each topic** in a channel to view conversations one at a time.
   Notice how Zulip makes it easy to have many conversations at once, without
   them getting in each other’s way.

web/templates/introduce_zulip_view_modal.hbs

@@ -9,7 +9,7 @@
             In Zulip, a conversation is either a <z-link-direct-message>direct message</z-link-direct-message>
             thread, or a <z-link-channel-topic>topic in a channel</z-link-channel-topic>.
             {{#*inline "z-link-direct-message"}}<a href="/help/direct-messages" target="_blank" rel="noopener noreferrer">{{> @partial-block }}</a>{{/inline}}
-            {{#*inline "z-link-channel-topic"}}<a href="/help/streams-and-topics" target="_blank" rel="noopener noreferrer">{{> @partial-block }}</a>{{/inline}}
+            {{#*inline "z-link-channel-topic"}}<a href="/help/channels-and-topics" target="_blank" rel="noopener noreferrer">{{> @partial-block }}</a>{{/inline}}
         {{/tr}}
         {{#if (eq zulip_view "inbox")}}
             {{t 'The colored bars indicate which channel the conversation is in.' }}

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/streams-and-topics"
+                    help_link="/help/channels-and-topics"
                 )
                 + "\n\n",
                 _("[Browse and subscribe to channels]({settings_link}).").format(
@@ -185,7 +185,7 @@ def select_welcome_bot_response(human_response_lower: str) -> str:
         return "".join(
             [
                 _(
-                    "In Zulip, topics [tell you what a message is about](/help/streams-and-topics). "
+                    "In Zulip, topics [tell you what a message is about](/help/channels-and-topics). "
                     "They are light-weight subjects, very similar to the subject line of an email."
                 )
                 + "\n\n",
@@ -296,7 +296,7 @@ def send_initial_realm_messages(realm: Realm) -> None:
             + _(
                 "You can learn more about topics at [Channels and topics]({about_topics_help_url})."
             )
-        ).format(about_topics_help_url="/help/streams-and-topics")
+        ).format(about_topics_help_url="/help/channels-and-topics")
 
         content_of_swimming_turtles_topic_name = (
             _(

zerver/lib/url_redirects.py

@@ -59,9 +59,10 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
     ),
     URLRedirect("/help/configure-message-notification-emails", "/help/email-notifications"),
     URLRedirect("/help/disable-new-login-emails", "/help/email-notifications#new-login-emails"),
-    # The `help/about-streams-and-topics` redirect is particularly important,
+    # The `help/about-streams-and-topics` and `help/streams-and-topics` redirects are particularly
-    # because the old URL appears in links from Welcome Bot messages.
+    # important, because the old URLs appear in links from Welcome Bot messages.
-    URLRedirect("/help/about-streams-and-topics", "/help/streams-and-topics"),
+    URLRedirect("/help/about-streams-and-topics", "/help/channels-and-topics"),
+    URLRedirect("/help/streams-and-topics", "/help/channels-and-topics"),
     URLRedirect("/help/community-topic-edits", "/help/restrict-moving-messages"),
     URLRedirect(
         "/help/only-allow-admins-to-add-emoji", "/help/custom-emoji#change-who-can-add-custom-emoji"

zerver/openapi/zulip.yaml

@@ -6468,7 +6468,7 @@ paths:
       summary: Send a message
       tags: ["messages"]
       description: |
-        Send a [stream message](/help/streams-and-topics) or a
+        Send a [stream message](/help/channels-and-topics) or a
         [direct message](/help/direct-messages).
       requestBody:
         required: true

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/streams-and-topics).\n\n"
+                "In Zulip, channels [determine who gets a message](/help/channels-and-topics).\n\n"
                 "[Browse and subscribe to channels](#channels/all)."
             )
             self.assertEqual(most_recent_message(user).content, expected_response)
@@ -106,7 +106,7 @@ class TutorialTests(ZulipTestCase):
         for content in messages:
             self.send_personal_message(user, bot, content)
             expected_response = (
-                "In Zulip, topics [tell you what a message is about](/help/streams-and-topics). "
+                "In Zulip, topics [tell you what a message is about](/help/channels-and-topics). "
                 "They are light-weight subjects, very similar to the subject line of an email.\n\n"
                 "Check out [Recent conversations](#recent) to see what's happening! "
                 'You can return to this conversation by clicking "Direct messages" in the upper left.'