- more no longer accepts random less commands

- history trim
- sundry

diff from evan silberman;
tweaked/ok by schwarze and deraadt

2 files changed, 30 insertions, 34 deletions

diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index 8e6971c2433..20acf5fe2d9 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.55 2019/07/20 13:21:09 schwarze Exp $
+.\"	$OpenBSD: less.1,v 1.56 2019/08/20 11:34:18 jmc Exp $
 .\"
 .\" Copyright (C) 1984-2012  Mark Nudelman
 .\"
@@ -23,7 +23,7 @@
 .\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 20 2019 $
+.Dd $Mdocdate: August 20 2019 $
 .Dt LESS 1
 .Os
 .Sh NAME
@@ -48,30 +48,22 @@
 .Op Ar
 .Sh DESCRIPTION
 .Nm
-is a program similar to the traditional
-.Xr more 1 ,
-but with many more features.
-It displays text one screenful at a time.
-After showing each screenful, it prompts the user for a command.
+displays text one screenful at a time.
+After showing each screenful, it prompts the user for a command,
+as described in
+.Sx COMMANDS .
 When showing the last line of a file,
 .Nm
 displays a prompt indicating end of file and the name of the next file
 to examine, if any.
 It then waits for input from the user.
 .Pp
-Commands are based on both traditional
-.Xr more 1
-and
-.Xr vi 1 .
-Commands may be preceded by a decimal number,
-called
-.Ar N
-in the descriptions below.
-The number is used by some commands, as indicated.
-.Pp
-This version of
 .Nm
-also acts as
+is similar to the traditional
+.Xr more 1 ,
+but with many more features.
+.Nm
+will behave like
 .Xr more 1
 if it is called as
 .Nm more ,
@@ -757,6 +749,14 @@ command described previously
 may also be used to set (or change) an initial command for every file.
 .El
 .Sh COMMANDS
+Commands are based on both traditional
+.Xr more 1
+and
+.Xr vi 1 .
+Commands may be preceded by a decimal number,
+called
+.Ar N
+in the descriptions below.
 In the following descriptions, ^X means control-X.
 ESC stands for the ESCAPE key; for example ESC-v means the
 two character sequence "ESCAPE", then "v".
@@ -1916,5 +1916,9 @@ is used.
 .Sh SEE ALSO
 .Xr lesskey 1 ,
 .Xr more 1
+.Sh HISTORY
+.Nm
+was first published in 1985 and has been available since
+.Ox 2.0 .
 .Sh AUTHORS
-.An Mark Nudelman .
+.An Mark Nudelman
diff --git a/usr.bin/less/more.1 b/usr.bin/less/more.1
index 66b4ee23971..e6a67960080 100644
--- a/usr.bin/less/more.1
+++ b/usr.bin/less/more.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: more.1,v 1.17 2014/04/25 22:28:42 jmc Exp $
+.\"	$OpenBSD: more.1,v 1.18 2019/08/20 11:34:18 jmc Exp $
 .\"
 .\" Copyright (c) 1988, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: April 25 2014 $
+.Dd $Mdocdate: August 20 2019 $
 .Dt MORE 1
 .Os
 .Sh NAME
@@ -65,17 +65,6 @@ It then waits for input from the user.
 Scrolling forward switches to the next file,
 or exits if there is none.
 .Pp
-This version of
-.Nm
-is actually
-.Xr less 1
-in disguise.
-As such, it will also accept options documented in
-.Xr less 1 .
-This manual page describes only features
-relevant to a POSIX compliant
-.Nm .
-.Pp
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl c
@@ -318,5 +307,8 @@ A
 .Nm
 command appeared in
 .Bx 3.0 .
+The present implementation is actually
+.Xr less 1
+in disguise.
 .Sh AUTHORS
-.An Mark Nudelman Aq Mt markn@greenwoodsoftware.com
+.An Mark Nudelman