Rearrange help

diff --git a/README.md b/README.md
index b575a110a76f7e6ad6048a650c686b0456043d86..008db286115d73020b77624ac764dfe0ed35df1f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -208,10 +208,10 @@ optional args:
 ```
             Key  Function
               ----
-       ↑, k, ^P  Prev entry
-       ↓, j, ^N  Next entry
-       PgUp, ^U  Scroll half page up
-       PgDn, ^D  Scroll half page down
+       ↑, k, ^P  Up
+       ↓, j, ^N  Down
+       PgUp, ^U  Scroll up
+       PgDn, ^D  Scroll down
  Home, g, ^, ^A  First entry
   End, G, $, ^E  Last entry
     →, ↵, l, ^M  Open file/enter dir
@@ -219,19 +219,17 @@ optional args:
              ^O  Open with...
      Insert, ^I  Toggle nav-as-you-type
               ~  Go HOME
-              &  Start-up dir
+              &  Start dir
               -  Last visited dir
               /  Filter entries
-             ^/  Open desktop search app
-              .  Toggle show . files
+              .  Toggle show hidden
              ^B  Bookmark prompt
               b  Pin current dir
              ^V  Go to pinned dir
-              c  Change dir prompt
+              c  cd prompt
               d  Toggle detail view
               D  File details
-              m  Brief media info
-              M  Full media info
+           m, M  Brief/full media info
               n  Create new
              ^R  Rename entry
               r  Open dir in vidir
@@ -241,9 +239,8 @@ optional args:
               t  Toggle sort by mtime
           !, ^]  Spawn SHELL in dir
               R  Run custom script
-              e  Edit entry in EDITOR
-              o  Open DE filemanager
-              p  Open entry in PAGER
+              e  Edit in EDITOR
+              p  Open in PAGER
               f  Archive entry
               F  List archive
              ^F  Extract archive
@@ -253,6 +250,8 @@ optional args:
              ^T  Toggle path quote
              ^L  Redraw, clear prompt
               L  Lock terminal
+              o  Open DE filemanager
+             ^/  Open DE search app
               ?  Help, settings
           Q, ^G  Quit and cd
           q, ^X  Quit

diff --git a/nnn.c b/nnn.c
index fe24e415f3d6acd4f2782d471f5358e3efd6a9b0..e2d8ae77e72acd2cbfb329b234e142fb0c42b9da 100644 (file)
--- a/nnn.c
+++ b/nnn.c
@@ -1933,10 +1933,10 @@ static int show_help(char *path)
        static char helpstr[] = {
           "cKey  Desc\n"
             "e----\n"
-      "7↑, k, ^P  Prev entry\n"
-      "7↓, j, ^N  Next entry\n"
-      "7PgUp, ^U  Scroll half page up\n"
-      "7PgDn, ^D  Scroll half page down\n"
+      "7↑, k, ^P  Up\n"
+      "7↓, j, ^N  Down\n"
+      "7PgUp, ^U  Scroll up\n"
+      "7PgDn, ^D  Scroll down\n"
 "1Home, g, ^, ^A  First entry\n"
  "2End, G, $, ^E  Last entry\n"
    "4→, ↵, l, ^M  Open file/enter dir\n"
@@ -1944,19 +1944,17 @@ static int show_help(char *path)
            "d^O  Open with...\n"
     "5Insert, ^I  Toggle nav-as-you-type\n"
             "e~  Go HOME\n"
-            "e&  Start-up dir\n"
+            "e&  Start dir\n"
             "e-  Last visited dir\n"
             "e/  Filter entries\n"
-           "d^/  Open desktop search app\n"
-            "e.  Toggle show . files\n"
+            "e.  Toggle show hidden\n"
            "d^B  Bookmark prompt\n"
             "eb  Pin current dir\n"
            "d^V  Go to pinned dir\n"
-            "ec  Change dir prompt\n"
+            "ec  cd prompt\n"
             "ed  Toggle detail view\n"
             "eD  File details\n"
-            "em  Brief media info\n"
-            "eM  Full media info\n"
+         "bm, M  Brief/full media info\n"
             "en  Create new\n"
            "d^R  Rename entry\n"
             "er  Open dir in vidir\n"
@@ -1966,9 +1964,8 @@ static int show_help(char *path)
             "et  Toggle sort by mtime\n"
         "a!, ^]  Spawn SHELL in dir\n"
             "eR  Run custom script\n"
-            "ee  Edit entry in EDITOR\n"
-            "eo  Open DE filemanager\n"
-            "ep  Open entry in PAGER\n"
+            "ee  Edit in EDITOR\n"
+            "ep  Open in PAGER\n"
             "ef  Archive entry\n"
             "eF  List archive\n"
            "d^F  Extract archive\n"
@@ -1978,6 +1975,8 @@ static int show_help(char *path)
            "d^T  Toggle path quote\n"
            "d^L  Redraw, clear prompt\n"
             "eL  Lock terminal\n"
+            "eo  Open DE filemanager\n"
+           "d^/  Open DE search app\n"
             "e?  Help, settings\n"
         "aQ, ^G  Quit and cd\n"
         "aq, ^X  Quit\n\n"};