help_docs: Update documentation about moving content.

Moves descriptions of notification and subsetting options
when moving content out of the instructions tab blocks
and into descriptive text.

Adds documentation for editing a topic via the message
recipient bar.

Also cleans up a few changes to UI interactions.

Co-authored-by: Alya Abbott <alya@zulip.com>

templates/zerver/help/include/move-content-subset-options.md

@@ -0,0 +1,8 @@
+    - **Change later messages to this topic**, which will move both
+      the selected message and all following messages.
+
+    - **Change only this message topic**, which will only move the
+      selected message.
+
+    - **Change previous and following messages to this topic**, which
+      will move all messages in the topic.

templates/zerver/help/move-content-to-another-stream.md

@@ -1,20 +1,20 @@
 # Move content to another stream
 
-Organization administrators can move topics from one
+Zulip makes it possible to move messages or an entire topic to another stream.
-stream to another, or move a subset of messages to a topic from one
+Organizations can [configure][move-permission-setting] which
-stream to another.
+[roles](/help/roles-and-permissions) have permission to move messages between
+streams.
 
-Organization administrators can
+To help others find moved content, you can have Zulip send automated
-[configure who can edit topics](/help/configure-who-can-edit-topics), or turn off
+notification messages to the source topic, the destination topic, or both. These
-message editing entirely. See the
+notifications include:
-[guide to message and topic editing](/help/configure-message-editing-and-deletion)
+
-for the details on when topic editing is allowed.
+* A link to the source or destination topic.
+* How many messages were moved, or whether the whole topic was moved.
+* Who moved the content.
 
 ## Move a topic to another stream
 
-Organizations can configure which roles have permission to [move
-topics between streams][move-permission-setting].
-
 To move a topic, you must have access to both the source and
 destination streams.
 
@@ -26,12 +26,11 @@ destination streams.
 
 1. Select the destination stream for the topic from the streams dropdown list.
 
-1. (Optional) Change the topic.
+1. (optional) Change the topic.
 
-1. Select whether you want automated notification messages to be sent
+1. Toggle whether automated notification messages should be sent.
-   to the old location for the topic, new location for the topic, or both.
 
-1. Click **Move topic**.
+1. Click **Confirm**.
 
 
 !!! warn ""
@@ -42,13 +41,7 @@ destination streams.
 
 {end_tabs}
 
-## Move message(s) in a topic to another stream
+## Move messages to another stream
-
-Organizations can configure which roles have permission to [move
-topics between streams][move-permission-setting].
-
-Roles that have permission can also move only a subset of messages
-from a topic to another stream.
 
 {start_tabs}
 
@@ -60,15 +53,13 @@ from a topic to another stream.
 
 1. Select the destination stream for the message from the streams dropdown list.
 
-1. (Optional) Change the topic.
+1. (optional) Change the topic.
 
-1. A dropdown with three options will appear to the right:
+1. Toggle whether automated notification messages should be sent.
-**Change only this message topic**, **Change later messages to this topic**, and
-**Change previous and following messages to this topic**. Pick the appropriate
-option.
 
-1. Select whether you want automated notification messages to be sent
+1. From the dropdown menu, select which messages to move:
-   to the old location for the topic, new location for the topic, or both.
+
+{!move-content-subset-options.md!}
 
 1. Click **Save**.
 
@@ -95,5 +86,6 @@ will only be accessible to users who both:
 
 * [Rename a topic](/help/rename-a-topic)
 * [Move content to another topic](/help/move-content-to-another-topic)
+* [Configure message editing and deletion](/help/configure-message-editing-and-deletion)
 
 [move-permission-setting]: /help/configure-message-editing-and-deletion#configure-who-can-move-topics-between-streams

templates/zerver/help/move-content-to-another-topic.md

@@ -1,22 +1,22 @@
 # Move content to another topic
 
-By default, any user can change the topic of any message. This is useful for
+Zulip makes it possible to move messages between topics. This is
-keeping messages organized even if some users are still learning how to use
+useful for keeping messages organized when there is a digression, or
-topics effectively.
+the discussion shifts from the original topic. You can also [rename a
+topic](/help/rename-a-topic).
 
