help: Update for subscribe/unsubscribe user to channel terminology.

Instead of referring to users being added or removed from channels,
we now use subscribe or unsubscribed from channels.

Splits the article for adding and removing users from a channel
into separate articles: /help/subscribe-users-to-a-channel and
/help/unsubscribe-users-from-a-channel.

The URL redirects for the combined add/remove articles (for both
channel and stream terminology) go to the subscribe users to a
channel article.

help-beta/astro.config.mjs

@@ -285,7 +285,8 @@ export default defineConfig({
                         "channel-posting-policy",
                         "configure-who-can-create-channels",
                         "configure-who-can-invite-to-channels",
-                        "add-or-remove-users-from-a-channel",
+                        "subscribe-users-to-a-channel",
+                        "unsubscribe-users-from-a-channel",
                         "set-default-channels-for-new-users",
                         "rename-a-channel",
                         "change-the-channel-description",

help/archive-a-channel.md

@@ -8,7 +8,7 @@ You can archive channels you no longer plan to use. Archiving a channel:
 - Prevents new messages from being sent to the channel.
 - Prevents messages in the channel from being edited, deleted, or moved.
 
-Archiving a channel does not remove subscribers, or change who can access it.
+Archiving a channel does not unsubscribe users, or change who can access it.
 Messages in archived channels still appear in [search
 results](/help/search-for-messages), the [combined feed](/help/combined-feed),
 and [recent conversations](/help/recent-conversations).

help/bots-overview.md

@@ -57,7 +57,7 @@ A few more details:
 
 * [Channel permissions](/help/channel-permissions) are the same for bots
   as for other users. Therefore, for private channels with protected
-  history, a bot can only access messages sent after it subscribed
+  history, a bot can only access messages sent after it was subscribed
   to the channel.
 
 * **Generic**: A generic bot is like a normal Zulip user account that

help/channel-permissions.md

@@ -39,8 +39,8 @@ can be modified after the channel is created.
 
 [Private channels](#private-channels) (indicated by <i class="zulip-icon
 zulip-icon-lock"></i>) are for conversations that should be accessible only to
-users who are specifically added to the channel. There are two types of private
+users who are specifically subscribed to the channel. There are two types of
-channels in Zulip:
+private channels in Zulip:
 
 - In private channels with **shared history**, new subscribers can access the
   channel's full message history. For example, a newly added team member can get
@@ -58,7 +58,8 @@ Organization administrators and [channel
 administrators](/help/configure-who-can-administer-a-channel) can always:
 
 - See and modify the channel's [name](/help/rename-a-channel) and [description](/help/change-the-channel-description).
-- See who is subscribed to the channel, and [unsubscribe](/help/add-or-remove-users-from-a-channel#remove-users-from-a-channel) them.
+- See who is subscribed to the channel, and
+  [unsubscribe](/help/unsubscribe-users-from-a-channel) them.
 - See the channel's permissions settings.
 - See how much message traffic the channel gets (but not its contents).
 - [Archive](/help/archive-a-channel) the channel.
@@ -105,7 +106,8 @@ Public channels (indicated by <i class="zulip-icon
 You can configure other permissions for public channels, such as [who is allowed
 to post](/help/channel-posting-policy).
 
-Guest users can't see public (or private) channels, unless they have been specifically added to the channel.
+Guest users can't see public (or private) channels, unless they have been specifically
+subscribed to the channel.
 
 ## Web-public channels
 

help/configure-automated-notices.md

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

help/configure-who-can-administer-a-channel.md

@@ -9,14 +9,15 @@ If you have permission to administer a
 [web-public](/help/channel-permissions#web-public-channels) channel, you can:
 
 - See and modify the channel's [name](/help/rename-a-channel) and [description](/help/change-the-channel-description).
-- [Subscribe](/help/add-or-remove-users-from-a-channel#add-users-to-a-channel) and [unsubscribe](/help/add-or-remove-users-from-a-channel#remove-users-from-a-channel) users.
+- [Subscribe](/help/subscribe-users-to-a-channel) and
+  [unsubscribe](/help/unsubscribe-users-from-a-channel) users.
 - Modify the channel's permissions settings, including settings that control who
   can see messages in the channel (public vs. private, shared history vs.
   protected history).
 - [Archive](/help/archive-a-channel) the channel.
 
 For [private](/help/channel-permissions#private-channels) channels, you
-additionally need to be a subscriber in order to add subscribers or change
+additionally need to be a subscriber in order to subscribe users or change
 channel permissions.
 
 ## Configure who can administer a channel

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

@@ -47,4 +47,5 @@ need to be a subscriber in order to change this configuration.
 * [User roles](/help/user-roles)
 * [User groups](/help/user-groups)
 * [Configure who can unsubscribe other users from a channel](/help/configure-who-can-unsubscribe-others)
-* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
+* [Subscribe users to a channel](/help/subscribe-users-to-a-channel)
+* [Unsubscribe users from a channel](/help/unsubscribe-users-from-a-channel)

help/configure-who-can-unsubscribe-others.md

@@ -29,4 +29,5 @@ Organization administrators can unsubscribe other users from any channel.
 * [User groups](/help/user-groups)
 * [Configure who can administer a channel](/help/configure-who-can-administer-a-channel)
 * [Restrict who can subscribe other users to channels](/help/configure-who-can-invite-to-channels)
-* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
+* [Unsubscribe users from a channel](/help/unsubscribe-users-from-a-channel)
+* [Subscribe users to a channel](/help/subscribe-users-to-a-channel)

help/direct-messages.md

@@ -6,8 +6,8 @@ usually with just one or two others.
 
 If you find yourself frequently conversing with the same person or group, it
 often works better to [create a private channel](/help/create-a-channel) for your
-conversations. This lets you organize your discussion into topics, and add or
+conversations. This lets you organize your discussion into topics, and subscribe
-remove participants as needed.
+or unsubscribe people as needed.
 
 ## Send a DM
 

help/guest-users.md

@@ -6,12 +6,13 @@ invited to a company's Zulip chat.
 
 Guest users **can**:
 
-- View and send messages in channels they have been added to, including viewing
+- View and send messages in channels they have been subscribed to, including
-  message history in the same way as other channel subscribers.
+  viewing message history in the same way as other channel subscribers.
 
 Guest users **cannot**:
 
-- See private or public channels, unless they have been specifically added to the channel.
+- See private or public channels, unless they have been specifically subscribed
+  to the channel.
 - Create new channels or user groups.
 - Add or manage bots.
 - Add custom emoji.

help/include/create-channels-intro.md

@@ -5,8 +5,8 @@ join Zulip, so that you can [automatically subscribe
 everyone](/help/set-default-channels-for-new-users) to the right set of
 channels.
 
-If you later create additional channels, no worries! You can always add
+If you later create additional channels, no worries! You can always subscribe
-a group of users or all the members of another channel to a new channel.
+a group of users, or all the subscribers of another channel, to a new channel.
 
 !!! tip ""
     Add clear descriptions to your channels, especially public channels.

help/include/sidebar_index.md

@@ -216,7 +216,8 @@
 * [Restrict channel creation](/help/configure-who-can-create-channels)
 * [Configure who can subscribe others](/help/configure-who-can-invite-to-channels)
 * [Configure who can unsubscribe others](/help/configure-who-can-unsubscribe-others)
-* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
+* [Subscribe users to a channel](/help/subscribe-users-to-a-channel)
+* [Unsubscribe users from a channel](/help/unsubscribe-users-from-a-channel)
 * [Set default channels for new users](/help/set-default-channels-for-new-users)
 * [Rename a channel](/help/rename-a-channel)
 * [Change a channel's description](/help/change-the-channel-description)

help/manage-user-channel-subscriptions.md

@@ -66,7 +66,7 @@ channel](/help/unsubscribe-from-a-channel).
 {!select-channel-view-subscribers.md!}
 
 1. Under **Subscribers**, find the user you would like
-   to remove from the channel.
+   to unsubscribe from the channel.
 
 1. In the **Actions** column, click the **Unsubscribe** button in that row.
 
@@ -77,7 +77,7 @@ channel](/help/unsubscribe-from-a-channel).
 1. Select the **Channels** tab.
 
 1. Under **Subscribed channels**, find the channel you would like
-   to remove the user from.
+   to unsubscribe the user from.
 
 1. Click the **Unsubscribe** button in that row.
 
@@ -87,6 +87,7 @@ channel](/help/unsubscribe-from-a-channel).
 
 * [Channel permissions](/help/channel-permissions)
 * [User roles](/help/user-roles)
-* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)
+* [Subscribe users to a channel](/help/subscribe-users-to-a-channel)
+* [Unsubscribe users from a channel](/help/unsubscribe-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

@@ -73,7 +73,7 @@ organization's policy choices.
 * Investigate behavior by [viewing messages sent by a
   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).
+  [unsubscribe users from channels](/help/unsubscribe-users-from-a-channel).
 * [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)")

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

@@ -162,7 +162,7 @@ how to assign roles and permissions for a class.
   (Recommended: Admins only)
 - Set [who can create channels](/help/configure-who-can-create-channels).
   (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).
+- Set [who can subscribe 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).
   (Recommended: (default) Members for small classes;
@@ -193,7 +193,7 @@ how to assign roles and permissions for a class.
 - Set [who can create channels](/help/configure-who-can-create-channels).
   (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).
+- Set [who can subscribe 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).
   (Recommended: Admins and moderators)
@@ -271,10 +271,10 @@ A few notes:
 ### How to invite users to join
 
 To simplify subscription management, be sure to set the channels
-students and staff should be added to when you create the
+students and staff should be subscribed 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 channels
+separately, so that they can immediately be subscribed to private
-for your class.
+channels for your class.
 
 {!how-to-invite-users-to-join.md!}
 
@@ -284,7 +284,7 @@ to [Getting started with Zulip][getting-started] and the guide to
 
 !!! tip ""
 
-    If you create new channels later on, you can add users
+    If you create new channels later on, you can subscribe users
     [by group][create-user-groups] or copy membership from another
     channel (e.g., from Lecture 5 to Lecture 6).
 
@@ -332,7 +332,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 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 channels as needed.
+  staff][subscribe-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
@@ -352,6 +352,6 @@ 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-channel
-[add-to-channel]: /help/add-or-remove-users-from-a-channel
+[subscribe-to-channel]: /help/subscribe-users-to-a-channel
 [deactivate-user]: /help/deactivate-or-reactivate-a-user#deactivate-a-user
 [getting-started]: /help/getting-started-with-zulip

help/subscribe-users-to-a-channel.md

@@ -1,16 +1,15 @@
-# Add or remove users from a channel
+# Subscribe users to a channel
 
 Organization [administrators](/help/user-roles) can
 [configure](/help/configure-who-can-invite-to-channels#configure-who-can-subscribe-other-users-to-any-channel)
 who can subscribe other users to any channel. Channel administrators can
 configure who can
 [subscribe](/help/configure-who-can-invite-to-channels#configure-who-can-subscribe-other-users-to-a-specific-channel)
-and [unsubscribe](/help/configure-who-can-unsubscribe-others) other users for a
+other users to a particular channel.
-particular channel.
 
 You will only see the options below if you have the required permissions.
 
-## Add users to a channel
+## Subscribe users to a channel
 
 {start_tabs}
 
@@ -29,7 +28,7 @@ You will only see the options below if you have the required permissions.
 
 !!! tip ""
 
-      To add users in bulk, you can copy members from an
+      To subscribe users in bulk, you can copy members from an
       existing channel or [user group](/help/user-groups).
 
 {tab|mobile}
@@ -42,9 +41,9 @@ You will only see the options below if you have the required permissions.
 
 1. Tap **Add subscribers**.
 
-1. Start typing the name of the person you want to add, and
+1. Start typing the name of the person you want to subscribe, and
    select their name from the list of suggestions. You can continue
-   adding as many users as you like.
+   selecting as many users as you'd like to subscribe.
 
 1. Approve by tapping the **checkmark**
    (<img src="/static/images/help/mobile-check-circle-icon.svg" alt="checkmark" class="help-center-icon"/>)
@@ -54,7 +53,7 @@ You will only see the options below if you have the required permissions.
 
 {!automated-dm-channel-subscription.md!}
 
-## Alternate methods to add users to a channel
+## Alternate methods to subscribe users to a channel
 
 ### Via channel settings
 
@@ -81,9 +80,9 @@ You will only see the options below if you have the required permissions.
 
 1. Tap **Add subscribers**.
 
-1. Start typing the name of the person you want to add, and
+1. Start typing the name of the person you want to subscribe, and
    select their name from the list of suggestions. You can continue
-   adding as many users as you like.
+   selecting as many users as you'd like to subscribe.
 
 1. Approve by tapping the **checkmark**
    (<img src="/static/images/help/mobile-check-circle-icon.svg" alt="checkmark" class="help-center-icon"/>)
@@ -99,8 +98,8 @@ 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 channel.
 
-Click the **Subscribe them** button on the banner to add the user to the
+Click the **Subscribe them** button on the banner to subscribe the user to
-channel. You will not see the button if you don't have permission to
+the channel. You will not see the button if you don't have permission to
 subscribe the user.
 
 !!! tip ""
@@ -108,50 +107,13 @@ 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 channel
-
-{start_tabs}
-
-{tab|desktop-web}
-
-{relative|channel|all}
-
-1. Select a channel.
-
-{!select-channel-view-subscribers.md!}
-
-1. Under **Subscribers**, find the user you would like to remove.
-
-1. Click the **Unsubscribe** button in that row.
-
-{!channel-menu-subscribers-tab-tip.md!}
-
-{tab|via-right-sidebar}
-
-{!right-sidebar-view-profile.md!}
-
-1. Select the **Channels** tab.
-
-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 channels.
-
-{end_tabs}
-
 ## Related articles
 
 * [Introduction to channels](/help/introduction-to-channels)
-* [Unsubscribe from a channel][unsubscribe]
+* [Unsubscribe users from a channel](/help/unsubscribe-users-from-a-channel)
 * [Manage a user's channel subscriptions](/help/manage-user-channel-subscriptions)
 * [Restrict channel invitations](/help/configure-who-can-invite-to-channels)
 * [Set default channels for new users](/help/set-default-channels-for-new-users)
 * [User roles](/help/user-roles)
 * [Mention a user or group](/help/mention-a-user-or-group)
 * [View channel subscribers](/help/view-channel-subscribers)
-
-[unsubscribe]: /help/unsubscribe-from-a-channel

help/unsubscribe-users-from-a-channel.md

@@ -0,0 +1,53 @@
+# Unsubscribe users from a channel
+
+Organization [administrators](/help/user-roles) can
+unsubscribe other users from any channel. Channel administrators can
+configure who can
+[unsubscribe](/help/configure-who-can-unsubscribe-others) other users
+from a particular channel.
+
+You will only see the options below if you have the required permissions.
+
+## Unsubscribe users from a channel
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{relative|channel|all}
+
+1. Select a channel.
+
+{!select-channel-view-subscribers.md!}
+
+1. Under **Subscribers**, find the user you would like to unsubscribe.
+
+1. Click the **Unsubscribe** button in that row.
+
+{!channel-menu-subscribers-tab-tip.md!}
+
+{tab|via-right-sidebar}
+
+{!right-sidebar-view-profile.md!}
+
+1. Select the **Channels** tab.
+
+1. Under **Subscribed channels**, find the channel you would like
+   to unsubscribe the user from.
+
+1. Click the **Unsubscribe** button in that row.
+
+!!! tip ""
+
+    This method is useful if you need to unsubscribe one user from multiple channels.
+
+{end_tabs}
+
+## Related articles
+
+* [Introduction to channels](/help/introduction-to-channels)
+* [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)
+* [Subscribe users to a channel](/help/subscribe-users-to-a-channel)
+* [Manage a user's channel subscriptions](/help/manage-user-channel-subscriptions)
+* [User roles](/help/user-roles)
+* [View channel subscribers](/help/view-channel-subscribers)

help/user-roles.md

@@ -25,9 +25,9 @@ You can also manage permissions with [custom user groups](/help/user-groups).
   organizations](/help/moderating-open-organizations). New members automatically
   become full members after a configurable waiting period.
 
-* **Guest**: Can view and send messages in channels they have been added to.
+* **Guest**: Can view and send messages in channels they have been subscribed to.
-  Guests cannot see other channels, unless they have been specifically added to
+  Guests cannot see other channels, unless they have been specifically subscribed
-  the channel. See [guest users documentation](/help/guest-users) for additional
+  to the channel. See [guest users documentation](/help/guest-users) for additional
   details and configuration options.
 
 * **Billing administrator**: The user who upgrades the organization to

help/view-channel-subscribers.md

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

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-channel) to the Zulip
+1. [Subscribe the bot](/help/subscribe-users-to-a-channel) to the Zulip
    stream that will contain the mirror.
 
 1. Inside the virtualenv you created above, run:

templates/zerver/integrations/matrix.md

@@ -29,7 +29,7 @@ you're looking to mirror an IRC channel in particular, we recommend our
 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-channel) to the Zulip
+1. [Subscribe the bot](/help/subscribe-users-to-a-channel) to the Zulip
    stream that will contain the mirror.
 
 1. Inside the virtualenv you created above, run

zerver/lib/url_redirects.py

@@ -88,9 +88,7 @@ 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(
+    URLRedirect("/help/add-or-remove-users-from-a-stream", "/help/subscribe-users-to-a-channel"),
-        "/help/add-or-remove-users-from-a-stream", "/help/add-or-remove-users-from-a-channel"
-    ),
     URLRedirect("/help/pin-a-stream", "/help/pin-a-channel"),
     URLRedirect("/help/change-the-color-of-a-stream", "/help/change-the-color-of-a-channel"),
     URLRedirect("/help/move-content-to-another-stream", "/help/move-content-to-another-channel"),
@@ -127,6 +125,7 @@ HELP_DOCUMENTATION_REDIRECTS: list[URLRedirect] = [
     URLRedirect("/help/quote-and-reply", "/help/quote-or-forward-a-message"),
     URLRedirect("/help/change-a-users-role", "/help/user-roles"),
     URLRedirect("/help/roles-and-permissions", "/help/user-roles"),
+    URLRedirect("/help/add-or-remove-users-from-a-channel", "/help/subscribe-users-to-a-channel"),
 ]
 
 LANDING_PAGE_REDIRECTS = [