diff --git a/help/add-or-remove-users-from-a-stream.md b/help/add-or-remove-users-from-a-stream.md index 95917eeebb..5655ee6bd8 100644 --- a/help/add-or-remove-users-from-a-stream.md +++ b/help/add-or-remove-users-from-a-stream.md @@ -3,7 +3,7 @@ By default, anyone (other than guests) subscribed to a stream can add users to that stream. Additionally, anyone (other than guests) can add users to a public stream, whether or not they are subscribed to the -stream. Anyone can always [unsubscribe themselves from a stream](/help/unsubscribe-from-a-stream). +stream. Anyone can always [unsubscribe themselves from a channel][unsubscribe]. Organization administrators can also unsubscribe *other* users from any stream, including streams the admin is not subscribed to. They can also configure which @@ -149,10 +149,12 @@ subscribe the user. ## Related articles * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) -* [Unsubscribe from a stream](/help/unsubscribe-from-a-stream) +* [Unsubscribe from a channel][unsubscribe] * [Manage a user's stream subscriptions](/help/manage-user-stream-subscriptions) * [Restrict stream invitation](/help/configure-who-can-invite-to-streams) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Roles and permissions](/help/roles-and-permissions) * [Mention a user or group](/help/mention-a-user-or-group) * [View stream subscribers](/help/view-stream-subscribers) + +[unsubscribe]: /help/unsubscribe-from-a-channel diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index c8a71e7af3..8ed910b79d 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -127,7 +127,7 @@ ## Streams & topics * [Channels and topics](/help/channels-and-topics) * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) -* [Unsubscribe from a stream](/help/unsubscribe-from-a-stream) +* [Unsubscribe from a channel](/help/unsubscribe-from-a-channel) * [Create a channel](/help/create-a-channel) * [View stream subscribers](/help/view-stream-subscribers) * [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream) diff --git a/help/manage-user-stream-subscriptions.md b/help/manage-user-stream-subscriptions.md index 5fbe068a39..6f96531c03 100644 --- a/help/manage-user-stream-subscriptions.md +++ b/help/manage-user-stream-subscriptions.md @@ -55,7 +55,7 @@ other users to a stream][configure-invites]. {!admin-only.md!} Anyone can always [unsubscribe themselves from a -stream](/help/unsubscribe-from-a-stream). +channel](/help/unsubscribe-from-a-channel). {start_tabs} @@ -90,7 +90,7 @@ stream](/help/unsubscribe-from-a-stream). * [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) -* [Unsubscribe from a stream](/help/unsubscribe-from-a-stream) +* [Unsubscribe from a channel](/help/unsubscribe-from-a-channel) * [View stream subscribers](/help/view-stream-subscribers) [configure-invites]: /help/configure-who-can-invite-to-streams diff --git a/help/unsubscribe-from-a-stream.md b/help/unsubscribe-from-a-channel.md similarity index 64% rename from help/unsubscribe-from-a-stream.md rename to help/unsubscribe-from-a-channel.md index e5cb5f20e6..3d7f894416 100644 --- a/help/unsubscribe-from-a-stream.md +++ b/help/unsubscribe-from-a-channel.md @@ -1,6 +1,6 @@ -# Unsubscribe from a stream +# Unsubscribe from a channel -You can always unsubscribe from any stream in Zulip. +You can always unsubscribe from any channel in Zulip. {start_tabs} @@ -20,9 +20,9 @@ You can always unsubscribe from any stream in Zulip. {end_tabs} -## Alternate methods to unsubscribe from a stream +## Alternate methods to unsubscribe from a channel -### Via subscribed streams +### Via subscribed channels {start_tabs} @@ -32,7 +32,7 @@ You can always unsubscribe from any stream in Zulip. 1. Click the **checkmark** (checkmark) - icon to the left of a stream to unsubscribe from it. + icon to the left of a channel to unsubscribe from it. {tab|mobile} @@ -40,16 +40,16 @@ You can always unsubscribe from any stream in Zulip. 1. Tap the **checkmark** (checkmark) - icon to the right of a stream to unsubscribe from it. + icon to the right of a channel to unsubscribe from it. !!! tip "" - You can also press and hold a stream until the long-press menu appears, and + You can also press and hold a channel until the long-press menu appears, and tap **Unsubscribe**. {end_tabs} -### Via stream settings +### Via channel settings {start_tabs} @@ -57,20 +57,20 @@ You can always unsubscribe from any stream in Zulip. {!stream-actions.md!} -1. Click **Stream settings**. +1. Click **Channel settings**. -1. Click **Unsubscribe** near the top right corner of the stream settings panel. +1. Click **Unsubscribe** near the top right corner of the channel settings panel. !!! keyboard_tip "" You can also use Shift + S to unsubscribe from the - selected stream. + selected channel. {tab|mobile} {!stream-long-press-menu.md!} -1. Tap **Stream settings**. +1. Tap **Channel settings**. 1. Tap **Unsubscribe**. diff --git a/help/view-stream-subscribers.md b/help/view-stream-subscribers.md index 628197ce64..5639a30f6e 100644 --- a/help/view-stream-subscribers.md +++ b/help/view-stream-subscribers.md @@ -38,7 +38,7 @@ unsubscribe other users to streams. ## Related articles * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) -* [Unsubscribe from a stream](/help/unsubscribe-from-a-stream) +* [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) * [Set default streams for new users](/help/set-default-streams-for-new-users) diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index e2b7999868..bd8c1a6dc3 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -89,6 +89,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect("/help/create-a-stream", "/help/create-a-channel"), URLRedirect("/help/message-a-stream-by-email", "/help/message-a-channel-by-email"), URLRedirect("/help/browse-and-subscribe-to-streams", "/help/browse-and-subscribe-to-channels"), + URLRedirect("/help/unsubscribe-from-a-stream", "/help/unsubscribe-from-a-channel"), ] LANDING_PAGE_REDIRECTS = [