-Zulip's [permanent links to messages in
+When messages are moved, Zulip's [permanent links to messages in
 context](/help/link-to-a-message-or-conversation#get-a-link-to-a-specific-message)
 will automatically redirect to the new location of the message. [Muted
-topics](/help/mute-a-topic) are automatically migrated when all messages
+topics](/help/mute-a-topic) are automatically migrated when all messages after a
-after a certain point are moved or an entire topic is renamed.
+certain point are moved, or an entire topic is moved.
 
-Organization administrators can
+Organizations can [configure](/help/configure-who-can-edit-topics) which
-[configure who can edit topics](/help/configure-who-can-edit-topics), or turn off
+[roles](/help/roles-and-permissions) have permission to modify topics. See the
-message editing entirely. See the
 [guide to message and topic editing](/help/configure-message-editing-and-deletion)
 for the details on when topic editing is allowed.
 
-### Move a message to another topic
+## Move messages to another topic
 
 {start_tabs}
 
@@ -26,14 +26,13 @@ for the details on when topic editing is allowed.
    or simply **Edit**. If it's called **View source**, then you are not
    allowed to edit the topic of that message.
 
-2. Set the destination topic.
+1. Set the destination topic.
 
-3. A dropdown with three options will appear to the right:
+1. From the dropdown menu, select which messages to move:
-**Change only this message topic**, **Change later messages to this topic**, and
-**Change previous and following messages to this topic**. Pick the appropriate
-option.
 
-4. Click **Save**.
+{!move-content-subset-options.md!}
+
+1. Click **Save**.
 
 {end_tabs}
 
@@ -41,3 +40,4 @@ option.
 
 * [Rename a topic](/help/rename-a-topic)
 * [Move content to another stream](/help/move-content-to-another-stream)
+* [Configure message editing and deletion](/help/configure-message-editing-and-deletion)

templates/zerver/help/rename-a-topic.md

@@ -1,24 +1,37 @@
 # Rename a topic
 
-By default, any user can rename any topic within a stream, and change the
+Zulip makes it possible to rename topics. This is useful for keeping messages
-topic of any message. This is useful for keeping messages organized even
+organized, even if some users are still learning how to use topics effectively.
-if some users are still learning how to use topics effectively.
+You can also [move content to another
+topic](/help/move-content-to-another-topic).
 
-Organization administrators can additionally
+When a topic is renamed, Zulip's [permanent links to messages in
-[move topics](/help/move-content-to-another-stream#move-a-topic-to-another-stream)
+context](/help/link-to-a-message-or-conversation#get-a-link-to-a-specific-message)
-from one stream to another, or
+will automatically redirect to the new location of the message. [Muted
-[move a subset of messages](/help/move-content-to-another-stream#move-messages-in-a-topic-to-another-stream)
+topics](/help/mute-a-topic) are automatically migrated when a topic is renamed.
-to a topic from one stream to another.
 
-Organization administrators can also
+Organizations can [configure](/help/configure-who-can-edit-topics) which
-[configure who can edit topics](/help/configure-who-can-edit-topics),
+[roles](/help/roles-and-permissions) have permission to rename topics. See the
-[move topics](/help/configure-message-editing-and-deletion#configure-who-can-move-topics-between-streams),
-or turn off message editing entirely. See the
 [guide to message and topic editing](/help/configure-message-editing-and-deletion)
 for the details on when topic editing is allowed.
 
 ## Rename a topic
 
+### Via the message recipient bar
+
+{start_tabs}
+
+1. Click on the <i class="fa fa-pencil"></i> icon in the message recipient bar.
+
+1. Edit the topic name.
+
+1. Click the **✔** to save your changes.
+
+{end_tabs}
+
+
+### Via a message (alternate method)
+
 {start_tabs}
 
 {!message-actions-menu.md!}
@@ -29,8 +42,7 @@ for the details on when topic editing is allowed.
 
 1. Edit the topic.
 
-1. Pick **Change previous and following messages to this topic** from the
+1. From the dropdown menu, select **Change previous and following messages to this topic**.
-   dropdown to the right.
 
 1. Click **Save**.