From 922d40fed4b7f6bb0aafe327600825f9680ce0e7 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Tue, 26 Jun 2012 23:17:33 +0000
Subject: MFV: less v449.

---
 contrib/less/less.hlp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'contrib/less/less.hlp')

diff --git a/contrib/less/less.hlp b/contrib/less/less.hlp
index 84d951f..1194a63 100644
--- a/contrib/less/less.hlp
+++ b/contrib/less/less.hlp
@@ -3,6 +3,7 @@
 
       Commands marked with * may be preceded by a number, _N.
       Notes in parentheses indicate the behavior if _N is given.
+      A key preceded by a carat indicates the Ctrl key; thus ^K is ctrl-K.
 
   h  H                 Display this help.
   q  :q  Q  :Q  ZZ     Exit.
@@ -40,7 +41,7 @@
   ESC-u                Undo (toggle) search highlighting.
   &_p_a_t_t_e_r_n          *  Display only matching lines
         ---------------------------------------------------
-        Search patterns may be modified by one or more of:
+        A search pattern may be preceded by one or more of:
         ^N or !  Search for NON-matching lines.
         ^E or *  Search multiple files (pass thru END OF FILE).
         ^F or @  Start search at FIRST file (for /) or last file (for ?).
@@ -111,9 +112,9 @@
   -?  ........  --help
                   Display help (from command line).
   -a  ........  --search-skip-screen
-                  Forward search skips current screen.
+                  Search skips current screen.
   -A  ........  --SEARCH-SKIP-SCREEN
-                  Forward search always skips target line.
+                  Search starts just after target line.
   -b [_N]  ....  --buffers=[_N]
                   Number of buffers.
   -B  ........  --auto-buffers
@@ -169,7 +170,7 @@
   -s  ........  --squeeze-blank-lines
                   Squeeze multiple blank lines.
   -S  ........  --chop-long-lines
-                  Chop long lines.
+                  Chop (truncate) long lines rather than wrapping.
   -t [_t_a_g]  ..  --tag=[_t_a_g]
                   Find a tag.
   -T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e]
@@ -186,8 +187,6 @@
                   Set tab stops.
   -X  ........  --no-init
                   Don't use termcap init/deinit strings.
-                --no-keypad
-                  Don't use termcap keypad init/deinit strings.
   -y [_N]  ....  --max-forw-scroll=[_N]
                   Forward scroll limit.
   -z [_N]  ....  --window=[_N]
@@ -199,7 +198,7 @@
   -# [_N]  ....  --shift=[_N]
                   Horizontal scroll amount (0 = one half screen width)
       ........  --no-keypad
-                  Don't send keypad init/deinit sequence.
+                  Don't send termcap keypad init/deinit strings.
       ........  --follow-name
                   The F command changes files if the input file is renamed.
 
@@ -213,19 +212,19 @@
 
  RightArrow                       ESC-l     Move cursor right one character.
  LeftArrow                        ESC-h     Move cursor left one character.
- CNTL-RightArrow  ESC-RightArrow  ESC-w     Move cursor right one word.
- CNTL-LeftArrow   ESC-LeftArrow   ESC-b     Move cursor left one word.
+ ctrl-RightArrow  ESC-RightArrow  ESC-w     Move cursor right one word.
+ ctrl-LeftArrow   ESC-LeftArrow   ESC-b     Move cursor left one word.
  HOME                             ESC-0     Move cursor to start of line.
  END                              ESC-$     Move cursor to end of line.
  BACKSPACE                                  Delete char to left of cursor.
  DELETE                           ESC-x     Delete char under cursor.
- CNTL-BACKSPACE   ESC-BACKSPACE             Delete word to left of cursor.
- CNTL-DELETE      ESC-DELETE      ESC-X     Delete word under cursor.
- CNTL-U           ESC (MS-DOS only)         Delete entire line.
+ ctrl-BACKSPACE   ESC-BACKSPACE             Delete word to left of cursor.
+ ctrl-DELETE      ESC-DELETE      ESC-X     Delete word under cursor.
+ ctrl-U           ESC (MS-DOS only)         Delete entire line.
  UpArrow                          ESC-k     Retrieve previous command line.
  DownArrow                        ESC-j     Retrieve next command line.
  TAB                                        Complete filename & cycle.
  SHIFT-TAB                        ESC-TAB   Complete filename & reverse cycle.
- CNTL-L                                     Complete filename, list all.
+ ctrl-L                                     Complete filename, list all.
 
 
-- 
cgit v1.1

