From 859340c91425e30b257cd556af4427c9c256b18b Mon Sep 17 00:00:00 2001
From: Lauryn Menard <lauryn@zulip.com>
Date: Wed, 1 May 2024 19:58:46 +0200
Subject: [PATCH] help: Rename and redirect mute-a-stream for channel.

---
 help/change-organization-url.md               |  2 +-
 help/channel-notifications.md                 |  4 ++--
 help/configure-unread-message-counters.md     | 12 +++++-----
 help/follow-a-topic.md                        |  4 ++--
 help/inbox.md                                 |  6 ++---
 help/include/automatically-follow-topics.md   |  2 +-
 ...ically-unmute-topics-in-muted-channels.md} |  2 +-
 help/include/followed-topic-workflows.md      |  6 ++---
 help/include/mentions-intro.md                |  2 +-
 help/include/sidebar_index.md                 |  2 +-
 help/mention-a-user-or-group.md               | 12 +++++-----
 help/{mute-a-stream.md => mute-a-channel.md}  | 22 +++++++++----------
 help/mute-a-topic.md                          |  6 ++---
 help/mute-a-user.md                           |  4 ++--
 help/pin-a-channel.md                         |  2 +-
 help/reading-strategies.md                    | 16 +++++++-------
 help/topic-notifications.md                   |  8 +++----
 .../stream_settings_checkbox.hbs              |  2 +-
 zerver/lib/url_redirects.py                   |  1 +
 zerver/openapi/zulip.yaml                     |  2 +-
 20 files changed, 59 insertions(+), 58 deletions(-)
 rename help/include/{automatically-unmute-topics-in-muted-streams.md => automatically-unmute-topics-in-muted-channels.md} (69%)
 rename help/{mute-a-stream.md => mute-a-channel.md} (66%)

diff --git a/help/change-organization-url.md b/help/change-organization-url.md
index 83b5b0ba22..eac60f8137 100644
--- a/help/change-organization-url.md
+++ b/help/change-organization-url.md
@@ -11,7 +11,7 @@ organization URL is a disruptive operation for users:
   to be updated to point to the new organization URL.
 
 We recommend using a [wildcard
-mention](/help/mention-a-user-or-group#mention-everyone-on-a-stream)
+mention](/help/mention-a-user-or-group#mention-everyone-on-a-channel)
 in an announcement stream to notify users that they need to update
 their clients.
 
diff --git a/help/channel-notifications.md b/help/channel-notifications.md
index d90fe7521b..1aa7a27571 100644
--- a/help/channel-notifications.md
+++ b/help/channel-notifications.md
@@ -6,7 +6,7 @@ channel basis.
 ## Configure notifications for a single channel
 
 These settings will override any default channel notification settings. In [muted
-channels](/help/mute-a-stream), channel notification settings apply only to
+channels](/help/mute-a-channel), channel notification settings apply only to
 [unmuted topics](/help/mute-a-topic).
 
 {start_tabs}
