From 5df5f6c125dcc17ac4ed0b8c4d951083c6447231 Mon Sep 17 00:00:00 2001
From: palashb01 <palash.baderia@outlook.com>
Date: Fri, 28 Jul 2023 05:24:07 +0530
Subject: [PATCH] help: Update message edit history documentation.

Co-authored-by: Tim Abbott <tabbott@zulip.com>
---
 help/keyboard-shortcuts.md           |  4 ++++
 help/view-a-messages-edit-history.md | 21 ++++++---------------
 web/templates/keyboard_shortcuts.hbs |  8 ++++----
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/help/keyboard-shortcuts.md b/help/keyboard-shortcuts.md
index 11adb9befd..520350e1a5 100644
--- a/help/keyboard-shortcuts.md
+++ b/help/keyboard-shortcuts.md
@@ -150,6 +150,10 @@ in the Zulip app to add more to your repertoire as needed.
 
 * **Move message and (optionally) other messages in the same topic**: <kbd>M</kbd>
 
+* **View message edit and move history**: <kbd>Shift</kbd> +
+  <kbd>H</kbd>. Message edit history [must be
+  enabled](/help/disable-message-edit-history).
+
 * **Star message**: <kbd>Ctrl</kbd> + <kbd>S</kbd>
 
 * **React with <img alt=":thumbs_up:" class="emoji"
diff --git a/help/view-a-messages-edit-history.md b/help/view-a-messages-edit-history.md
index fdf4558139..830c9ed4e4 100644
--- a/help/view-a-messages-edit-history.md
+++ b/help/view-a-messages-edit-history.md
@@ -16,23 +16,14 @@ Organization administrators can
 
 {start_tabs}
 
-1. Click on the message's **EDITED** or **MOVED** label.
+1. Click on the message's **EDITED** or **MOVED** label shown next to
+   a user's name or to the left of each message in the message feed.
 
-{end_tabs}
+!!! tip ""
 
-### Via the message menu (alternate method)
-
-{start_tabs}
-
-{!message-actions-menu.md!}
-
-1. Click **View edit history**.
-
-!!! warn ""
-
-    You will only see **View edit history** in the dropdown
-    menu if the message has been moved or edited, and
-    message edit history is enabled in the organization.
+    In organizations where message edit history is disabled, you will
+    never see a **MOVED** label; messages that have been moved will be
+    marked as **EDITED** just like those whose content has been edited.
 
 {end_tabs}
 
diff --git a/web/templates/keyboard_shortcuts.hbs b/web/templates/keyboard_shortcuts.hbs
index 0f4bc841dc..607a8fb3a1 100644
--- a/web/templates/keyboard_shortcuts.hbs
+++ b/web/templates/keyboard_shortcuts.hbs
@@ -228,6 +228,10 @@
                     <td class="definition">{{t 'Move messages or topic' }}</td>
                     <td><span class="hotkey"><kbd>M</kbd></span></td>
                 </tr>
+                <tr>
+                    <td class="definition">{{t 'View edit and move history' }}</td>
+                    <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>H</kbd></span></td>
+                </tr>
                 <tr>
                     <td class="definition">{{t 'Star selected message' }}</td>
                     <td><span class="hotkey"><kbd>Ctrl</kbd> + <kbd>S</kbd></span></td>
@@ -258,10 +262,6 @@
                     <td class="definition">{{t 'Toggle topic mute' }}</td>
                     <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>M</kbd></span></td>
                 </tr>
-                <tr>
-                    <td class="definition">{{t 'View edit history' }}</td>
-                    <td><span class="hotkey"><kbd>Shift</kbd> + <kbd>H</kbd></span></td>
-                </tr>
             </table>
         </div>
         <div>