help: Rename and redirect add-or-remove-users-from-a-stream for channel.

help/add-or-remove-users-from-a-channel.md

@@ -1,19 +1,19 @@
-# Add or remove users from a stream
+# Add or remove users from a channel
 
-By default, anyone (other than guests) subscribed to a stream can add
+By default, anyone (other than guests) subscribed to a channel can add
-users to that stream. Additionally, anyone (other than guests) can add
+users to that channel. Additionally, anyone (other than guests) can add
-users to a public stream, whether or not they are subscribed to the
+users to a public channel, whether or not they are subscribed to the
-stream. Anyone can always [unsubscribe themselves from a channel][unsubscribe].
+channel. Anyone can always [unsubscribe themselves from a channel][unsubscribe].
 
-Organization administrators can also unsubscribe *other* users from any stream,
+Organization administrators can also unsubscribe *other* users from any channel,
-including streams the admin is not subscribed to. They can also configure which
+including channels the admin is not subscribed to. They can also configure which
 [roles](/help/roles-and-permissions) have access to [add other users to a
-stream][add-users] or [remove other users from a stream][remove-users].
+channel][add-users] or [remove other users from a channel][remove-users].
 
 [add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users
 [remove-users]: /help/configure-who-can-invite-to-streams#configure-who-can-remove-users
 
-## Add users to a stream
+## Add users to a channel
 
 {start_tabs}
 
@@ -21,19 +21,19 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 {relative|stream|all}
 
-1. Select a stream.
+1. Select a channel.
 
 {!select-channel-view-subscribers.md!}
 
 1. Under **Add subscribers**, enter a name or email address. The typeahead
-   will only include users who aren't already subscribed to the stream.
+   will only include users who aren't already subscribed to the channel.
 
 1. Click **Add**.
 
 !!! tip ""
 
       To add users in bulk, you can copy members from an
-      existing stream or [user group](/help/user-groups).
+      existing channel or [user group](/help/user-groups).
 
 {tab|mobile}
 
@@ -41,7 +41,7 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 {!stream-long-press-menu.md!}
 
-1. Tap **Stream settings**.
+1. Tap **Channel settings**.
 
 1. Tap **Add subscribers**.
 
@@ -57,9 +57,9 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 {!automated-dm-stream-subscription.md!}
 
-## Alternate methods to add users to a stream
+## Alternate methods to add users to a channel
 
-### Via stream settings
+### Via channel settings
 
 {start_tabs}
 
@@ -67,12 +67,12 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 {!stream-actions.md!}
 
-1. Click **Stream settings**.
+1. Click **Channel settings**.
 
 {!select-channel-view-subscribers.md!}
 
 1. Under **Add subscribers**, enter a name or email address. The typeahead
-   will only include users who aren't already subscribed to the stream.
+   will only include users who aren't already subscribed to the channel.
 
 1. Click **Add**.
 
@@ -80,7 +80,7 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 {!stream-long-press-menu.md!}
 
-1. Tap **Stream settings**.
+1. Tap **Channel settings**.
 
 1. Tap **Add subscribers**.
 
@@ -100,10 +100,10 @@ stream][add-users] or [remove other users from a stream][remove-users].
 
 When you [mention a user](/help/mention-a-user-or-group) while composing
 a message in the web or desktop app, an alert banner appears above the
-compose box if they are not subscribed to the stream.
+compose box if they are not subscribed to the channel.
 
 Click the **Subscribe them** button on the banner to add the user to the
-stream. You will not see the button if you don't have permission to
+channel. You will not see the button if you don't have permission to
 subscribe the user.
 
 !!! tip ""
@@ -111,7 +111,7 @@ subscribe the user.
       You do not have to send the message you are composing for
       the user to be subscribed this way.
 
-## Remove users from a stream
+## Remove users from a channel
 
 {start_tabs}
 
@@ -119,7 +119,7 @@ subscribe the user.
 
 {relative|stream|all}
 
-1. Select a stream.
+1. Select a channel.
 
 {!select-channel-view-subscribers.md!}
 
@@ -133,16 +133,16 @@ subscribe the user.
 
 {!right-sidebar-view-profile.md!}
 
-1. Select the **Streams** tab.
+1. Select the **Channels** tab.
 
-1. Under **Subscribed streams**, find the stream you would like
+1. Under **Subscribed channels**, find the channel you would like
    to remove the user from.
 
 1. Click the **Unsubscribe** button in that row.
 
 !!! tip ""
 
-    This method is useful if you need to remove one user from multiple streams.
+    This method is useful if you need to remove one user from multiple channels.
 
 {end_tabs}
 

help/configure-automated-notices.md

@@ -55,7 +55,7 @@ automated notices to help others understand how content was moved.
 ## Notices about users
 
 You will be notified if someone [subscribes you to a
-stream](/help/add-or-remove-users-from-a-stream#add-users-to-a-stream), or
+channel](/help/add-or-remove-users-from-a-channel#add-users-to-a-channel), or
 changes your [group](/help/user-groups) membership.
 
 ### New user announcements

help/configure-who-can-invite-to-streams.md

@@ -39,5 +39,5 @@ subscribed to the stream to configure these settings.
 
 ## Related articles
 
-* [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)
+* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
 * [Roles and permissions](/help/roles-and-permissions)

help/include/sidebar_index.md

@@ -130,7 +130,7 @@
 * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)
 * [Create a channel](/help/create-a-channel)
 * [View channel subscribers](/help/view-channel-subscribers)
