On Mon, Aug 19, 2019 at 01:06:17PM -0600, Theo de Raadt wrote: > I don't think that piece of history matters enough. Garret's > changes were not even close to the original work, or even other > unmentioned work. > > And let me comment in general. When diffs contain multiple aspects like > this, the people can commit sometimes raise their nose at a piece and > ignore the whole thing. That chunk raises my nose, and I forget what > else is in your diff. >
i've been waiting just to give nicm a chance to reply to a point that ingo raised. but for completion, here's the diff i'm proposing, which is evan's diff plus feedback from ingo. feel free to ok it too! jmc Index: less.1 =================================================================== RCS file: /cvs/src/usr.bin/less/less.1,v retrieving revision 1.55 diff -u -r1.55 less.1 --- less.1 20 Jul 2019 13:21:09 -0000 1.55 +++ less.1 19 Aug 2019 19:15:03 -0000 @@ -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 @@ 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,10 @@ .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 +.An Garrett D'Amore Index: more.1 =================================================================== RCS file: /cvs/src/usr.bin/less/more.1,v retrieving revision 1.17 diff -u -r1.17 more.1 --- more.1 25 Apr 2014 22:28:42 -0000 1.17 +++ more.1 19 Aug 2019 19:15:03 -0000 @@ -65,17 +65,6 @@ 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,9 @@ .Nm command appeared in .Bx 3.0 . +The present implementation is actually +.Xr less 1 +in disguise. .Sh AUTHORS -.An Mark Nudelman Aq Mt ma...@greenwoodsoftware.com +.An Mark Nudelman +.An Garrett D'Amore
