help: Move 'channels-and-topics' to 'introduction-to-topics'.

Introduction to channel is now moved out as a new article,
the 'channel-and-topics' contains only introduction to topics,
hence renamed.

help/emoji-and-emoticons.md

@@ -81,7 +81,7 @@ names.
 
 {tab|mac}
 
-1. [Start a new topic](/help/channels-and-topics#how-to-start-a-new-topic).
+1. [Start a new topic](/help/introduction-to-topics#how-to-start-a-new-topic).
 
 1. Press <kbd>Command ⌘</kbd> + <kbd>Control</kbd> + <kbd>Space</kbd>
    to open the **Character Viewer**. See the
@@ -93,7 +93,7 @@ names.
 
 {tab|windows}
 
-1. [Start a new topic](/help/channels-and-topics#how-to-start-a-new-topic).
+1. [Start a new topic](/help/introduction-to-topics#how-to-start-a-new-topic).
 
 1. Press <kbd>Windows</kbd> + <kbd>.</kbd>
    to open the **emoji keyboard**. See the
@@ -105,7 +105,7 @@ names.
 
 {tab|linux}
 
-1. [Start a new topic](/help/channels-and-topics#how-to-start-a-new-topic).
+1. [Start a new topic](/help/introduction-to-topics#how-to-start-a-new-topic).
 
 1. Open the [Characters app for GNOME](https://apps.gnome.org/en/Characters/).
 
@@ -114,7 +114,7 @@ names.
 
 {tab|chrome}
 
-1. [Start a new topic](/help/channels-and-topics#how-to-start-a-new-topic).
+1. [Start a new topic](/help/introduction-to-topics#how-to-start-a-new-topic).
 
 1. Right-click on the text input box.
 
@@ -126,7 +126,7 @@ names.
 
 {tab|via-paste}
 
-1. [Start a new topic](/help/channels-and-topics#how-to-start-a-new-topic).
+1. [Start a new topic](/help/introduction-to-topics#how-to-start-a-new-topic).
 
 1. Paste an emoji copied from outside of Zulip directly into the text input box.
 

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)
-* [Channels and topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Moderating open organizations](/help/moderating-open-organizations)
 * [Setting up Zulip for a class](/help/setting-up-zulip-for-a-class)

help/include/channels-intro.md

@@ -1,5 +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
+[topics](/help/introduction-to-topics), there is generally no need to create
 dedicated channels for specific projects.

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
-channel](/help/channels-and-topics).
+channel](/help/introduction-to-topics).

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

@@ -1,4 +1,4 @@
-You can use emoji in Zulip messages and [topics](/help/channels-and-topics).
+You can use emoji in Zulip messages and [topics](/help/introduction-to-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)
-* [Introduction to topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Finding a conversation to read](/help/finding-a-conversation-to-read)
 * [Reading conversations](/help/reading-conversations)
 * [Starting a new direct message](/help/starting-a-new-direct-message)
@@ -134,7 +134,7 @@
 * [View channel subscribers](/help/view-channel-subscribers)
 
 ## Topics
-* [Introduction to topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Rename a topic](/help/rename-a-topic)
 * [Resolve a topic](/help/resolve-a-topic)
 * [Move content to another topic](/help/move-content-to-another-topic)

help/include/trying-out-zulip.md

@@ -37,7 +37,7 @@ It's also easy to try out Zulip for yourself.
       [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),
+    - Educate others about how to use Zulip's [topics](/help/introduction-to-topics),
       and how to [move](/help/move-content-to-another-topic) any messages that
       belong elsewhere.
 

help/introduction-to-channels.md

@@ -43,6 +43,6 @@
 
 ## Related articles
 
-* [Channels and topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Create channels](/help/create-channels)
 * [Channel permissions](/help/channel-permissions)

help/marking-messages-as-read.md

@@ -21,7 +21,7 @@ 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 channel](/help/channels-and-topics). This option makes it
+  [topic in a channel](/help/introduction-to-topics). This option makes it
   convenient to preview new messages in a channel, or skim [Combined
   feed](/help/combined-feed), and later read each topic in detail.
 

help/messaging-tips.md

@@ -5,6 +5,6 @@
 ## Related articles
 
 * [Getting started with Zulip](/help/getting-started-with-zulip)
-* [Introduction to topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Starting a new direct message](/help/starting-a-new-direct-message)
 * [Replying to messages](/help/replying-to-messages)

help/open-the-compose-box.md

@@ -34,7 +34,7 @@ arrow if the box is empty.
 ## Related articles
 
 * [Getting started with Zulip](/help/getting-started-with-zulip)
-* [Introduction to topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Starting a new direct message](/help/starting-a-new-direct-message)
 * [Replying to messages](/help/replying-to-messages)
 * [Messaging tips & tricks](/help/messaging-tips)

help/reading-strategies.md

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

help/replying-to-messages.md

@@ -5,7 +5,7 @@
 ## Related articles
 
 * [Getting started with Zulip](/help/getting-started-with-zulip)
-* [Introduction to topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Starting a new direct message](/help/starting-a-new-direct-message)
 * [Quote and reply](/help/quote-and-reply)
 * [Messaging tips & tricks](/help/messaging-tips)

help/require-topics.md

@@ -21,4 +21,4 @@ specified topic.
 
 ## Related articles
 
-* [Channels and topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)

help/resolve-a-topic.md

@@ -1,6 +1,6 @@
 # Resolve a topic
 
-Zulip's [topics](/help/channels-and-topics) are very
+Zulip's [topics](/help/introduction-to-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,

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)
-* [Channels and topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Moderating open organizations](/help/moderating-open-organizations)
 
 [make-private]: /help/change-the-privacy-of-a-channel

help/starting-a-new-direct-message.md

@@ -5,6 +5,6 @@
 ## Related articles
 
 * [Getting started with Zulip](/help/getting-started-with-zulip)
-* [Introduction to topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-topics)
 * [Replying to messages](/help/replying-to-messages)
 * [Messaging tips & tricks](/help/messaging-tips)

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)
-* [Channels and topics](/help/channels-and-topics)
+* [Introduction to topics](/help/introduction-to-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, channels determine who receives a message. Topics are
 light-weight subjects for individual conversations. You can more about
-[channels](introduction-to-channels) and [topics](/help/channels-and-topics).
+[channels](introduction-to-channels) and [topics](/help/introduction-to-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/channels-and-topics), [search
+Zulip’s [topic-based threading](/help/introduction-to-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/comparison_table_integrated.html

@@ -135,7 +135,7 @@
             </tr>
             <tr>
                 <td class="comparison-table-feature">
-                    <a href="/help/channels-and-topics">Topic-based threading</a>
+                    <a href="/help/introduction-to-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/development-community.md

@@ -40,7 +40,7 @@ feedback.
 - Send test messages to [#test
   here](https://chat.zulip.org/#narrow/stream/7-test-here) or as a PM
   to yourself to avoid disturbing others.
-- Start a [new topic](/help/channels-and-topics) unless you’re replying
+- Start a [new topic](/help/introduction-to-topics) unless you’re replying
   to an existing conversation. If you see a new user talking about
   something unrelated on an existing topic, [move the messages to an
   appropriate new topic](/help/move-content-to-another-topic).
@@ -82,7 +82,7 @@ feedback.
 # Where do I send my message?
 
 This section describes popular public channels on chat.zulip.org. Kick
-off the discussion by starting a [new topic](/help/channels-and-topics)
+off the discussion by starting a [new topic](/help/introduction-to-topics)
 in the appropriate channel! Don’t stress too much about picking the
 right place if you’re not sure; anyone in the community can edit a
 topic name, and [moderators](/help/roles-and-permissions) can [move a
@@ -239,7 +239,7 @@ on public channels you’re not subscribed to.
 We've set up [custom linkifiers](/help/add-a-custom-linkifier)
 so that it's easy to link to issues and pull requests in Zulip
 project repositories when composing a message or starting a
-[new topic](/help/channels-and-topics). Here are examples for linking
+[new topic](/help/introduction-to-topics). Here are examples for linking
 to issue 1234 in the main Zulip project repositories:
 
 - [Server and web app][server-web-repository]: `#1234`

templates/corporate/for/business.html

@@ -76,7 +76,7 @@
                 <ul>
                     <li>
                         <div class="list-content">
-                            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.
+                            Like email threads, <a href="/help/introduction-to-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/channels-and-topics">Zulip topics</a> create a separate space for each discussion.
+                            <a href="/help/introduction-to-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/channels-and-topics">Zulip
+                            <a href="/help/introduction-to-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/channels-and-topics">Zulip topics</a>
+                            <a href="/help/introduction-to-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/channels-and-topics">Zulip
+                            <a href="/help/introduction-to-topics">Zulip
                             topics</a> create a separate space for each
                             discussion.
                         </div>

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/channels-and-topics" target="_blank" rel="noopener noreferrer">{{> @partial-block }}</a>{{/inline}}
+            {{#*inline "z-link-channel-topic"}}<a href="/help/introduction-to-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

@@ -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/channels-and-topics). "
+                    "In Zulip, topics [tell you what a message is about](/help/introduction-to-topics). "
                     "They are light-weight subjects, very similar to the subject line of an email."
                 )
                 + "\n\n",
@@ -294,9 +294,9 @@ def send_initial_realm_messages(realm: Realm) -> None:
             _("Topics are a lightweight tool to keep conversations organized.")
             + " "
             + _(
-                "You can learn more about topics at [Channels and topics]({about_topics_help_url})."
+                "You can learn more about topics at [Introduction to topics]({about_topics_help_url})."
             )
-        ).format(about_topics_help_url="/help/channels-and-topics")
+        ).format(about_topics_help_url="/help/introduction-to-topics")
 
         content_of_swimming_turtles_topic_name = (
             _(
@@ -314,7 +314,7 @@ def send_initial_realm_messages(realm: Realm) -> None:
             )
         ).format(
             default_notification_channel_name=Realm.DEFAULT_NOTIFICATION_STREAM_NAME,
-            start_topic_help_url="/help/channels-and-topics#how-to-start-a-new-topic",
+            start_topic_help_url="/help/introduction-to-topics#how-to-start-a-new-topic",
         )
 
         content_of_zulip_update_announcements_topic_name = remove_single_newlines(

zerver/lib/url_redirects.py

@@ -118,7 +118,10 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
     URLRedirect("/help/rename-a-stream", "/help/rename-a-channel"),
     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/channels-and-topics", "/help/introduction-to-topics"),
+    URLRedirect(
+        "/help/starting-a-new-topic", "/help/introduction-to-topics#how-to-start-a-new-topic"
+    ),
     URLRedirect(
         "/help/browse-and-subscribe-to-channels",
         "/help/introduction-to-channels#browse-and-subscribe-to-channels",

zerver/openapi/zulip.yaml

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

zerver/tests/test_tutorial.py

@@ -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/channels-and-topics). "
+                "In Zulip, topics [tell you what a message is about](/help/introduction-to-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.'