-* [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)
+* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
 * [Pin a stream](/help/pin-a-stream)
 * [Change the color of a stream](/help/change-the-color-of-a-stream)
 * [Start a new topic](/help/starting-a-new-topic)
@@ -205,7 +205,7 @@
 * [Stream posting policy](/help/stream-sending-policy)
 * [Restrict stream creation](/help/configure-who-can-create-streams)
 * [Restrict stream membership management](/help/configure-who-can-invite-to-streams)
-* [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)
+* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
 * [Set default streams for new users](/help/set-default-streams-for-new-users)
 * [Rename a stream](/help/rename-a-stream)
 * [Change a stream's description](/help/change-the-stream-description)

help/manage-user-stream-subscriptions.md

@@ -89,7 +89,7 @@ channel](/help/unsubscribe-from-a-channel).
 
 * [Stream permissions](/help/stream-permissions)
 * [Roles and permissions](/help/roles-and-permissions)
-* [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)
+* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
 * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)
 * [View channel subscribers](/help/view-channel-subscribers)
 

help/moderating-open-organizations.md

@@ -72,7 +72,7 @@ organization's policy choices.
 * Investigate behavior by [viewing messages sent by a
   user](/help/view-messages-sent-by-a-user).
 * Delete messages, [archive streams](/help/archive-a-stream), and
-  [unsubscribe users from streams](/help/add-or-remove-users-from-a-stream).
+  [unsubscribe users from channels](/help/add-or-remove-users-from-a-channel).
 * [Move topics](/help/rename-a-topic), including between streams, when
   users start conversations in the wrong place.
 * [Change users' names](/help/change-a-users-name) (e.g., to "Name (Spammer)")

help/setting-up-zulip-for-a-class.md

@@ -337,7 +337,7 @@ for your own classes or for your department), you will likely want to:
   from the prior term (e.g. because you posted homework solutions),
   [make all the streams from the class private][make-private]. You’ll
   be able to find and reuse content yourself, and [invite course
-  staff][add-to-stream] to these private streams as needed.
+  staff][add-to-channel] to these private streams as needed.
 - You may choose to [deactivate students’ Zulip
   accounts][deactivate-user] when the class is over.
 - [Unpin streams](/help/pin-a-stream) from the class from your
@@ -357,5 +357,5 @@ HTML archive](https://github.com/zulip/zulip-archive) to archive the information
 * [Moderating open organizations](/help/moderating-open-organizations)
 
 [make-private]: /help/change-the-privacy-of-a-stream
-[add-to-stream]: /help/add-or-remove-users-from-a-stream
+[add-to-channel]: /help/add-or-remove-users-from-a-channel
 [deactivate-user]: /help/deactivate-or-reactivate-a-user#deactivate-a-user

help/view-channel-subscribers.md

@@ -40,5 +40,5 @@ unsubscribe other users to channels.
 * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
 * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)
 * [Manage a user's stream subscriptions](/help/manage-user-stream-subscriptions)
-* [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)
+* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
 * [Set default streams for new users](/help/set-default-streams-for-new-users)

templates/zerver/integrations/include/configure-matrix-bridge.md

@@ -3,7 +3,7 @@
 1. {!create-a-generic-bot.md!}
    Download the bot's `zuliprc` configuration file to your computer.
 
-1. [Subscribe the bot](/help/add-or-remove-users-from-a-stream) to the Zulip
+1. [Subscribe the bot](/help/add-or-remove-users-from-a-channel) to the Zulip
    stream that will contain the mirror.
 
 1. Inside the virtualenv you created above, run

templates/zerver/integrations/irc.md

@@ -33,7 +33,7 @@ Mirror an IRC channel in Zulip!
 1. {!create-a-generic-bot.md!}
    Download the bot's `zuliprc` configuration file to your computer.
 
-1. [Subscribe the bot](/help/add-or-remove-users-from-a-stream) to the Zulip
+1. [Subscribe the bot](/help/add-or-remove-users-from-a-channel) to the Zulip
    stream that will contain the mirror.
 
 1. Inside the virtualenv you created above, run:

zerver/lib/url_redirects.py

@@ -91,6 +91,9 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
     URLRedirect("/help/browse-and-subscribe-to-streams", "/help/browse-and-subscribe-to-channels"),
     URLRedirect("/help/unsubscribe-from-a-stream", "/help/unsubscribe-from-a-channel"),
     URLRedirect("/help/view-stream-subscribers", "/help/view-channel-subscribers"),
+    URLRedirect(
+        "/help/add-or-remove-users-from-a-stream", "/help/add-or-remove-users-from-a-channel"
+    ),
 ]
 
 LANDING_PAGE_REDIRECTS = [