@@ -66,7 +66,7 @@ explicitly set a notification preference.
 * [Desktop notifications](/help/desktop-notifications)
 * [Email notifications](/help/email-notifications)
 * [Mobile notifications](/help/mobile-notifications)
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
 * [Mute or unmute a topic](/help/mute-a-topic)
 * [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
 * [Do not disturb](/help/do-not-disturb)
diff --git a/help/configure-unread-message-counters.md b/help/configure-unread-message-counters.md
index 038b3cefd4..c257a9b2d8 100644
--- a/help/configure-unread-message-counters.md
+++ b/help/configure-unread-message-counters.md
@@ -1,14 +1,14 @@
 # Configure unread message counters
 
 To provide information about unread messages, Zulip can show unread message
-counters next to stream names in the left sidebar. This is likely to be helpful
+counters next to channel names in the left sidebar. This is likely to be helpful
 if you generally read (or otherwise [mark as read](/help/marking-messages-as-read))
-all the messages in a stream, but may otherwise feel unnecessary.
+all the messages in a channel, but may otherwise feel unnecessary.
 
-Zulip offers an option to display a dot instead of an unread counter for streams
-in the left sidebar. You can use a dot for all streams, or just for streams you
-have [muted](/help/mute-a-stream). You will still be able to see the number of
-unread messages in a stream by moving your mouse over it in the left sidebar.
+Zulip offers an option to display a dot instead of an unread counter for channels
+in the left sidebar. You can use a dot for all channels, or just for channels you
+have [muted](/help/mute-a-channel). You will still be able to see the number of
+unread messages in a channel by moving your mouse over it in the left sidebar.
 
 {start_tabs}
 
diff --git a/help/follow-a-topic.md b/help/follow-a-topic.md
index 8d593f8f89..45a08b0710 100644
--- a/help/follow-a-topic.md
+++ b/help/follow-a-topic.md
@@ -66,7 +66,7 @@ You can use followed topics for a variety of workflows:
 You can configure custom notifications for followed topics. You can also
 [configure the unread count
 badge](/help/desktop-notifications#unread-count-badge) to include unread
-messages just in followed topics, without counting other stream messages.
+messages just in followed topics, without counting other channel messages.
 
 {!configure-notifications-for-followed-topics.md!}
 
@@ -90,4 +90,4 @@ messages just in followed topics, without counting other stream messages.
 * [Topic notifications](/help/topic-notifications)
 * [Channel notifications](/help/channel-notifications)
 * [Mute or unmute a topic](/help/mute-a-topic)
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
diff --git a/help/inbox.md b/help/inbox.md
index 55825b5ed0..ac11581100 100644
--- a/help/inbox.md
+++ b/help/inbox.md
@@ -5,7 +5,7 @@
 {!inbox-intro.md!}
 
 Inbox is a convenient [home view](/help/configure-home-view) if you
-regularly clear all unread messages in your subscribed streams.
+regularly clear all unread messages in your subscribed channels.
 
 {!inbox-instructions.md!}
 
@@ -42,7 +42,7 @@ In the web app, you can control whether the **Inbox** includes all topics, just
 {!go-to-inbox.md!}
 
 1. Use the **Filter** box at the top to find a conversation.
-   You can filter by stream, topic, or direct message participants.
+   You can filter by channel, topic, or direct message participants.
 
 {end_tabs}
 
@@ -52,6 +52,6 @@ In the web app, you can control whether the **Inbox** includes all topics, just
 * [Reading strategies](/help/reading-strategies)
 * [Recent conversations](/help/recent-conversations)
 * [Combined feed](/help/combined-feed)
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
 * [Mute or unmute a topic](/help/mute-a-topic)
 * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
diff --git a/help/include/automatically-follow-topics.md b/help/include/automatically-follow-topics.md
index 5c356b39dd..a0ae7b4ba7 100644
--- a/help/include/automatically-follow-topics.md
+++ b/help/include/automatically-follow-topics.md
@@ -19,7 +19,7 @@ You can automatically follow topics where you are personally
 - You will automatically follow topics where you are personally mentioned, but
   group mentions and wildcard mentions (**@all**, **@topic**, etc.) will not
   affect topic status.
-- You will automatically follow topics in [muted streams](/help/mute-a-stream)
+- You will automatically follow topics in [muted channels](/help/mute-a-channel)
   when you are mentioned.
 - Mentions will *not* cause you to automatically follow topics you have
   explicitly [muted](/help/mute-a-topic).
diff --git a/help/include/automatically-unmute-topics-in-muted-streams.md b/help/include/automatically-unmute-topics-in-muted-channels.md
similarity index 69%
rename from help/include/automatically-unmute-topics-in-muted-streams.md
rename to help/include/automatically-unmute-topics-in-muted-channels.md
index 6b3f6ffe7b..a10648a3f0 100644
--- a/help/include/automatically-unmute-topics-in-muted-streams.md
+++ b/help/include/automatically-unmute-topics-in-muted-channels.md
@@ -5,6 +5,6 @@
 {settings_tab|notifications}
 
 1. Under **Topic notifications**, select the desired option from the
-   **Automatically unmute topics in muted streams** dropdown.
+   **Automatically unmute topics in muted channels** dropdown.
 
 {end_tabs}
diff --git a/help/include/followed-topic-workflows.md b/help/include/followed-topic-workflows.md
index bcab430925..dc017122fd 100644
--- a/help/include/followed-topic-workflows.md
+++ b/help/include/followed-topic-workflows.md
@@ -3,15 +3,15 @@
   spend a few minutes checking on on the conversations that need
   your attention.
 
-- No more stressing about missing a reply to your message in streams
+- No more stressing about missing a reply to your message in channels
   you don't regularly read. You can [automatically
   follow](/help/follow-a-topic#automatically-follow-topics) topics you
   start or participate in.
 
-- You can also [mute](/help/mute-a-stream) the streams you don't
+- You can also [mute](/help/mute-a-channel) the channels you don't
   regularly read, and [automatically follow or
   unmute](/help/follow-a-topic#automatically-follow-topics) topics you
-  start or participate in. In muted streams, topics you follow are
+  start or participate in. In muted channels, topics you follow are
   automatically treated as [unmuted](/help/mute-a-topic), so it will
   be easy to see when someone responds to your message.
 
diff --git a/help/include/mentions-intro.md b/help/include/mentions-intro.md
index bf75d0eef7..df4bfa5a2e 100644
--- a/help/include/mentions-intro.md
+++ b/help/include/mentions-intro.md
@@ -4,5 +4,5 @@ settings](/help/dm-mention-alert-notifications) as direct messages and alert
 words. A [silent mention](/help/mention-a-user-or-group#silently-mention-a-user)
 allows you to refer to a user without triggering a notification. A wildcard
 mention allows you to
-[mention everyone on a stream](/help/mention-a-user-or-group#mention-everyone-on-a-stream),
+[mention everyone on a channel](/help/mention-a-user-or-group#mention-everyone-on-a-channel),
 or [mention all topic participants](/help/mention-a-user-or-group#mention-all-topic-participants).
diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md
index 9ecb8204dd..fbdcdc1403 100644
--- a/help/include/sidebar_index.md
+++ b/help/include/sidebar_index.md
@@ -146,7 +146,7 @@
 * [Topic notifications](/help/topic-notifications)
 * [Follow a topic](/help/follow-a-topic)
 * [DMs, mentions, and alerts](/help/dm-mention-alert-notifications)
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
 * [Mute or unmute a topic](/help/mute-a-topic)
 * [Mute a user](/help/mute-a-user)
 * [Email notifications](/help/email-notifications)
diff --git a/help/mention-a-user-or-group.md b/help/mention-a-user-or-group.md
index b483bee0f9..f40694b796 100644
--- a/help/mention-a-user-or-group.md
+++ b/help/mention-a-user-or-group.md
@@ -68,15 +68,15 @@ Users can disable notifications for `@**topic**` mentions by:
 [globally](/help/dm-mention-alert-notifications) or for [individual
 channels](/help/channel-notifications).
 
-- Muting the [topic](/help/mute-a-topic) or [stream](/help/mute-a-stream).
+- Muting the [topic](/help/mute-a-topic) or [channel](/help/mute-a-channel).
 
-## Mention everyone on a stream
+## Mention everyone on a channel
 
-You can mention everyone on a stream with the `@**all**` mention (or,
+You can mention everyone on a channel with the `@**all**` mention (or,
 equivalently, `@**everyone**` or `@**channel**`). It's best to use these mentions
-only when your message requires timely attention from many stream subscribers.
+only when your message requires timely attention from many channel subscribers.
 An organization can be configured to
-[restrict](/help/restrict-wildcard-mentions) wildcard mentions in large streams.
+[restrict](/help/restrict-wildcard-mentions) wildcard mentions in large channels.
 
 Users can disable notifications for `@**all**`, `@**everyone**`, and
 `@**channel**` mentions by:
@@ -85,7 +85,7 @@ Users can disable notifications for `@**all**`, `@**everyone**`, and
 [globally](/help/dm-mention-alert-notifications) or for [individual
 channels](/help/channel-notifications).
 
-- Muting the [topic](/help/mute-a-topic) or [stream](/help/mute-a-stream).
+- Muting the [topic](/help/mute-a-topic) or [channel](/help/mute-a-channel).
 
 ## Examples
 
diff --git a/help/mute-a-stream.md b/help/mute-a-channel.md
similarity index 66%
rename from help/mute-a-stream.md
rename to help/mute-a-channel.md
index d56caf0f22..19dd4fba73 100644
--- a/help/mute-a-stream.md
+++ b/help/mute-a-channel.md
@@ -1,8 +1,8 @@
-# Mute or unmute a stream
+# Mute or unmute a channel
 
 {!mute-unmute-intro.md!}
 
-## Mute a stream
+## Mute a channel
 
 {start_tabs}
 
@@ -10,20 +10,20 @@
 
 {!stream-actions.md!}
 
-1. Click **Mute stream**.
+1. Click **Mute channel**.
 
 {tab|mobile}
 
 {!stream-long-press-menu.md!}
 
-1. Tap **Mute stream**.
+1. Tap **Mute channel**.
 
 {!stream-long-press-menu-tip.md!}
 
 {end_tabs}
 
 
-## Unmute a stream
+## Unmute a channel
 
 {start_tabs}
 
@@ -31,19 +31,19 @@
 
 {!stream-actions.md!}
 
-1. Click **Unmute stream**.
+1. Click **Unmute channel**.
 
 {tab|mobile}
 
 {!stream-long-press-menu.md!}
 
-1. Tap **Unmute stream**.
+1. Tap **Unmute channel**.
 
 {!stream-long-press-menu-tip.md!}
 
 {end_tabs}
 
-## Alternate method to mute or unmute a stream
+## Alternate method to mute or unmute a channel
 
 {start_tabs}
 
@@ -51,17 +51,17 @@
 
 {relative|gear|stream-settings}
 
-1. Select a stream.
+1. Select a channel.
 
 {!select-channel-view-personal.md!}
 
-1. Under **Notification settings**, toggle **Mute stream**.
+1. Under **Notification settings**, toggle **Mute channel**.
 
 {tab|mobile}
 
 {!stream-long-press-menu.md!}
 
-1. Tap **Stream settings**.
+1. Tap **Channel settings**.
 
 1. Toggle **Muted**.
 
diff --git a/help/mute-a-topic.md b/help/mute-a-topic.md
index 3c2afa2c5d..9ebb12f1e0 100644
--- a/help/mute-a-topic.md
+++ b/help/mute-a-topic.md
@@ -11,9 +11,9 @@
     You can also use the <kbd>Shift</kbd> + <kbd>M</kbd> [keyboard
     shortcut](/help/keyboard-shortcuts) to mute or unmute a topic.
 
-## Automatically unmute topics in muted streams
+## Automatically unmute topics in muted channels
 
-{!automatically-unmute-topics-in-muted-streams.md!}
+{!automatically-unmute-topics-in-muted-channels.md!}
 
 ## Manage configured topics
 
@@ -21,7 +21,7 @@
 
 ## Related articles
 
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
 * [Follow a topic](/help/follow-a-topic)
 * [Topic notifications](/help/topic-notifications)
 * [Mute a user](/help/mute-a-user)
diff --git a/help/mute-a-user.md b/help/mute-a-user.md
index 70bf7d845b..83c600a77d 100644
--- a/help/mute-a-user.md
+++ b/help/mute-a-user.md
@@ -37,7 +37,7 @@ have the following effects:
 * **Recent conversations** and other features that display avatars will
   show a generic user symbol in place of a muted user's profile picture.
 
-* To avoid interfering with administration tasks, stream and
+* To avoid interfering with administration tasks, channel and
   organization settings display muted users' names and other details.
 
 !!! tip ""
@@ -89,5 +89,5 @@ From there, you can also search for and **unmute** users.
 
 * [Deactivate a user](/help/deactivate-or-reactivate-a-user)
 * [Moderating open organizations](/help/moderating-open-organizations)
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
 * [Mute or unmute a topic](/help/mute-a-topic)
diff --git a/help/pin-a-channel.md b/help/pin-a-channel.md
index 2381617752..eb2e5ca03e 100644
--- a/help/pin-a-channel.md
+++ b/help/pin-a-channel.md
@@ -73,4 +73,4 @@ which is especially handy if you are subscribed to a large number of channels.
 ## Related articles
 
 * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
diff --git a/help/reading-strategies.md b/help/reading-strategies.md
index 45b78e2fc4..00aabb6ff5 100644
--- a/help/reading-strategies.md
+++ b/help/reading-strategies.md
@@ -1,6 +1,6 @@
 # Reading strategies
 
-In Zulip, streams determine who gets a message. Topics tell you what
+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 and
 topics](/help/channels-and-topics).
@@ -38,7 +38,7 @@ in Zulip.
 
 You can improve your workflow for catching up on messages by taking advantage of
 [following topics](/help/follow-a-topic), as well as muting and unmuting
-[streams](/help/mute-a-stream) and [topics](/help/mute-a-topic). Some example
+[channels](/help/mute-a-channel) and [topics](/help/mute-a-topic). Some example
 workflows:
 
 {!followed-topic-workflows.md!}
@@ -73,9 +73,9 @@ You can see all your direct messages in one place.
 
 {end_tabs}
 
-### Stream view
+### Channel view
 
-Sometimes it's useful to scroll through all the messages in a stream,
+Sometimes it's useful to scroll through all the messages in a channel,
 especially in situations where you just want a general idea of what's going
 on.
 
@@ -83,14 +83,14 @@ on.
 
 {tab|desktop-web}
 
-1. Find the stream you want to read in the left sidebar. If you don't see it
-   right away, you can search for a stream by clicking on **STREAMS** in the
+1. Find the channel you want to read in the left sidebar. If you don't see it
+   right away, you can search for a channel by clicking on **CHANNELS** in the
    left sidebar, or using the <kbd>Q</kbd> [keyboard
    shortcut](/help/keyboard-shortcuts).
 
-1. Click on the stream name in the left sidebar.
+1. Click on the channel name in the left sidebar.
 
-1. Read messages in the stream, starting from your first unread message. You can
+1. Read messages in the channel, starting from your first unread message. You can
   scroll using your mouse, the arrow keys, <kbd>End</kbd>, or page up/down.
 
 1. You can click on a topic in the left sidebar or a message recipient bar to
diff --git a/help/topic-notifications.md b/help/topic-notifications.md
index 9f64b3c2fa..8b4ededcc9 100644
--- a/help/topic-notifications.md
+++ b/help/topic-notifications.md
@@ -3,7 +3,7 @@
 In Zulip, you can configure how you get notified about new messages for topics
 you follow.
 
-In muted streams, topics you follow are automatically treated as
+In muted channels, topics you follow are automatically treated as
 [unmuted](/help/mute-a-topic), and you can configure when to automatically
 unmute topics.
 
@@ -15,13 +15,13 @@ unmute topics.
 
 {!automatically-follow-topics.md!}
 
-## Automatically unmute topics in muted streams
+## Automatically unmute topics in muted channels
 
-{!automatically-unmute-topics-in-muted-streams.md!}
+{!automatically-unmute-topics-in-muted-channels.md!}
 
 ## Related articles
 
 * [Follow a topic](/help/follow-a-topic)
 * [Channel notifications](/help/channel-notifications)
 * [Mute or unmute a topic](/help/mute-a-topic)
-* [Mute or unmute a stream](/help/mute-a-stream)
+* [Mute or unmute a channel](/help/mute-a-channel)
diff --git a/web/templates/stream_settings/stream_settings_checkbox.hbs b/web/templates/stream_settings/stream_settings_checkbox.hbs
index 592b62c475..2a1d97489f 100644
--- a/web/templates/stream_settings/stream_settings_checkbox.hbs
+++ b/web/templates/stream_settings/stream_settings_checkbox.hbs
@@ -16,7 +16,7 @@
         </span>
     </div>
     {{#if (eq setting_name "is_muted")}}
-    {{> ../help_link_widget link="/help/mute-a-stream" }}
+    {{> ../help_link_widget link="/help/mute-a-channel" }}
     {{else if (eq setting_name "push_notifications")}}
     {{> ../help_link_widget link="/help/mobile-notifications#enabling-push-notifications-for-self-hosted-servers" }}
     {{/if}}
diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py
index 7a33e223eb..ea580c63f9 100644
--- a/zerver/lib/url_redirects.py
+++ b/zerver/lib/url_redirects.py
@@ -99,6 +99,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
     URLRedirect("/help/move-content-to-another-stream", "/help/move-content-to-another-channel"),
     URLRedirect("/help/manage-inactive-streams", "/help/manage-inactive-channels"),
     URLRedirect("/help/stream-notifications", "/help/channel-notifications"),
+    URLRedirect("/help/mute-a-stream", "/help/mute-a-channel"),
 ]
 
 LANDING_PAGE_REDIRECTS = [
diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml
index 24883cff23..6dbe98f386 100644
--- a/zerver/openapi/zulip.yaml
+++ b/zerver/openapi/zulip.yaml
@@ -11197,7 +11197,7 @@ paths:
 
                           - `"color"`: The hex value of the user's display color for the stream.
 
-                          - `"is_muted"`: Whether the stream is [muted](/help/mute-a-stream).<br>
+                          - `"is_muted"`: Whether the stream is [muted](/help/mute-a-channel).<br>
                             **Changes**: As of Zulip 6.0 (feature level 139), updating either
                             `"is_muted"` or `"in_home_view"` generates two [subscription update
                             events](/api/get-events#subscription-update), one for each property,