help: Rename and redirect browse-and-subscribe-to-streams for channel.

api_docs/construct-narrow.md

@@ -147,4 +147,4 @@ user 1234, and user 5678, the correct JSON-encoded query is:
 ```
 
 [view-profile]: /help/view-someones-profile
-[browse-streams]: /help/browse-and-subscribe-to-streams
+[browse-streams]: /help/browse-and-subscribe-to-channels

api_docs/incoming-webhooks-overview.md

@@ -212,7 +212,7 @@ For example, `test*` matches every event that starts with `test`.
     For a list of supported events, see a specific [integration's
     documentation](/integrations) page.
 
-[browse-streams]: /help/browse-and-subscribe-to-streams
+[browse-streams]: /help/browse-and-subscribe-to-channels
 [add-bot]: /help/add-a-bot-or-integration
 [url-encoder]: https://www.urlencoder.org/
 

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

@@ -148,7 +148,7 @@ subscribe the user.
 
 ## Related articles
 
-* [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
+* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
 * [Unsubscribe from a stream](/help/unsubscribe-from-a-stream)
 * [Manage a user's stream subscriptions](/help/manage-user-stream-subscriptions)
 * [Restrict stream invitation](/help/configure-who-can-invite-to-streams)

help/browse-and-subscribe-to-channels.md

@@ -1,4 +1,4 @@
-# Browse and subscribe to streams
+# Browse and subscribe to channels
 
 {start_tabs}
 
@@ -6,16 +6,16 @@
 
 {relative|stream|all}
 
-1. Scroll through the list of streams. You can use the **search box** near the
-   top of the menu to filter the list by stream name or description.
+1. Scroll through the list of channels. You can use the **search box** near the
+   top of the menu to filter the list by channel name or description.
 
 1. Click the **plus**
    (<img src="/static/images/help/desktop-web-plus-icon.svg" alt="plus" class="help-center-icon"/>)
-   icon to the left of a stream to subscribe to it.
+   icon to the left of a channel to subscribe to it.
 
 !!! tip ""
 
-    You can click on the icons in the upper right to sort the list of streams
+    You can click on the icons in the upper right to sort the list of channels
     **by name** (<i class="fa fa-sort-alpha-asc"></i>),
     **by number of subscribers** (<i class="fa fa-user-o"></i>), or
     **by estimated weekly traffic** (<i class="fa fa-bar-chart"></i>).
@@ -24,15 +24,15 @@
 
 {!mobile-all-streams-view.md!}
 
-1. Scroll through the list of streams.
+1. Scroll through the list of channels.
 
 1. Tap the **plus**
    (<img src="/static/images/help/mobile-plus-icon.svg" alt="plus" class="help-center-icon"/>)
-   icon to the right of a stream to subscribe to it.
+   icon to the right of a channel to subscribe to 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 **Subscribe**.
 
 {end_tabs}

help/create-a-channel.md

@@ -47,4 +47,4 @@ There are several parameters you can set while creating a channel. All but
 * [Create channels for a new organization](/help/create-channels)
 * [Stream permissions](/help/stream-permissions)
 * [Set default streams for new users](/help/set-default-streams-for-new-users)
-* [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
+* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)

help/inbox.md

@@ -54,4 +54,4 @@ In the web app, you can control whether the **Inbox** includes all topics, just
 * [Combined feed](/help/combined-feed)
 * [Mute or unmute a stream](/help/mute-a-stream)
 * [Mute or unmute a topic](/help/mute-a-topic)
-* [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
+* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)

help/include/set-up-your-account.md

@@ -15,7 +15,7 @@
   [pick your favorite emoji theme](/help/emoji-and-emoticons#change-your-emoji-set),
   [change your language](/help/change-your-language), and make other tweaks to your Zulip experience.
 
-- [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams).
+- [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels).
 
 - Decide whether you want <kbd>Enter</kbd> [to send your message
   or add a new line](/help/mastering-the-compose-box#toggle-between-ctrl-enter-and-enter-to-send-a-message).

help/include/sidebar_index.md

@@ -126,7 +126,7 @@
 
 ## Streams & topics
 * [Channels and topics](/help/channels-and-topics)
-* [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
+* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
 * [Unsubscribe from a stream](/help/unsubscribe-from-a-stream)
 * [Create a channel](/help/create-a-channel)
 * [View stream subscribers](/help/view-stream-subscribers)

help/marking-messages-as-unread.md

@@ -10,7 +10,7 @@ There are many ways to use this feature, including:
   action items, mark messages as unread to return to them later.
 
 - You can mark messages as unread when you [subscribe to a
-  stream](/help/browse-and-subscribe-to-streams). This makes it
+  channel](/help/browse-and-subscribe-to-channels). This makes it
   [convenient](/help/reading-strategies) to review all the recent
   conversations in that stream.
 

help/pin-a-stream.md

@@ -72,5 +72,5 @@ which is especially handy if you are subscribed to a large number of streams.
 
 ## Related articles
 
-* [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
+* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
 * [Mute or unmute a stream](/help/mute-a-stream)

help/using-zulip-via-email.md

@@ -31,7 +31,7 @@ If you want to interact with Zulip primarily (or entirely) via your email client
 
 {start_tabs}
 
-1. [Subscribe](/help/browse-and-subscribe-to-streams) to any channels you are
+1. [Subscribe](/help/browse-and-subscribe-to-channels) to any channels you are
 interested in.
 
 {settings_tab|notifications}

help/view-stream-subscribers.md

@@ -37,7 +37,7 @@ unsubscribe other users to streams.
 
 ## Related articles
 
-* [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
+* [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels)
 * [Unsubscribe from a stream](/help/unsubscribe-from-a-stream)
 * [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)

zerver/lib/url_redirects.py

@@ -88,6 +88,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
     URLRedirect("/help/create-streams", "/help/create-channels"),
     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"),
 ]
 
 LANDING_PAGE_REDIRECTS = [