diff --git a/help/change-organization-url.md b/help/change-organization-url.md index eac60f8137..2bbbba3695 100644 --- a/help/change-organization-url.md +++ b/help/change-organization-url.md @@ -12,7 +12,7 @@ organization URL is a disruptive operation for users: We recommend using a [wildcard mention](/help/mention-a-user-or-group#mention-everyone-on-a-channel) -in an announcement stream to notify users that they need to update +in an announcement channel to notify users that they need to update their clients. ## Change your Zulip Cloud subdomain diff --git a/help/change-your-language.md b/help/change-your-language.md index 9b8145615b..e4c303d501 100644 --- a/help/change-your-language.md +++ b/help/change-your-language.md @@ -4,7 +4,7 @@ ## Change the language of the Zulip app -Note that this will not change stream names, topic names, or the language of +Note that this will not change channel names, topic names, or the language of messages you receive. {start_tabs} diff --git a/help/combined-feed.md b/help/combined-feed.md index 13f458d75b..630b4aaa97 100644 --- a/help/combined-feed.md +++ b/help/combined-feed.md @@ -4,7 +4,7 @@ !!! keyboard_tip "" - Use S (go to stream) or Shift + + Use S (go to channel) or Shift + S (go to conversation) to zoom in, and A to get back to **Combined feed**. diff --git a/help/configure-home-view.md b/help/configure-home-view.md index b651d2db8e..3052c8051c 100644 --- a/help/configure-home-view.md +++ b/help/configure-home-view.md @@ -25,7 +25,7 @@ organization](/help/configure-default-new-user-settings) to [**Combined feed**](/help/combined-feed). - The **Inbox** view works best if you regularly clear all unread messages in -streams you follow. +channels you follow. - **Recent conversations** works well for getting an overview of recent activity. diff --git a/help/configure-organization-language.md b/help/configure-organization-language.md index d9ab434a46..168252058f 100644 --- a/help/configure-organization-language.md +++ b/help/configure-organization-language.md @@ -10,7 +10,7 @@ American English, you can set the language used for the organization's automated messages and invitation emails. This setting: * Determines the language used for [automated - notices](/help/configure-automated-notices) that are sent to streams, including + notices](/help/configure-automated-notices) that are sent to channels, including both the topic name and message content. (Automated messages sent to a single user will use that user's preferred language). diff --git a/help/create-user-groups.md b/help/create-user-groups.md index 7694c1808d..29e5b48f7d 100644 --- a/help/create-user-groups.md +++ b/help/create-user-groups.md @@ -19,7 +19,7 @@ all be changed later. * **Who can mention this group?**: Configures who is allowed to [mention this group](/help/mention-a-user-or-group). -* **Choose members**: You can copy the membership from an existing stream or +* **Choose members**: You can copy the membership from an existing channel or user group, add all users, or enter users one by one. ## Related articles diff --git a/help/deactivate-or-reactivate-a-user.md b/help/deactivate-or-reactivate-a-user.md index 6af2f06e4c..7ff244496a 100644 --- a/help/deactivate-or-reactivate-a-user.md +++ b/help/deactivate-or-reactivate-a-user.md @@ -68,7 +68,7 @@ When you deactivate a user: {!admin-only.md!} -A reactivated user will have the same role, stream subscriptions, user group +A reactivated user will have the same role, channel subscriptions, user group memberships, and other settings and permissions as they did prior to deactivation. They will also have the same API key and bot API keys, but their bots will be deactivated until the user manually diff --git a/help/desktop-notifications.md b/help/desktop-notifications.md index 4b158bb36d..782f30e1d4 100644 --- a/help/desktop-notifications.md +++ b/help/desktop-notifications.md @@ -10,7 +10,7 @@ trigger desktop notifications. {settings_tab|notifications} -1. Toggle the checkboxes for **Streams** and **DMs, mentions, and alerts** +1. Toggle the checkboxes for **Channels** and **DMs, mentions, and alerts** in the **Desktop** column of the **Notification triggers** table. {end_tabs} diff --git a/help/digest-emails.md b/help/digest-emails.md index f9b139e071..63196b9b1e 100644 --- a/help/digest-emails.md +++ b/help/digest-emails.md @@ -4,7 +4,7 @@ Zulip has a beta feature to send weekly emails to users who haven't been active for 5 or more days. These emails include details on new -streams created and highlights of traffic (of subscribed streams) that +channels created and highlights of traffic (of subscribed channels) that can intrigue users. This feature is disabled by default, but an organization administrator diff --git a/help/dm-mention-alert-notifications.md b/help/dm-mention-alert-notifications.md index ec0dc0eda3..31677b5218 100644 --- a/help/dm-mention-alert-notifications.md +++ b/help/dm-mention-alert-notifications.md @@ -38,21 +38,21 @@ for wildcard mentions. !!! tip "" Unlike personal mentions, wildcard mentions do not trigger notifications - in muted streams or topics. + in muted channels or topics. {start_tabs} {settings_tab|notifications} 1. In the **Notification triggers** table, toggle the **@all** checkbox for - **Streams** or **Followed topics**. + **Channels** or **Followed topics**. {end_tabs} Additionally, you can override this configuration for individual -streams in your [Channel settings](/help/channel-notifications), and +channels in your [Channel settings](/help/channel-notifications), and administrators can [restrict use of wildcard -mentions](/help/restrict-wildcard-mentions) in large streams. +mentions](/help/restrict-wildcard-mentions) in large channels. ## Alert words diff --git a/help/export-your-organization.md b/help/export-your-organization.md index 46ba7363cd..c36c25e582 100644 --- a/help/export-your-organization.md +++ b/help/export-your-organization.md @@ -70,7 +70,7 @@ channel](/help/channel-permissions) messages and [direct messages](/help/direct-messages) where *at least one of the recipients* has given consent. -Users who do not provide consent will have their settings and stream +Users who do not provide consent will have their settings and channel subscriptions exported, but will have no personalized message history. {start_tabs} diff --git a/help/gdpr-compliance.md b/help/gdpr-compliance.md index 3a94e6a593..db0d51c94d 100644 --- a/help/gdpr-compliance.md +++ b/help/gdpr-compliance.md @@ -131,7 +131,7 @@ may be useful: * The Zulip server comes with a [command-line tool][management-commands], `manage.py export_single_user`, which is a variant of the main server [export tool][export-and-import-tool], that exports a single Zulip - user's account details, preferences, stream subscriptions, and message + user's account details, preferences, channel subscriptions, and message history in a structured JSON format. * The Django management shell (`manage.py shell`) and database shell (`manage.py dbshell`) allows you to query, access, edit, and delete diff --git a/help/generate-integration-url.md b/help/generate-integration-url.md index 7b14812773..9e07049940 100644 --- a/help/generate-integration-url.md +++ b/help/generate-integration-url.md @@ -18,7 +18,7 @@ integration URL. 1. Select the desired integration from the **Integration** dropdown. -1. _(optional)_ Select the destination stream from the +1. _(optional)_ Select the destination channel from the **Where to send notifications** dropdown. 1. _(optional)_ Select **Send all notifications to a single topic**, and @@ -47,7 +47,7 @@ integration URL. 1. Select the desired integration from the **Integration** dropdown. -1. _(optional)_ Select the destination stream from the +1. _(optional)_ Select the destination channel from the **Where to send notifications** dropdown. 1. _(optional)_ Select **Send all notifications to a single topic**, and diff --git a/help/getting-your-organization-started-with-zulip.md b/help/getting-your-organization-started-with-zulip.md index b21b36dc3b..98c56ab66e 100644 --- a/help/getting-your-organization-started-with-zulip.md +++ b/help/getting-your-organization-started-with-zulip.md @@ -53,13 +53,13 @@ us know! {!create-channels-intro.md!} -### How to create a stream +### How to create a channel {start_tabs} {relative|channel|all} -1. Click **Create stream** on the right. +1. Click **Create channel** on the right. 1. Fill out the requested info, and click **Create**. diff --git a/help/guest-users.md b/help/guest-users.md index 50bc56dd19..de49c77d79 100644 --- a/help/guest-users.md +++ b/help/guest-users.md @@ -6,13 +6,13 @@ invited to a company's Zulip chat. Guest users **can**: -- View and send messages in streams they have been added to, including viewing - message history in the same way as other stream subscribers. +- View and send messages in channels they have been added to, including viewing + message history in the same way as other channel subscribers. Guest users **cannot**: -- See private or public streams, unless they have been specifically added to the stream. -- Create new streams or user groups. +- See private or public channels, unless they have been specifically added to the channel. +- Create new channels or user groups. - Add or manage bots. - Add custom emoji. - Invite users to join the organization. @@ -62,14 +62,14 @@ that: - The user does not appear in typeahead suggestions, e.g., in the compose box and search. - Otherwise, such a user will be displayed as an **Unknown user** in the Zulip - app. For example, messages and reactions from a former subscriber of a stream + app. For example, messages and reactions from a former subscriber of a channel will be shown as from an **Unknown user**. - An **Unknown user**'s [user card](/help/user-cards) will not display information about that user. However, the guest can still search from all messages send by a particular **Unknown user** from that user's card. In practice, guests should rarely encounter content from an **Unknown user**, -unless users in your organization frequently change their stream subscriptions +unless users in your organization frequently change their channel subscriptions or are [deactivated](/help/deactivate-or-reactivate-a-user). The only information guests can access about unknown users via the [API](/api/) diff --git a/help/hide-message-content-in-emails.md b/help/hide-message-content-in-emails.md index 1c7682782e..790027e42c 100644 --- a/help/hide-message-content-in-emails.md +++ b/help/hide-message-content-in-emails.md @@ -6,7 +6,7 @@ For security or compliance reasons, you may want to prevent Zulip message content from being sent through your email system. The only place Zulip currently sends message content is in message notification emails. -This setting also blocks message topics, stream names, and user names from +This setting also blocks message topics, channel names, and user names from being sent through the email system. ### Hide message content in emails diff --git a/help/import-from-rocketchat.md b/help/import-from-rocketchat.md index 0affc83e71..d07579f587 100644 --- a/help/import-from-rocketchat.md +++ b/help/import-from-rocketchat.md @@ -129,7 +129,7 @@ keep in mind about the import process: imported. - Messages from Rocket.Chat Discussions are imported as topics - inside the Zulip stream corresponding to the parent channel of the + inside the Zulip channel corresponding to the parent channel of the Rocket.Chat Discussion. - Messages from Rocket.Chat Discussions having direct channels diff --git a/help/keyboard-shortcuts.md b/help/keyboard-shortcuts.md index ba7f932032..f6be7174ab 100644 --- a/help/keyboard-shortcuts.md +++ b/help/keyboard-shortcuts.md @@ -13,15 +13,15 @@ in the Zulip app to add more to your repertoire as needed. * [Message actions](#message-actions) * [Drafts](#drafts) * [Menus](#menus) -* [Stream settings](#stream-settings) +* [Channel settings](#channel-settings) ## The basics * **Reply to message**: R or Enter — Reply to the selected message (outlined in blue). -* **New stream message**: C — Start a new topic in the current - stream. +* **New channel message**: C — Start a new topic in the current + channel. * **New direct message**: X @@ -60,7 +60,7 @@ in the Zulip app to add more to your repertoire as needed. * **Search messages**: / or Ctrl + K -* **Filter streams**: Q +* **Filter channels**: Q * **Search people**: W @@ -94,13 +94,13 @@ in the Zulip app to add more to your repertoire as needed. * **Go to topic or DM conversation**: S -* **Go to stream from topic view**: S +* **Go to channel from topic view**: S * **Go to your direct message feed**: Shift + P * **Zoom to message in conversation context**: Z — This view does not mark messages as read. -* **Cycle between stream views**: Shift + A +* **Cycle between channel views**: Shift + A (previous) and Shift + D (next) * **Go to Combined feed**: A — Shows all unmuted messages. @@ -109,8 +109,8 @@ in the Zulip app to add more to your repertoire as needed. ## Composing messages -* **New stream message**: C — For starting a new topic in a - stream. +* **New channel message**: C — For starting a new topic in a + channel. * **New direct message**: X @@ -226,25 +226,25 @@ Keyboard navigation (e.g. arrow keys) works as expected. * **Toggle message actions menu**: I -## Stream settings +## Channel settings -* **Scroll through streams**: ↑ and +* **Scroll through channels**: ↑ and ↓ !!! tip "" - Pressing ↑ from the first stream - in the list moves you to the **Filter streams** input. + Pressing ↑ from the first channel + in the list moves you to the **Filter channels** input. * **Switch between tabs**: ← and → — Switch between the **Subscribed** - and **All streams** tabs. + and **All channels** tabs. -* **Create new stream**: N +* **Create new channel**: N -### For a selected stream +### For a selected channel -* **View stream messages**: Shift + V +* **View channel messages**: Shift + V * **Toggle subscription**: Shift + S diff --git a/help/link-to-a-message-or-conversation.md b/help/link-to-a-message-or-conversation.md index 96bb741480..f6240d847c 100644 --- a/help/link-to-a-message-or-conversation.md +++ b/help/link-to-a-message-or-conversation.md @@ -1,24 +1,24 @@ # Link to a message or conversation -Zulip makes it easy to share links to messages, topics, and streams. You can +Zulip makes it easy to share links to messages, topics, and channels. You can link from one Zulip [conversation](/help/reading-conversations) to another, or share links to Zulip conversations in issue trackers, emails, or other external tools. -## Link to a stream or topic within Zulip +## Link to a channel or topic within Zulip -Zulip automatically creates links to streams and topics in messages you send. +Zulip automatically creates links to channels and topics in messages you send. -The easiest way to link to a stream or topic is: +The easiest way to link to a channel or topic is: {start_tabs} -1. Type `#` followed by the one or more letters of the stream name. +1. Type `#` followed by the one or more letters of the channel name. -1. Choose the desired stream from the auto-complete menu. The link will be +1. Choose the desired channel from the auto-complete menu. The link will be automatically formatted for you. -1. If linking to a topic, type `>` after selecting a stream as +1. If linking to a topic, type `>` after selecting a channel as described above, followed by one or more letters of the topic name. 1. Choose the desired topic from the auto-complete menu. The link will be @@ -26,11 +26,11 @@ The easiest way to link to a stream or topic is: {end_tabs} -Alternatively, it is possible to manually format stream and topic links: +Alternatively, it is possible to manually format channel and topic links: ``` -Stream: #**stream name** -Topic: #**stream name>topic name** +Channel: #**channel name** +Topic: #**channel name>topic name** ``` ## Link to Zulip from anywhere @@ -41,7 +41,7 @@ the browser's address bar will work for all views, including searches. ### Get a link to a specific message This copies to your clipboard a permanent link to the message, -displayed in its thread (i.e. topic view for messages in a stream). +displayed in its thread (i.e. topic view for messages in a channel). Viewing a topic via a message link will never mark messages as read. These links will still work even when the message is @@ -92,26 +92,26 @@ message](/help/quote-and-reply). {end_tabs} -### Get a link to a specific stream +### Get a link to a specific channel {start_tabs} {tab|desktop-web} -1. Right-click on a stream in the left sidebar. +1. Right-click on a channel in the left sidebar. 1. Click **Copy Link**. !!! tip "" - If using Zulip in a browser, you can also click on a stream in the + If using Zulip in a browser, you can also click on a channel in the left sidebar, and copy the URL from your browser's address bar. {tab|mobile} {!channel-long-press-menu.md!} -1. Tap **Copy link to stream**. +1. Tap **Copy link to channel**. {!channel-long-press-menu-tip.md!} diff --git a/help/manage-user-groups.md b/help/manage-user-groups.md index 249a626122..b5e18f5b9e 100644 --- a/help/manage-user-groups.md +++ b/help/manage-user-groups.md @@ -68,7 +68,7 @@ !!! tip "" To add users in bulk, you can copy members from an - existing stream or user group. + existing channel or user group. {end_tabs} diff --git a/help/marking-messages-as-read.md b/help/marking-messages-as-read.md index 9aebc2857c..569f2e927f 100644 --- a/help/marking-messages-as-read.md +++ b/help/marking-messages-as-read.md @@ -22,7 +22,7 @@ web/desktop 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 - convenient to preview new messages in a stream, or skim [Combined + convenient to preview new messages in a channel, or skim [Combined feed](/help/combined-feed), and later read each topic in detail. {start_tabs} @@ -63,13 +63,13 @@ web/desktop app. ## Mark all messages as read You can manually **mark all messages as read**, or **mark all messages in a -stream or topic as read**. +channel or topic as read**. {start_tabs} {tab|via-left-sidebar} -1. Hover over a stream, topic, or **Combined feed** in the left sidebar. +1. Hover over a channel, topic, or **Combined feed** in the left sidebar. 1. Click on the **ellipsis** (). @@ -85,7 +85,7 @@ stream or topic as read**. {!go-to-inbox.md!} -1. Hover over a stream or topic in the left sidebar. +1. Hover over a channel or topic in the left sidebar. 1. Click on the **ellipsis** (). @@ -100,11 +100,11 @@ stream or topic as read**. {tab|mobile} -1. Tap a stream, topic, or the **Combined feed** +1. Tap a channel, topic, or the **Combined feed** (globe) tab. -2. Tap **Mark stream as read**, **Mark topic as read**, or **Mark all as read** +2. Tap **Mark channel as read**, **Mark topic as read**, or **Mark all as read** near the top right corner of the app. !!! tip "" diff --git a/help/marking-messages-as-unread.md b/help/marking-messages-as-unread.md index 416f9d49ce..67f172d735 100644 --- a/help/marking-messages-as-unread.md +++ b/help/marking-messages-as-unread.md @@ -12,7 +12,7 @@ There are many ways to use this feature, including: - You can mark messages as unread when you [subscribe to a channel](/help/browse-and-subscribe-to-channels). This makes it [convenient](/help/reading-strategies) to review all the recent - conversations in that stream. + conversations in that channel. - Mark the results of your [search](/help/search-for-messages) as unread to review them at leisure. diff --git a/help/mastering-the-compose-box.md b/help/mastering-the-compose-box.md index 5929ee6fa3..1b2b7930be 100644 --- a/help/mastering-the-compose-box.md +++ b/help/mastering-the-compose-box.md @@ -21,8 +21,8 @@ will be sent. {!start-composing.md!} -1. Select any stream from the dropdown in the top left of the compose box. You can - start typing to filter streams. +1. Select any channel from the dropdown in the top left of the compose box. You can + start typing to filter channels. 1. Enter a topic name. Auto-complete will provide suggestions for previously used topics. @@ -50,13 +50,13 @@ currently composing to. {!start-composing.md!} -1. If composing a stream message, click the **Go to conversation** +1. If composing a channel message, click the **Go to conversation** () button in the compose box. !!! keyboard_tip "" - For both stream and direct messages, use Ctrl + . to + For both channel and direct messages, use Ctrl + . to go to the conversation you are composing to. {end_tabs} diff --git a/help/mobile-notifications.md b/help/mobile-notifications.md index b9d8db437b..1adae7bfb4 100644 --- a/help/mobile-notifications.md +++ b/help/mobile-notifications.md @@ -12,7 +12,7 @@ apps. {settings_tab|notifications} -1. Toggle the checkboxes for **Streams** and **DMs, mentions, and alerts** +1. Toggle the checkboxes for **Channels** and **DMs, mentions, and alerts** in the **Mobile** column of the **Notification triggers** table. {end_tabs} diff --git a/help/moderating-open-organizations.md b/help/moderating-open-organizations.md index d56d27a98e..f597705ecf 100644 --- a/help/moderating-open-organizations.md +++ b/help/moderating-open-organizations.md @@ -27,7 +27,7 @@ problematic behavior. ### Restrict permissions for making changes * Restrict who can [create channels](/help/configure-who-can-create-channels), or - monitor new streams by enabling [new stream + monitor new channels by enabling [new channel announcements](/help/configure-automated-notices#new-channel-announcements). * Restrict who can [add custom emoji](/help/custom-emoji#change-who-can-add-custom-emoji). * Restrict who can [move messages to another @@ -73,7 +73,7 @@ organization's policy choices. user](/help/view-messages-sent-by-a-user). * Delete messages, [archive channels](/help/archive-a-channel), and [unsubscribe users from channels](/help/add-or-remove-users-from-a-channel). -* [Move topics](/help/rename-a-topic), including between streams, when +* [Move topics](/help/rename-a-topic), including between channels, when users start conversations in the wrong place. * [Change users' names](/help/change-a-users-name) (e.g., to "Name (Spammer)") for users who sent spam direct messages to many community members. diff --git a/help/quote-and-reply.md b/help/quote-and-reply.md index b03fa6db58..2093f9e472 100644 --- a/help/quote-and-reply.md +++ b/help/quote-and-reply.md @@ -59,7 +59,7 @@ to avoid unnecessarily mentioning someone twice. 1. Click **Quote and reply**. -1. Select the desired destination stream or **Direct message** from the dropdown +1. Select the desired destination channel or **Direct message** from the dropdown in the top left of the compose box. 1. Enter a topic name, or recipient names for a direct message. @@ -79,13 +79,13 @@ to avoid unnecessarily mentioning someone twice. 1. *(optional)* Delete any parts of the quoted message that you don't want to forward. -1. If you are in a stream view, choose a destination topic by tapping the +1. If you are in a channel view, choose a destination topic by tapping the compose box and selecting an existing topic or typing a new topic name. 1. Send your message. !!! tip "" - To forward a message to a different stream or direct message recipient, + To forward a message to a different channel or direct message recipient, you will need to copy-paste the contents of the compose box. {end_tabs} diff --git a/help/rename-a-topic.md b/help/rename-a-topic.md index 70d2483ef7..595f75e5bf 100644 --- a/help/rename-a-topic.md +++ b/help/rename-a-topic.md @@ -40,8 +40,8 @@ Organizations can [configure](/help/restrict-moving-messages) which 1. Edit the topic name. -1. _(optional)_ If using the **Move topic** menu, select the destination stream - for the topic from the streams dropdown list. +1. _(optional)_ If using the **Move topic** menu, select the destination channel + for the topic from the channels dropdown list. 1. Toggle whether automated notices should be sent. diff --git a/help/restrict-moving-messages.md b/help/restrict-moving-messages.md index 5786d38b73..3cc56b307d 100644 --- a/help/restrict-moving-messages.md +++ b/help/restrict-moving-messages.md @@ -3,7 +3,7 @@ {!admin-only.md!} Zulip lets you configure which [roles](/help/roles-and-permissions) can edit -message topics and move topics between streams. In general, allowing all +message topics and move topics between channels. In general, allowing all organization members to edit message topics is highly recommended because: - It allows the community to keep conversations organized, even if some members @@ -15,7 +15,7 @@ You can let users edit topics without a time limit, or prohibit topic editing on older messages to avoid potential abuse. The time limit will never apply to administrators and moderators. -Permissions for moving messages between streams can be configured separately. +Permissions for moving messages between channels can be configured separately. ## Configure who can edit topics @@ -55,13 +55,13 @@ Permissions for moving messages between streams can be configured separately. {settings_tab|organization-permissions} 1. Under **Moving messages**, configure **Who can move messages to another - stream**. + channel**. {!save-changes.md!} {end_tabs} -## Set a time limit for moving messages between streams +## Set a time limit for moving messages between channels !!! tip "" The time limit you set will not apply to administrators and moderators. @@ -71,7 +71,7 @@ Permissions for moving messages between streams can be configured separately. {settings_tab|organization-permissions} 1. Under **Moving messages**, configure **Time limit for moving messages - between streams**. + between channels**. {!save-changes.md!} diff --git a/help/restrict-wildcard-mentions.md b/help/restrict-wildcard-mentions.md index f2e4fe6939..3654a9c41e 100644 --- a/help/restrict-wildcard-mentions.md +++ b/help/restrict-wildcard-mentions.md @@ -5,7 +5,7 @@ Organization administrators can configure who is allowed to use [wildcard mentions](/help/dm-mention-alert-notifications#wildcard-mentions) that affect a large number of users. In particular, an organization can restrict who is -allowed to use `@all` (and, equivalently, `@everyone` and `@stream`) in streams +allowed to use `@all` (and, equivalently, `@everyone` and `@channel`) in channels with more than 15 subscribers, and `@topic` in topics with more than 15 participants. @@ -13,7 +13,7 @@ participants. {settings_tab|organization-permissions} -1. Under **Stream permissions**, configure **Who can notify a large number of +1. Under **Channel permissions**, configure **Who can notify a large number of users with a wildcard mention**. {!save-changes.md!} diff --git a/help/search-for-messages.md b/help/search-for-messages.md index 5a73aeea3d..12b004ddea 100644 --- a/help/search-for-messages.md +++ b/help/search-for-messages.md @@ -50,9 +50,9 @@ Some details to keep in mind: Zulip also offers a wide array of search filters, which can be used on their own, or in combination with keywords. For example: -* `stream:design`: Navigate to **#design**. -* `stream:design logo`: Search for the keyword `logo` within **#design**. -* `stream:design has:image new logo`: Search for messages in **#design** that +* `channel:design`: Navigate to **#design**. +* `channel:design logo`: Search for the keyword `logo` within **#design**. +* `channel:design has:image new logo`: Search for messages in **#design** that include an image and contain the keywords `new` and `logo`. The keywords can appear in the message itself or its topic. @@ -66,8 +66,8 @@ own, or in combination with keywords. For example: Sometimes you know approximately where the message you are looking for was sent. Zulip offers the following filters based on the location of the message. -* `stream:design`: Search within the stream **#design**. -* `stream:design topic:new+logo`: Search within the topic "new logo" in +* `channel:design`: Search within the channel **#design**. +* `channel:design topic:new+logo`: Search within the topic "new logo" in **#design**. * `is:dm`: Search all your direct messages. * `dm:Bo Lin`: Search 1-on-1 direct messages between you and Bo. @@ -75,9 +75,9 @@ Zulip offers the following filters based on the location of the message. between you, Bo, and Elena. * `dm-including:Bo Lin`: Search all direct message conversations (1-on-1 and group) that include you and Bo, as well as any other users. -* `streams:public`: Search the history of all [public +* `channels:public`: Search the history of all [public channels](/help/change-the-privacy-of-a-channel) in the organization, including - streams you are not subscribed to; see details + channels you are not subscribed to; see details [below](#searching-shared-history). ### Search by sender @@ -127,37 +127,37 @@ You can use the search bar to navigate to a message by its ID. * `near:12345`: Show messages around the message with ID `12345`. * `id:12345`: Show only message `12345`. -* `stream:design near:1` Show the oldest messages in the **#design** stream. +* `channel:design near:1` Show the oldest messages in the **#design** channel. ### Exclude filters All of Zulip's search filters can be negated to **exclude** messages matching the specified rule. For example: -- `stream:design -is:resolved -has:image`: Search messages in [unresolved - topics](/help/resolve-a-topic) in the **#design** stream that don't contain +- `channel:design -is:resolved -has:image`: Search messages in [unresolved + topics](/help/resolve-a-topic) in the **#design** channel that don't contain images. ## Searching shared history Zulip's [channel permissions](/help/channel-permissions) model allows access to -the full history of public streams and private streams with shared history, -including messages sent before you joined the stream (or organization), or those -sent to public streams you are not subscribed to. +the full history of public channels and private channels with shared history, +including messages sent before you joined the channel (or organization), or those +sent to public channels you are not subscribed to. By default, Zulip searches messages in your history, i.e., the messages you actually received. This avoids cluttering search results -with irrelevant messages from public streams you're not interested in. +with irrelevant messages from public channels you're not interested in. If you'd like to instead search the organization's shared history, any query -using the `stream:` or `streams:` filters will search all messages that you have -access to in the selected stream(s). For example: +using the `channel:` or `channels:` filters will search all messages that you have +access to in the selected channel(s). For example: -* `streams:public logo`: Search for `logo` in all public streams in the +* `channels:public logo`: Search for `logo` in all public channels in the organization. -* `streams:public sender:Elena García`: Search for all messages sent by - Elena to any public stream. -* `stream:design logo`: Search for the word `logo` in all messages sent to +* `channels:public sender:Elena García`: Search for all messages sent by + Elena to any public channel. +* `channel:design logo`: Search for the word `logo` in all messages sent to **#design**, regardless of whether you were subscribed at the time the message was sent. diff --git a/help/setting-up-zulip-for-a-class.md b/help/setting-up-zulip-for-a-class.md index f1bad21275..c7b3dc911d 100644 --- a/help/setting-up-zulip-for-a-class.md +++ b/help/setting-up-zulip-for-a-class.md @@ -90,7 +90,7 @@ There are a few ways to set up Zulip, and different ones may be convenient for y - This makes it simple to manage permissions. e.g. if you want to make sure TAs from one class cannot moderate discussion from a different class. - - Students can’t see who is in streams for other classes. + - Students can’t see who is in channels for other classes. - You can easily switch between multiple Zulip organizations in the [Zulip desktop apps](/apps/). @@ -164,7 +164,7 @@ how to assign roles and permissions for a class. - Set [who can access user email addresses](/help/configure-email-visibility). (Recommended: Admins only) - Set [who can create channels](/help/configure-who-can-create-channels). - (Recommended: Admins for public streams; Admins, moderators and members for private streams) + (Recommended: Admins for public channels; Admins, moderators and members for private channels) - Set [who can add users to channels](/help/configure-who-can-invite-to-channels). (Recommended: Admins and moderators) - Set [who can edit the topic of any message](/help/restrict-moving-messages). @@ -194,8 +194,8 @@ how to assign roles and permissions for a class. - Set [who can access user email addresses](/help/configure-email-visibility). (Recommended: Admins only) - Set [who can create channels](/help/configure-who-can-create-channels). - (Recommended: Admins and moderators for public streams; - Admins, moderators and members for private streams) + (Recommended: Admins and moderators for public channels; + Admins, moderators and members for private channels) - Set [who can add users to channels](/help/configure-who-can-invite-to-channels). (Recommended: Admins and moderators) - Set [who can edit the topic of any message](/help/restrict-moving-messages). @@ -209,13 +209,13 @@ how to assign roles and permissions for a class. {!create-channels-intro.md!} -### How to create a stream +### How to create a channel {start_tabs} {relative|channel|all} -1. Click **Create stream** on the right. +1. Click **Create channel** on the right. 1. Fill out the requested info, and click **Create**. @@ -224,9 +224,9 @@ how to assign roles and permissions for a class. For more details about channel settings, see [Create a channel](/help/create-a-channel#channel-options). -### Tips for creating streams +### Tips for creating channels -For most classes, the following streams are recommended: +For most classes, the following channels are recommended: - **#announcements**: For general announcements about the class. When creating this channel, [restrict posting @@ -235,22 +235,22 @@ For most classes, the following streams are recommended: allowed to post. - **#staff (private)**: For discussions among course staff. - **#general**: For random topics, e.g. students forming study groups. -- A stream for each **lecture** or **unit**, e.g. “Lecture 1: Course +- A channel for each **lecture** or **unit**, e.g. “Lecture 1: Course intro” or “Unit 3: Sorting algorithms”. -- A stream for each **section**/**tutorial group** (e.g. “Section 1”) +- A channel for each **section**/**tutorial group** (e.g. “Section 1”) !!! tip "" - You can start by creating streams for just the first few - lectures/units at this point. When you create a new stream, - you will be able to copy stream membership from existing streams. + You can start by creating channels for just the first few + lectures/units at this point. When you create a new channel, + you will be able to copy channel membership from existing channels. A few notes: -- Small classes may need just one discussion stream for all lectures. +- Small classes may need just one discussion channel for all lectures. - If you are [using a single Zulip organization][separate-orgs] for - more than one class, all stream names should be prefixed with the + more than one class, all channel names should be prefixed with the name of the class, e.g. “CS101 > Lecture 1: Course intro”. [separate-orgs]: /help/setting-up-zulip-for-a-class#do-i-need-a-separate-zulip-organization-for-each-class @@ -262,8 +262,8 @@ A few notes: !!! tip "" If using your Zulip organization for a single class, set default - streams for new users to include **#announcements**, **#general**, - and all lecture/unit streams. + channels for new users to include **#announcements**, **#general**, + and all lecture/unit channels. ## Invite users to join @@ -276,10 +276,10 @@ A few notes: ### How to invite users to join -To simplify subscription management, be sure to set the streams +To simplify subscription management, be sure to set the channels students and staff should be added to when you create the invitations. You may choose to send invitations to course staff -separately, so that they can immediately be added to private streams +separately, so that they can immediately be added to private channels for your class. {!how-to-invite-users-to-join.md!} @@ -290,9 +290,9 @@ to [Getting started with Zulip][getting-started] and the guide to !!! tip "" - If you create new streams later on, you can add users + If you create new channels later on, you can add users [by group][create-user-groups] or copy membership from another - stream (e.g. from Lecture 5 to Lecture 6). + channel (e.g. from Lecture 5 to Lecture 6). [create-user-groups]: /help/setting-up-zulip-for-a-class#create-user-groups @@ -329,15 +329,15 @@ product. If you plan to use the same Zulip organization in future terms (either for your own classes or for your department), you will likely want to: -- Rename all streams to indicate the class and term in which they were used, e.g.: +- Rename all channels to indicate the class and term in which they were used, e.g.: - **#announcements** → **#FA21 - CS101 - announcements** - **#CS101 > Lecture 1: Course intro** → **#FA21 - CS101 > Lecture 1: Course intro** - If you do *not* want students from future classes to see messages from the prior term (e.g. because you posted homework solutions), - [make all the streams from the class private][make-private]. You’ll + [make all the channels from the class private][make-private]. You’ll be able to find and reuse content yourself, and [invite course - staff][add-to-channel] to these private streams as needed. + staff][add-to-channel] to these private channels as needed. - You may choose to [deactivate students’ Zulip accounts][deactivate-user] when the class is over. - [Unpin channels](/help/pin-a-channel) from the class from your diff --git a/help/share-and-upload-files.md b/help/share-and-upload-files.md index c123d4c0e9..1887c057eb 100644 --- a/help/share-and-upload-files.md +++ b/help/share-and-upload-files.md @@ -62,7 +62,7 @@ People reading the message can click on the preview to {tab|mobile} -1. Navigate to a stream, topic, or direct message view. +1. Navigate to a channel, topic, or direct message view. 1. Tap the **paperclip** (paperclip), @@ -93,7 +93,7 @@ You can share files from other apps on Zulip. (logo) logo. -1. Select a stream name and topic name, or tap the +1. Select a channel name and topic name, or tap the **Direct message** tab and **Choose recipients**. 1. _(optional)_ Write a message. diff --git a/help/start-a-call.md b/help/start-a-call.md index 991bfe3f8e..5a1d1a3224 100644 --- a/help/start-a-call.md +++ b/help/start-a-call.md @@ -23,14 +23,14 @@ {tab|mobile} -1. Navigate to a stream, topic, or direct message view. +1. Navigate to a channel, topic, or direct message view. 1. Tap the **video camera** (video) button at the bottom of the app. This will insert a **Click to join video call** link into your message. -1. If you are in a stream view, choose a destination topic by tapping the +1. If you are in a channel view, choose a destination topic by tapping the compose box and selecting an existing topic or typing a new topic name. 1. Send the message. diff --git a/help/starting-a-new-topic.md b/help/starting-a-new-topic.md index 86edee9ef1..2158aaaaf8 100644 --- a/help/starting-a-new-topic.md +++ b/help/starting-a-new-topic.md @@ -15,4 +15,4 @@ * [Replying to messages](/help/replying-to-messages) * [Messaging tips & tricks](/help/messaging-tips) * [Rename a topic](/help/rename-a-topic) -* [Require topics in stream messages](/help/require-topics) +* [Require topics in channel messages](/help/require-topics) diff --git a/help/typing-notifications.md b/help/typing-notifications.md index 738df2ce97..1b64909e67 100644 --- a/help/typing-notifications.md +++ b/help/typing-notifications.md @@ -3,7 +3,7 @@ The Zulip web app displays typing notifications in [conversation views](/help/reading-conversations) and [**All direct messages**](/help/direct-messages#access-all-dms). Typing -notifications are not shown in streams with more than 100 +notifications are not shown in channels with more than 100 subscribers. The mobile app displays typing notifications in direct message conversations. @@ -25,7 +25,7 @@ configure Zulip to not send typing notifications. {settings_tab|account-and-privacy} 1. Under **Privacy**, toggle **Let recipients see when I'm typing direct - messages** and **Let recipients see when I'm typing messages in streams**. + messages** and **Let recipients see when I'm typing messages in channels**. {end_tabs} diff --git a/help/user-groups.md b/help/user-groups.md index c29f4560ea..90ae5f9d5e 100644 --- a/help/user-groups.md +++ b/help/user-groups.md @@ -6,7 +6,7 @@ You can also: - Add a user group to another user group. This individually adds all the users in the group. -- Subscribe a user group to a stream. This individually subscribes all the users +- Subscribe a user group to a channel. This individually subscribes all the users in the group. - Compose a [direct message](/help/direct-messages) to a user group. This automatically puts all the users in the group into the addressee field. diff --git a/help/user-list.md b/help/user-list.md index b4b47a6349..1294c90008 100644 --- a/help/user-list.md +++ b/help/user-list.md @@ -9,7 +9,7 @@ In organizations with up to 600 users, everyone is shown. In larger organization only users who have been active in the last two weeks are listed. All users are included when you search for people. -When you view a stream or a topic within a stream, subscribers to that stream +When you view a channel or a topic within a channel, subscribers to that channel are shown separately from other members of your organization. To avoid distraction, you can hide the user list any time. diff --git a/help/using-zulip-for-a-class.md b/help/using-zulip-for-a-class.md index ab42c65d6a..29f9f469cd 100644 --- a/help/using-zulip-for-a-class.md +++ b/help/using-zulip-for-a-class.md @@ -18,9 +18,9 @@ single place for: !!! tip "" [Subscribe to email notifications](/help/channel-notifications) for - streams such as **#announcements** to make sure you never miss an important message. + channels such as **#announcements** to make sure you never miss an important message. -Many classes use a dedicated stream to post general announcements, e.g.: +Many classes use a dedicated channel to post general announcements, e.g.: * **\#announcements** > **office hours**: My office hours this week will be rescheduled from `Mon, Oct 11 2021, 1:00 PM` to `Thu, Oct 14 2021, 3:30 PM`. @@ -40,13 +40,13 @@ from today’s lecture. [lecture notes 10/2.pdf]() You can view a recording of t ## Answering students’ questions -In Zulip, streams determine who receives a message. Topics are +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). 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 -might see the following topics in a stream where a lecture and the +might see the following topics in a channel where a lecture and the corresponding assignment are being discussed: * problem 2a clarification @@ -70,7 +70,7 @@ staff to see which conversations still require their attention. ## Coordination among teaching staff -Use private streams to coordinate among course staff, e.g.: +Use private channels to coordinate among course staff, e.g.: * **\#staff** > **homework 2 exercise 3b**: How many points should I take off for this? The assignment says clearly to use Python 3 syntax. diff --git a/help/view-images-and-videos.md b/help/view-images-and-videos.md index c9211dec05..28ec34ba44 100644 --- a/help/view-images-and-videos.md +++ b/help/view-images-and-videos.md @@ -108,8 +108,8 @@ attached to messages in your current view. ## Browse images and videos In the Zulip desktop or web app, you can browse the images and videos in -the current view. For example, if you're in a stream view, you'll be able -to browse through all the images and videos in that stream. If you do a +the current view. For example, if you're in a channel view, you'll be able +to browse through all the images and videos in that channel. If you do a [search](/help/search-for-messages), the **viewer** will display all the images and videos in messages matching that search.