diff --git a/help/browse-and-subscribe-to-streams.md b/help/browse-and-subscribe-to-streams.md index c35f96ebc3..08e64c8cff 100644 --- a/help/browse-and-subscribe-to-streams.md +++ b/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) diff --git a/help/streams-and-topics.md b/help/channels-and-topics.md similarity index 76% rename from help/streams-and-topics.md rename to help/channels-and-topics.md index fa056d497d..9d6d3d5def 100644 --- a/help/streams-and-topics.md +++ b/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 - **Stream management** on the left sidebar. +* Browse the articles under **Channels & topics** and + **Channel management** on the left sidebar. diff --git a/help/desktop-notifications.md b/help/desktop-notifications.md index 60c0a61ab0..1736b148cc 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 -[stream](/help/streams-and-topics) messages. +[channel](/help/channels-and-topics) messages. ### Configure unread count badge diff --git a/help/direct-messages.md b/help/direct-messages.md index 60833d3a3d..46cec39378 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 [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 diff --git a/help/getting-started-with-zulip.md b/help/getting-started-with-zulip.md index 141561380c..9100126a68 100644 --- a/help/getting-started-with-zulip.md +++ b/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 diff --git a/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md index 75666ce6fb..920d2e8ac3 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) -* [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) diff --git a/help/guest-users.md b/help/guest-users.md index 21498f6d95..50bc56dd19 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 [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 diff --git a/help/include/streams-and-topics.md b/help/include/channels-and-topics.md similarity index 83% rename from help/include/streams-and-topics.md rename to help/include/channels-and-topics.md index f5739e39b5..e6e06d1fbd 100644 --- a/help/include/streams-and-topics.md +++ b/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 diff --git a/help/include/conversation-definition.md b/help/include/conversation-definition.md index 40948c73d2..d86b5b48a6 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 -stream](/help/streams-and-topics). +channel](/help/channels-and-topics). diff --git a/help/include/emoji-and-emoticons-intro.md b/help/include/emoji-and-emoticons-intro.md index 5befac5707..fad07a3027 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/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) diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 3e67140d61..a0ea17b149 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) -* [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) diff --git a/help/include/trying-out-zulip.md b/help/include/trying-out-zulip.md index 650cf24c37..60e1d6656b 100644 --- a/help/include/trying-out-zulip.md +++ b/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. diff --git a/help/marking-messages-as-read.md b/help/marking-messages-as-read.md index 21106554a8..9aebc2857c 100644 --- a/help/marking-messages-as-read.md +++ b/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 - to preview new messages in a stream, or skim [Combined + [topic in a channel](/help/channels-and-topics). This option makes it + convenient to preview new messages in a stream, or skim [Combined feed](/help/combined-feed), and later read each topic in detail. {start_tabs} diff --git a/help/read-receipts.md b/help/read-receipts.md index 4ab070c21d..24a826362b 100644 --- a/help/read-receipts.md +++ b/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 -[direct messages](/help/direct-messages). +for any message, including both [channel messages](/help/channels-and-topics) +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 diff --git a/help/reading-strategies.md b/help/reading-strategies.md index 88175c2e4b..45b78e2fc4 100644 --- a/help/reading-strategies.md +++ b/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 -topics](/help/streams-and-topics). +we recommend first reading about [channels and +topics](/help/channels-and-topics). This article describes a few ways to efficiently read through messages in Zulip. diff --git a/help/require-topics.md b/help/require-topics.md index 8128919e37..a4cacb23bc 100644 --- a/help/require-topics.md +++ b/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) diff --git a/help/resolve-a-topic.md b/help/resolve-a-topic.md index 08d96da6c9..7b3a020440 100644 --- a/help/resolve-a-topic.md +++ b/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 diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index 6d5548c163..2c3f498760 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) -* [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 diff --git a/help/trying-out-zulip.md b/help/trying-out-zulip.md index 5fd2949c9c..59f2467f19 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) -* [Streams and topics](/help/streams-and-topics) +* [Channels and topics](/help/channels-and-topics) diff --git a/help/using-zulip-for-a-class.md b/help/using-zulip-for-a-class.md index e1755c1990..65491249e8 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, 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 diff --git a/templates/corporate/case-studies/atolio-case-study.md b/templates/corporate/case-studies/atolio-case-study.md index 4a8b9915d4..7a52a443d7 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/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 diff --git a/templates/corporate/case-studies/end-point-case-study.md b/templates/corporate/case-studies/end-point-case-study.md index 7945c8d913..055338a23c 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 [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 diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index fc987172fa..baaef447cf 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -122,7 +122,7 @@ - Streams + Channels @@ -135,7 +135,7 @@ - Topic-based threading + Topic-based threading diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 794bed29db..7063529192 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -76,7 +76,7 @@