user docs: Merge add and remove someone from a stream.

templates/zerver/help/about-streams-and-topics.md

@@ -39,14 +39,14 @@ also customize their stream settings; they can:
 
 If enabled by the organization administrators, users can
 [create](/help/create-a-stream) streams and
-[invite](/help/add-or-invite-someone-to-a-stream) other users to a stream.
+[invite](/help/add-or-remove-users-from-a-stream) other users to a stream.
 
 Only organization administrators can modify a stream; they can:
 
 * [rename a stream](/help/rename-a-stream)
 * [delete a stream](/help/delete-a-stream)
 * [change the description of a stream](/help/change-the-stream-description)
-* [remove users from a stream](/help/remove-someone-from-a-stream)
+* [remove users from a stream](/help/add-or-remove-users-from-a-stream#remove-someone-from-a-stream)
 * [change the privacy of a stream](/help/change-the-privacy-of-a-stream)
 
 ## About topics

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

@@ -35,3 +35,27 @@ email address of the user you want to add to the stream.
 1. After you press the **Add** button, the user will be listed in the **Stream
 membership** section, confirming that they have been successfully added to the
 stream.
+
+
+# Remove someone from a stream
+
+{!admin-only.md!}
+
+Zulip allows you to remove users from streams to help manage your Zulip
+team.
+
+{!subscriptions.md!}
+{!filter-streams.md!}
+
+    !!! tip ""
+    {!all-streams.md!}
+
+{!stream-settings-scroll.md!} **Stream membership** section. This section
+shows all users that are subscribed to a particular stream.
+
+3. Click the **Unsubscribe** button to the right of the user you want to
+remove from the stream.
+
+4. After clicking the **Unsubscribe** button, the member will disappear from the
+**Stream membership** section, confirming the removal of the user from the
+stream.

templates/zerver/help/include/sidebar.md

@@ -71,7 +71,7 @@
 * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams)
 * [Create a stream](/help/create-a-stream)
 * [View your stream subscriptions](/help/browse-and-subscribe-to-streams#browse-streams)
-* [Add someone to a stream](/help/add-or-invite-someone-to-a-stream)
+* [Add someone to a stream](/help/add-or-remove-users-from-a-stream)
 * [Change the stream description](/help/change-the-stream-description)
 * [Rename a stream](/help/rename-a-stream)
 * [Unsubscribe from a stream](/help/unsubscribe-from-a-stream)
@@ -153,5 +153,4 @@
 * [Change a stream's description](/help/change-the-stream-description)
 * [Make a private stream public](/help/change-the-privacy-of-a-stream#make-a-private-stream-public)
 * [Make a public stream private](/help/change-the-privacy-of-a-stream)
-* [Add someone to a stream](/help/add-or-invite-someone-to-a-stream)
-* [Remove someone from a stream](/help/remove-someone-from-a-stream)
+* [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream)

templates/zerver/help/remove-someone-from-a-stream.md

@@ -1,22 +0,0 @@
-# Remove someone from a stream
-
-{!admin-only.md!}
-
-Zulip allows you to remove users from streams to help manage your Zulip
-team.
-
-{!subscriptions.md!}
-{!filter-streams.md!}
-
-    !!! tip ""
-    {!all-streams.md!}
-
-{!stream-settings-scroll.md!} **Stream membership** section. This section
-shows all users that are subscribed to a particular stream.
-
-3. Click the **Unsubscribe** button to the right of the user you want to
-remove from the stream.
-
-4. After clicking the **Unsubscribe** button, the member will disappear from the
-**Stream membership** section, confirming the removal of the user from the
-stream.