help: Reorganize keyboard shortcuts documentation.

Also remove the unnecessary term "narrow".

help/keyboard-shortcuts.md

@@ -6,8 +6,9 @@ and use the convenient [**keyboard shortcuts reference**](#keyboard-shortcuts-re
 in the Zulip app to add more to your repertoire as needed.
 
 * [The basics](#the-basics)
+* [Search](#search)
+* [Scrolling](#scrolling)
 * [Navigation](#navigation)
-* [Narrowing](#narrowing)
 * [Composing messages](#composing-messages)
 * [Message actions](#message-actions)
 * [Drafts](#drafts)
@@ -51,7 +52,7 @@ in the Zulip app to add more to your repertoire as needed.
   until you are in the [home view](/help/configure-home-view).
 
 [disable-escape]: /help/configure-home-view#configure-whether-esc-navigates-to-the-home-view
-## Navigation
+## Search
 
 * **Search messages**: <kbd>/</kbd> or <kbd>Ctrl</kbd> + <kbd>K</kbd>
 
@@ -59,6 +60,8 @@ in the Zulip app to add more to your repertoire as needed.
 
 * **Search people**: <kbd>W</kbd>
 
+## Scrolling
+
 * **Last message**: <kbd>End</kbd> or <kbd>Shift</kbd> + <kbd>G</kbd> —
   Also marks all messages in the current view as read.
 
@@ -73,32 +76,32 @@ in the Zulip app to add more to your repertoire as needed.
 * **Scroll down**: <kbd>PgDn</kbd>, <kbd>Shift</kbd> + <kbd>J</kbd>, or
   <kbd>Spacebar</kbd>
 
+## Navigation
+
 * **Go back through viewing history**: <kbd data-mac-key="⌘">Alt</kbd> +
   <kbd class="arrow-key">←</kbd>
 
 * **Go forward through viewing history**: <kbd data-mac-key="⌘">Alt</kbd> +
   <kbd class="arrow-key">→</kbd>
 
-## Narrowing
+* **Go to next unread topic**: <kbd>N</kbd>
 
-* **Narrow to next unread topic**: <kbd>N</kbd>
+* **Go to next unread direct message**: <kbd>P</kbd>
 
-* **Narrow to next unread direct message**: <kbd>P</kbd>
+* **Go to topic or DM conversation**: <kbd>S</kbd>
 
-* **Narrow to topic or DM conversation**: <kbd>S</kbd>
+* **Go to stream from topic view**: <kbd>S</kbd>
 
-* **Narrow to stream from topic view**: <kbd>S</kbd>
-
-* **Narrow to all direct messages**: <kbd>Shift</kbd> + <kbd>P</kbd>
+* **Go to all direct messages**: <kbd>Shift</kbd> + <kbd>P</kbd>
 
 * **Zoom to message in conversation context**: <kbd>Z</kbd> — This view does not mark messages as read.
 
-* **Cycle between stream narrows**: <kbd>Shift</kbd> + <kbd>A</kbd>
+* **Cycle between stream views**: <kbd>Shift</kbd> + <kbd>A</kbd>
   (previous) and <kbd>Shift</kbd> + <kbd>D</kbd> (next)
 
-* **Narrow to All messages**: <kbd>A</kbd> — Shows all unmuted messages.
+* **Go to All messages**: <kbd>A</kbd> — Shows all unmuted messages.
 
-* **Narrow to current compose box recipient**: <kbd>Ctrl</kbd> + <kbd>.</kbd>
+* **Go to the conversation you are composing to**: <kbd>Ctrl</kbd> + <kbd>.</kbd>
 
 ## Composing messages
 

web/templates/keyboard_shortcuts.hbs

@@ -66,7 +66,7 @@
             <table class="hotkeys_table table table-striped table-bordered">
                 <thead>
                     <tr>
-                        <th colspan="2">{{t 'Navigation' }}</th>
+                        <th colspan="2">{{t 'Search' }}</th>
                     </tr>
                 </thead>
                 <tr>
@@ -81,6 +81,15 @@
                     <td class="definition">{{t 'Search people' }}</td>
                     <td><span class="hotkey"><kbd>W</kbd></span></td>
                 </tr>
+            </table>
+        </div>
+        <div>
+            <table class="hotkeys_table table table-striped table-bordered">
+                <thead>
+                    <tr>
+                        <th colspan="2">{{t 'Scrolling' }}</th>
+                    </tr>
+                </thead>
                 <tr>
                     <td class="definition">{{t 'Previous message' }}</td>
                     <td><span class="hotkey"><kbd class="arrow-key">↑</kbd> or <kbd>K</kbd></span></td>
@@ -105,6 +114,15 @@
                     <td class="definition">{{t 'First message' }}</td>
                     <td><span class="hotkey"><kbd>Home</kbd></span></td>
                 </tr>
+            </table>
+        </div>
+        <div>
+            <table class="hotkeys_table table table-striped table-bordered">
+                <thead>
+                    <tr>
+                        <th colspan="2">{{t 'Navigation' }}</th>
+                    </tr>
+                </thead>
                 <tr>
                     <td class="definition">{{t 'Go back through viewing history' }}</td>
                     <td><span class="hotkey"><kbd data-mac-key="⌘">Alt</kbd> + <kbd class="arrow-key">←</kbd></span></td>
@@ -113,6 +131,42 @@
                     <td class="definition">{{t 'Go forward through viewing history' }}</td>
                     <td><span class="hotkey"><kbd data-mac-key="⌘">Alt</kbd> + <kbd class="arrow-key">→</kbd></span></td>
                 </tr>
+                <tr>
+                    <td class="definition">{{t 'Go to topic or DM conversation' }}</td>
+                    <td><span class="hotkey"><kbd>S</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Go to stream from topic view' }}</td>
+                    <td><span class="hotkey"><kbd>S</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Go to all direct messages' }}</td>
+                    <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>P</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Zoom to message in conversation context' }}</td>
+                    <td><span class="hotkey"><kbd>Z</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Go to next unread topic' }}</td>
+                    <td><span class="hotkey"><kbd>N</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Go to next unread direct message' }}</td>
+                    <td><span class="hotkey"><kbd>P</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Cycle between stream views' }}</td>
+                    <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>A</kbd> or <kbd>Shift</kbd> + <kbd>D</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Go to all unmuted messages' }}</td>
+                    <td><span class="hotkey"><kbd>A</kbd></span></td>
+                </tr>
+                <tr>
+                    <td class="definition">{{t 'Go to the conversation you are composing to' }}</td>
+                    <td><span class="hotkey"><kbd>Ctrl</kbd> + <kbd>.</kbd></span></td>
+                </tr>
             </table>
         </div>
         <div>
@@ -164,51 +218,6 @@
                 </tr>
             </table>
         </div>
-        <div>
-            <table class="hotkeys_table table table-striped table-bordered">
-                <thead>
-                    <tr>
-                        <th colspan="2">{{t 'Narrowing' }}</th>
-                    </tr>
-                </thead>
-                <tr>
-                    <td class="definition">{{t 'Narrow to topic or DM conversation' }}</td>
-                    <td><span class="hotkey"><kbd>S</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Narrow to stream from topic view' }}</td>
-                    <td><span class="hotkey"><kbd>S</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Narrow to all direct messages' }}</td>
-                    <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>P</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Zoom to message in conversation context' }}</td>
-                    <td><span class="hotkey"><kbd>Z</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Narrow to next unread topic' }}</td>
-                    <td><span class="hotkey"><kbd>N</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Narrow to next unread direct message' }}</td>
-                    <td><span class="hotkey"><kbd>P</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Cycle between stream narrows' }}</td>
-                    <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>A</kbd> or <kbd>Shift</kbd> + <kbd>D</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Narrow to all unmuted messages' }}</td>
-                    <td><span class="hotkey"><kbd>A</kbd></span></td>
-                </tr>
-                <tr>
-                    <td class="definition">{{t 'Narrow to current compose box recipient' }}</td>
-                    <td><span class="hotkey"><kbd>Ctrl</kbd> + <kbd>.</kbd></span></td>
-                </tr>
-            </table>
-        </div>
         <div>
             <table class="hotkeys_table table table-striped table-bordered">
                 <thead>