diff --git a/help/emoji-and-emoticons.md b/help/emoji-and-emoticons.md index 16ff4149d3..78d731816d 100644 --- a/help/emoji-and-emoticons.md +++ b/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 Command ⌘ + Control + Space 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 Windows + . 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. diff --git a/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md index 98c56ab66e..34002fb4fd 100644 --- a/help/getting-your-organization-started-with-zulip.md +++ b/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) diff --git a/help/include/channels-intro.md b/help/include/channels-intro.md index a3675915dc..62102551fe 100644 --- a/help/include/channels-intro.md +++ b/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. diff --git a/help/include/conversation-definition.md b/help/include/conversation-definition.md index d86b5b48a6..34726386e9 100644 --- a/help/include/conversation-definition.md +++ b/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). diff --git a/help/include/emoji-and-emoticons-intro.md b/help/include/emoji-and-emoticons-intro.md index fad07a3027..fc5cfdf4de 100644 --- a/help/include/emoji-and-emoticons-intro.md +++ b/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) diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 11af83b598..f62b1266e9 100644 --- a/help/include/sidebar_index.md +++ b/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) diff --git a/help/include/trying-out-zulip.md b/help/include/trying-out-zulip.md index 113b3061f0..ad5556d5a8 100644 --- a/help/include/trying-out-zulip.md +++ b/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. diff --git a/help/introduction-to-channels.md b/help/introduction-to-channels.md index e48df23064..913bcef375 100644 --- a/help/introduction-to-channels.md +++ b/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) diff --git a/help/channels-and-topics.md b/help/introduction-to-topics.md similarity index 100% rename from help/channels-and-topics.md rename to help/introduction-to-topics.md diff --git a/help/marking-messages-as-read.md b/help/marking-messages-as-read.md index 569f2e927f..b5123c439a 100644 --- a/help/marking-messages-as-read.md +++ b/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. diff --git a/help/messaging-tips.md b/help/messaging-tips.md index e6514c5ebf..6779894285 100644 --- a/help/messaging-tips.md +++ b/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) diff --git a/help/open-the-compose-box.md b/help/open-the-compose-box.md index 7f5ba4fb83..77ea34030f 100644 --- a/help/open-the-compose-box.md +++ b/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) diff --git a/help/reading-strategies.md b/help/reading-strategies.md index 2e4c4adcec..51314b7fab 100644 --- a/help/reading-strategies.md +++ b/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. diff --git a/help/replying-to-messages.md b/help/replying-to-messages.md index 3a2e4fcb60..737cd7fc0a 100644 --- a/help/replying-to-messages.md +++ b/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) diff --git a/help/require-topics.md b/help/require-topics.md index a4cacb23bc..5d56f4fa35 100644 --- a/help/require-topics.md +++ b/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) diff --git a/help/resolve-a-topic.md b/help/resolve-a-topic.md index 7b3a020440..8a2a01e7ca 100644 --- a/help/resolve-a-topic.md +++ b/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, diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index c7b3dc911d..ee70e8e3d1 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/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 diff --git a/help/starting-a-new-direct-message.md b/help/starting-a-new-direct-message.md index 070fd0791f..4505dc0fb1 100644 --- a/help/starting-a-new-direct-message.md +++ b/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) diff --git a/help/trying-out-zulip.md b/help/trying-out-zulip.md index 59f2467f19..4013743764 100644 --- a/help/trying-out-zulip.md +++ b/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) diff --git a/help/using-zulip-for-a-class.md b/help/using-zulip-for-a-class.md index 8dd457f285..8989df0a16 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](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 diff --git a/templates/corporate/case-studies/atolio-case-study.md b/templates/corporate/case-studies/atolio-case-study.md index 906fb2feba..2bb30750ff 100644 --- a/templates/corporate/case-studies/atolio-case-study.md +++ b/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 diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index 4f2dc5f945..ab3d673e51 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -135,7 +135,7 @@ - Topic-based threading + Topic-based threading diff --git a/templates/corporate/development-community.md b/templates/corporate/development-community.md index 711e206b66..277e485c10 100644 --- a/templates/corporate/development-community.md +++ b/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` diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 99fa7020da..a72123dc73 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -76,7 +76,7 @@