help: Move DM search instructions into the section about searching.

help/direct-messages.md

@@ -13,7 +13,7 @@ or unsubscribe people as needed.
 
 {!send-dm.md!}
 
-## View your DMs
+## View your direct message conversations
 
 There are a few different ways to view your DM conversations.
 
@@ -23,6 +23,11 @@ There are a few different ways to view your DM conversations.
 
 {!view-dms-left-sidebar.md!}
 
+!!! tip ""
+
+    To return to the channel list in the left sidebar, click the **back to
+    channels** link above the search box.
+
 {tab|via-right-sidebar}
 
 1. If the [user list](/help/user-list) in the right sidebar is hidden, click the
@@ -36,23 +41,6 @@ There are a few different ways to view your DM conversations.
     You can find a user by typing their name in the **Filter users** box at the
     top of the right sidebar.
 
-{tab|via-search-box}
-
-1. Click the **search** (<i class="search_icon zulip-icon
-   zulip-icon-search"></i>) icon in the top bar to open the [search
-   box](/help/search-for-messages).
-
-1. Start typing a user's name. You'll be able to select DMs with that user
-   from the list of suggestions.
-
-1. *(optional)* Continue to add users via the search box for a group DM
-   conversation.
-
-!!! tip ""
-
-    You can also type `dm-including` in the search box to find all 1:1 and group
-    DM conversations that include a particular user.
-
 {tab|via-compose-box}
 
 1. Click the **New direct message** button at the bottom of the app, or use the
@@ -76,7 +64,30 @@ There are a few different ways to view your DM conversations.
 
 ## Find a direct message conversation
 
-{!find-dm-conversation.md!}
+{start_tabs}
+
+{tab|via-left-sidebar}
+
+{!find-dm-conversation-left-sidebar.md!}
+
+{tab|via-search-box}
+
+1. Click the **search** (<i class="search_icon zulip-icon
+   zulip-icon-search"></i>) icon in the top bar to open the [search
+   box](/help/search-for-messages).
+
+1. Start typing a user's name. You'll be able to select DMs with that user
+   from the list of suggestions.
+
+1. *(optional)* Continue to add users via the search box for a group DM
+   conversation.
+
+!!! tip ""
+
+    You can also type `dm-including` in the search box to find all 1:1 and group
+    DM conversations that include a particular user.
+
+{end_tabs}
 
 ## Go to direct message feed
 

help/include/find-dm-conversation-left-sidebar.md

@@ -0,0 +1,3 @@
+{!view-dms-left-sidebar.md!}
+
+1. Type the name of a participant in the conversation you're looking for.

help/include/find-dm-conversation.md

@@ -1,17 +0,0 @@
-{start_tabs}
-
-{tab|desktop-web}
-
-1. If the **direct messages** section in the left sidebar is collapsed, click on
-   the **direct messages** heading to expand it.
-1. At the bottom of the list of your recent direct messages, click **more
-   conversations**. If you don't see this link, you are already viewing all of
-   your direct message conversations.
-1. Type the name of a participant in the conversation you're looking for.
-
-!!! tip ""
-
-    To return to the channel list in the left sidebar, click the **back to
-    channels** link above the search box.
-
-{end_tabs}

help/include/view-dms-left-sidebar.md

@@ -4,8 +4,3 @@
 1. Click on a recent DM conversation to view it, or click **more
    conversations**. If you don't see this link, then you are already viewing all
    of your direct message conversations.
-
-!!! tip ""
-
-    To return to the channel list in the left sidebar, click the **back to
-    channels** link above the search box.

help/left-sidebar.md

@@ -25,7 +25,13 @@ where clicking on channel links in the left sidebar takes you.
 
 ## Find a direct message conversation
 
-{!find-dm-conversation.md!}
+{start_tabs}
+
+{tab|desktop-web}
+
+{!find-dm-conversation-left-sidebar.md!}
+
+{end_tabs}
 
 ## Find a channel you're subscribed to
 
@@ -64,6 +70,11 @@ information you need in the moment.
 
 {!view-dms-left-sidebar.md!}
 
+!!! tip ""
+
+    To return to the channel list in the left sidebar, click the **back to
+    channels** link above the search box.
+
 {end_tabs}
 
 ### Show all topics in a channel