mdoc format man pages from jmc@

4 files changed, 1398 insertions, 1110 deletions

diff --git a/usr.bin/less/Makefile.bsd-wrapper b/usr.bin/less/Makefile.bsd-wrapper
index 8c18dbf9c38..de5a2fc2ae4 100644
--- a/usr.bin/less/Makefile.bsd-wrapper
+++ b/usr.bin/less/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.20 2003/04/14 14:33:57 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.21 2003/04/16 17:54:20 millert Exp $
 
 #
 # less config
@@ -11,7 +11,7 @@ LESS_HLP=	more.help
 LINKS=		${BINDIR}/less ${BINDIR}/more ${BINDIR}/less ${BINDIR}/page
 MAN=		less.1 lesskey.1
 MLINKS=		less.1 more.1 less.1 page.1
-CLEANFILES=	config.cache config.log $(MAN)
+CLEANFILES=	config.cache config.log
 
 #
 # Wrapped flags
@@ -20,25 +20,6 @@ XCFLAGS= CC="${CC}" CFLAGS="${CFLAGS} ${COPTS}" LDFLAGS="${LDFLAGS} ${LDSTATIC}"
 
 all: config.status gnu_build
 
-#
-# XXX - This is needed because crunchgen wasn't 
-#       designed to work with wrappers.  The
-#	default sys.mk SUFFIX rules were being
-#	invoked accidentally and crunchgen
-#	couldn't figure out what objects were
-#	needed.
-#
-OBJS=	main.o screen.o brac.o ch.o charset.o cmdbuf.o \
-	command.o decode.o edit.o filename.o forwback.o \
-	help.o ifile.o input.o jump.o line.o linenum.o \
-	lsystem.o mark.o optfunc.o option.o opttbl.o os.o \
-	output.o position.o prompt.o search.o signal.o \
-	tags.o ttyin.o version.o
-.SUFFIXES: .o .c
-.c.o: config.status
-	@$(MAKE) ${XCFLAGS} LIBS=${LIBS} \
-		 datadir=${DATADIR} LESS_HLP=${LESS_HLP} ${.TARGET}
-
 .FORCE: .IGNORE
 
 .include <bsd.own.mk>
@@ -102,14 +83,6 @@ afterinstall:
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
 		${.CURDIR}/less.hlp ${DESTDIR}${DATADIR}/${LESS_HLP}
 
-#
-# Fix less manpage suffix 
-#
-.SUFFIXES: .nro .1 .2 .3 .4 .5 .6 .7 .8 .9
-
-.nro.1 .nro.2 .nro.3 .nro.4 .nro.5 .nro.6 .nro.7 .nro.8 .nro.9:
-	-@ln -sf ${.IMPSRC} ${.TARGET}
-
 depend:
 	# Nothing here so far...
 
diff --git a/usr.bin/less/less.nro b/usr.bin/less/less.1
index 88ebdc76dc0..0ecd0860872 100644
--- a/usr.bin/less/less.nro
+++ b/usr.bin/less/less.1
@@ -1,246 +1,282 @@
-.TH LESS 1 "Version 381: 17 Jan 2003"
-.SH NAME
-less, more \- view files on a crt
-.SH SYNOPSIS
-.B "less|more -?"
-.br
-.B "less|more --help"
-.br
-.B "less|more -V"
-.br
-.B "less|more --version"
-.br
-.B "less|more [-[+]aBcCdeEfFgGiIJLmMnNqQrRsSuUVwWX~]"
-.br
-.B "          [-b \fIspace\fP] [-h \fIlines\fP] [-j \fIline\fP] [-k \fIkeyfile\fP]"
-.br
-.B "          [-{oO} \fIlogfile\fP] [-p \fIpattern\fP] [-P \fIprompt\fP]"
-.br
-.B "          [-t \fItag\fP] [-T \fItagsfile\fP] [-x \fItab\fP,...] [-y \fIlines\fP]"
-.br
-.B "          [-[z] \fIlines\fP] [-# \fIshift\fP] [+[+]\fIcmd\fP] [--]"
-.br
-.B "          [\fIfilename\fP]..."
-.sp
-(See the OPTIONS section for alternate option syntax with long option names.)
-
-.SH DESCRIPTION
-.I Less
+.\"	$OpenBSD: less.1,v 1.1 2003/04/16 17:54:20 millert Exp $
+.\"
+.\" Copyright (C) 2002  Mark Nudelman
+.\"
+.\" less is part of the GNU project and is free software.
+.\" You can redistribute it and/or modify it
+.\" under the terms of either
+.\" (1) the GNU General Public License as published by
+.\" the Free Software Foundation; or (2) the Less License.
+.\" See the file README in the less distribution for more details
+.\" regarding redistribution.
+.\" You should have received a copy of the GNU General Public License
+.\" along with the source for less; see the file COPYING.
+.\" If not, write to the Free Software Foundation, 59 Temple Place,
+.\" Suite 330, Boston, MA  02111-1307, USA.
+.\" You should also have received a copy of the Less License;
+.\" see the file LICENSE.
+.\"
+.\" less is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+.\" or FITNESS FOR A PARTICULAR PURPOSE.
+.\" See the GNU General Public License for more details.
+.\"
+.\"
+.Dd January 17, 2003
+.Dt LESS 1
+.Os
+.Sh NAME
+.Nm less , more
+.Nd view files on a crt
+.Sh SYNOPSIS
+.Nm less No | Nm more
+.Fl ?
+.Nm less No | Nm more
+.Fl -help
+.Nm less No | Nm more
+.Fl V
+.Nm less No | Nm more
+.Fl -version
+.Nm less No | Nm more
+.Bk -words
+.Op Fl Oo Cm + Oc Ns Cm aBcCdeEfFgGiIJLmMnNqQrRsSuUVwWX~
+.Op Fl b Ar space
+.Op Fl h Ar lines
+.Op Fl j Ar line
+.Op Fl k Ar keyfile
+.Op Fl o | O Ar logfile
+.Op Fl p Ar pattern
+.Op Fl P Ar prompt
+.Op Fl t Ar tag
+.Op Fl T Ar tagsfile
+.Op Fl x Ar tab,...
+.Op Fl y Ar lines
+.Op Fl Oo Cm z Oc Ar \ \&lines
+.Op Fl # Ar shift
+.Xo Oo Cm \+ Ns Oo Ns Cm \+ Ns
+.Oc Ar cmd
+.Oc
+.Xc
+.Op Fl -
+.Op Ar filename ...
+.Ek
+.Pp
+.\" (See the
+.\" .Sx OPTIONS
+.\" section for alternate option syntax with long option names.)
+.Sh DESCRIPTION
+.Nm
 is a program similar to the traditional
-.I more
-(1), but which allows backward movement
-in the file as well as forward movement.
+.Xr more 1 ,
+but which allows backward movement in the file as well as forward movement.
 Also,
-.I less
+.Nm
 does not have to read the entire input file before starting,
 so with large input files it starts up faster than text editors like
-.I vi
-(1).
-.I Less
+.Xr vi 1 .
+.Nm
 uses termcap (or terminfo on some systems),
 so it can run on a variety of terminals.
 There is even limited support for hardcopy terminals.
 (On a hardcopy terminal, lines which should be printed at the top
 of the screen are prefixed with a caret.)
-.PP
+.Pp
 This version of
-.I less
-also acts as 
-.I more
-(1) if it is called as
-.I more.
+.Nm
+also acts as
+.Xr more 1
+if it is called as
+.Nm more .
 In this mode, the differences are in the prompt and that
-.I more
+.Nm more
 exits by default when it gets to the end of the file.
 Commands are based on both traditional
-.I more
+.Nm more
 and
-.I vi.
-Commands may be preceded by a decimal number, 
+.Xr vi 1 .
+Commands may be preceded by a decimal number,
 called N in the descriptions below.
 The number is used by some commands, as indicated.
-
-.SH COMMANDS
+.Sh COMMANDS
 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".
-.IP "h or H"
+.Bl -tag -width XXXX
+.It Ic h | H
 Help: display a summary of these commands.
 If you forget all the other commands, remember this one.
-.IP "SPACE or ^V or f or ^F"
+.It Ic SPACE | ^V | f | ^F
 Scroll forward N lines, default one window (see option -z below).
 If N is more than the screen size, only the final screenful is displayed.
 Warning: some systems use ^V as a special literalization character.
-.IP "z"
+.It Ic z
 Like SPACE, but if N is specified, it becomes the new window size.
-.IP "ESC-SPACE"
-Like SPACE, but scrolls a full screenful, even if it reaches
+.It Ic ESC-SPACE
+Like SPACE, but scrolls a full screensful, even if it reaches
 end-of-file in the process.
-.IP "RETURN or ^N or e or ^E or j or ^J"
+.It Xo
+.Ic RETURN No \&| Ic ^N No \&|
+.Ic e No \&| Ic ^E No \&|
+.Ic j No \&| Ic ^J
+.Xc
 Scroll forward N lines, default 1.
 The entire N lines are displayed, even if N is more than the screen size.
-.IP "d or ^D"
+.It Ic d | ^D
 Scroll forward N lines, default one half of the screen size.
-If N is specified, it becomes the new default for 
-subsequent d and u commands.
-.IP "b or ^B or ESC-v"
+If N is specified, it becomes the new default for subsequent d and u commands.
+.It Ic b | ^B | ESC-v
 Scroll backward N lines, default one window (see option -z below).
 If N is more than the screen size, only the final screenful is displayed.
-.IP "w"
+.It Ic w
 Like ESC-v, but if N is specified, it becomes the new window size.
-.IP "y or ^Y or ^P or k or ^K"
+.It Xo
+.Ic y No \&| Ic ^Y No \&|
+.Ic ^P No \&| Ic k No \&|
+.Ic ^K
+.Xc
 Scroll backward N lines, default 1.
 The entire N lines are displayed, even if N is more than the screen size.
 Warning: some systems use ^Y as a special job control character.
-.IP "u or ^U"
+.It Ic u | ^U
 Scroll backward N lines, default one half of the screen size.
-If N is specified, it becomes the new default for 
-subsequent d and u commands.
-.IP "ESC-) or RIGHTARROW"
+If N is specified, it becomes the new default for subsequent d and u commands.
+.It Ic ESC-) | RIGHTARROW
 Scroll horizontally right N characters, default half the screen width
 (see the -# option).
-If a number N is specified, it becomes the default for future RIGHTARROW
-and LEFTARROW commands.
-While the text is scrolled, it acts as though the -S option
-(chop lines) were in effect.
-.IP "ESC-( or LEFTARROW"
-Scroll horizontally left N characters, default half the screen width
-(see the -# option).
-If a number N is specified, it becomes the default for future RIGHTARROW
-and LEFTARROW commands.
-.IP "r or ^R or ^L"
+If a number N is specified, it becomes the default for future
+RIGHTARROW and LEFTARROW commands.
+While the text is scrolled, it acts as though the -S option (chop lines)
+were in effect.
+.It Ic ESC-( | LEFTARROW
+Scroll horizontally left N
+characters, default half the screen width (see the -# option).
+If a number N is specified, it becomes the default for future
+RIGHTARROW and LEFTARROW commands.
+.It Ic r | ^R | ^L
 Repaint the screen.
-.IP R
+.It Ic R
 Repaint the screen, discarding any buffered input.
 Useful if the file is changing while it is being viewed.
-.IP "F"
-Scroll forward, and keep trying to read when the
-end of file is reached.
+.It Ic F
+Scroll forward, and keep trying to read when the end of file is reached.
 Normally this command would be used when already at the end of the file.
 It is a way to monitor the tail of a file which is growing
 while it is being viewed.
 (The behavior is similar to the "tail -f" command.)
-.IP "g or < or ESC-<"
+.It Ic g | < | ESC-<
 Go to line N in the file, default 1 (beginning of file).
 (Warning: this may be slow if N is large.)
-.IP "G or > or ESC->"
+.It Ic G | > | ESC->
 Go to line N in the file, default the end of the file.
 (Warning: this may be slow if N is large,
-or if N is not specified and
-standard input, rather than a file, is being read.)
-.IP "p or %"
+or if N is not specified and standard input, rather than a file,
+is being read.)
+.It Ic p | %
 Go to a position N percent into the file.
 N should be between 0 and 100.
-.IP "{"
+.It Ic {
 If a left curly bracket appears in the top line displayed
-on the screen,
-the { command will go to the matching right curly bracket.
+on the screen, the { command will go to the matching right curly bracket.
 The matching right curly bracket is positioned on the bottom
 line of the screen.
-If there is more than one left curly bracket on the top line,
-a number N may be used to specify the N-th bracket on the line.
-.IP "}"
-If a right curly bracket appears in the bottom line displayed
-on the screen,
+If there is more than one left curly bracket on the top line, a number N
+may be used to specify the N-th bracket on the line.
+.It Ic }
+If a right curly bracket appears in the bottom line displayed on the screen,
 the } command will go to the matching left curly bracket.
 The matching left curly bracket is positioned on the top
 line of the screen.
 If there is more than one right curly bracket on the top line,
 a number N may be used to specify the N-th bracket on the line.
-.IP "("
+.It Ic \&(
 Like {, but applies to parentheses rather than curly brackets.
-.IP ")"
+.It Ic \&)
 Like }, but applies to parentheses rather than curly brackets.
-.IP "["
+.It Ic \&[
 Like {, but applies to square brackets rather than curly brackets.
-.IP "]"
+.It Ic \&]
 Like }, but applies to square brackets rather than curly brackets.
-.IP "ESC-^F"
-Followed by two characters,
-acts like {, but uses the two characters as open and close brackets,
-respectively.
-For example, "ESC ^F < >" could be used to 
+.It Ic ESC-^F
+Followed by two characters, acts like {,
+but uses the two characters as open and close brackets, respectively.
+For example, "ESC ^F < >" could be used to
 go forward to the > which matches the < in the top displayed line.
-.IP "ESC-^B"
-Followed by two characters,
-acts like }, but uses the two characters as open and close brackets,
-respectively.
-For example, "ESC ^B < >" could be used to 
+.It Ic ESC-^B
+Followed by two characters, acts like },
+but uses the two characters as open and close brackets, respectively.
+For example, "ESC ^B < >" could be used to
 go backward to the < which matches the > in the bottom displayed line.
-.IP m
-Followed by any lowercase letter, 
-marks the current position with that letter.
-.IP "'"
+.It Ic m
+Followed by any lowercase letter, marks the current position with that letter.
+.It Ic '
 (Single quote.)
 Followed by any lowercase letter, returns to the position which
 was previously marked with that letter.
 Followed by another single quote, returns to the position at
 which the last "large" movement command was executed.
-Followed by a ^ or $, jumps to the beginning or end of the
-file respectively.
+Followed by a ^ or $, jumps to the beginning or end of the file respectively.
 Marks are preserved when a new file is examined,
 so the ' command can be used to switch between input files.
-.IP "^X^X"
+.It Ic ^X^X
 Same as single quote.
-.IP /pattern
+.It Ic /pattern
 Search forward in the file for the N-th line containing the pattern.
 N defaults to 1.
 The pattern is a regular expression, as recognized by
-.I ed.
+.Xr ed 1 .
 The search starts at the second line displayed
 (but see the -a and -j options, which change this).
-.sp
-Certain characters are special
-if entered at the beginning of the pattern;
+.Pp
+Certain characters are special if entered at the beginning of the pattern;
 they modify the type of search rather than become part of the pattern:
-.RS
-.IP "^N or !"
+.Bl -tag -width Ds
+.It Ic ^N | !
 Search for lines which do NOT match the pattern.
-.IP "^E or *"
+.It Ic ^E | *
 Search multiple files.
-That is, if the search reaches the END of the current file 
+That is, if the search reaches the END of the current file
 without finding a match,
 the search continues in the next file in the command line list.
-.IP "^F or @"
+.It Ic ^F | @
 Begin the search at the first line of the FIRST file
 in the command line list,
 regardless of what is currently displayed on the screen
 or the settings of the -a or -j options.
-.IP "^K"
-Highlight any text which matches the pattern on the current screen, 
+.It Ic ^K
+Highlight any text which matches the pattern on the current screen,
 but don't move to the first match (KEEP current position).
-.IP "^R"
+.It Ic ^R
 Don't interpret regular expression metacharacters;
 that is, do a simple textual comparison.
-.RE
-.IP ?pattern
+.El
+.It Ic ?pattern
 Search backward in the file for the N-th line containing the pattern.
 The search starts at the line immediately before the top line displayed.
-.sp
-Certain characters are special as in the / command:
-.RS
-.IP "^N or !"
+.Pp
+Certain characters are special, as in the / command:
+.Bl -tag -width Ds
+.It Ic ^N | !
 Search for lines which do NOT match the pattern.
-.IP "^E or *"
+.It Ic ^E | *
 Search multiple files.
-That is, if the search reaches the beginning of the current file 
+That is, if the search reaches the beginning of the current file
 without finding a match,
 the search continues in the previous file in the command line list.
-.IP "^F or @"
+.It Ic ^F | @
 Begin the search at the last line of the last file
 in the command line list,
 regardless of what is currently displayed on the screen
 or the settings of the -a or -j options.
-.IP "^K"
+.It Ic ^K
 As in forward searches.
-.IP "^R"
+.It Ic ^R
 As in forward searches.
-.RE
-.IP "ESC-/pattern"
+.El
+.It Ic ESC-/pattern
 Same as "/*".
-.IP "ESC-?pattern"
+.It Ic ESC-?pattern
 Same as "?*".
-.IP n
+.It Ic n
 Repeat previous search, for N-th line containing the last pattern.
 If the previous search was modified by ^N, the search is made for the
 N-th line NOT containing the pattern.
@@ -249,31 +285,31 @@ in the next (or previous) file if not satisfied in the current file.
 If the previous search was modified by ^R, the search is done
 without using regular expressions.
 There is no effect if the previous search was modified by ^F or ^K.
-.IP N
+.It Ic N
 Repeat previous search, but in the reverse direction.
-.IP "ESC-n"
+.It Ic ESC-n
 Repeat previous search, but crossing file boundaries.
 The effect is as if the previous search were modified by *.
-.IP "ESC-N"
+.It Ic ESC-N
 Repeat previous search, but in the reverse direction
 and crossing file boundaries.
-.IP "ESC-u"
+.It Ic ESC-u
 Undo search highlighting.
-Turn off highlighting of strings matching the current search pattern. 
+Turn off highlighting of strings matching the current search pattern.
 If highlighting is already off because of a previous ESC-u command,
 turn highlighting back on.
 Any search command will also turn highlighting back on.
 (Highlighting can also be disabled by toggling the -G option;
 in that case search commands do not turn highlighting back on.)
-.IP ":e [filename]"
+.It Ic :e Op Ar filename
 Examine a new file.
 If the filename is missing, the "current" file (see the :n and :p commands
 below) from the list of files in the command line is re-examined.
 A percent sign (%) in the filename is replaced by the name of the
-current file.  
+current file.
 A pound sign (#) is replaced by the name of the previously examined file.
-However, two consecutive percent signs are simply 
-replaced with a single percent sign.  
+However, two consecutive percent signs are simply
+replaced with a single percent sign.
 This allows you to enter a filename that contains a percent sign
 in the name.
 Similarly, two consecutive pound signs are replaced with a single pound sign.
@@ -284,37 +320,38 @@ the list of files and the first one is examined.
 If the filename contains one or more spaces,
 the entire filename should be enclosed in double quotes
 (also see the -" option).
-.IP "^X^V or E"
+.It Ic ^X^V | E
 Same as :e.
 Warning: some systems use ^V as a special literalization character.
 On such systems, you may not be able to use ^V.
-.IP ":n"
+.It Ic :n
 Examine the next file (from the list of files given in the command line).
 If a number N is specified, the N-th next file is examined.
-.IP ":p"
+.It Ic :p
 Examine the previous file in the command line list.
 If a number N is specified, the N-th previous file is examined.
-.IP ":t"
+.It Ic :t
 Go to the specified tag.
-.IP ":x"
+.It Ic :x
 Examine the first file in the command line list.
 If a number N is specified, the N-th file in the list is examined.
-.IP ":d"
+.It Ic :d
 Remove the current file from the list of files.
-.IP "t"
+.It Ic t
 Go to the next tag, if there were more than one matches for the current tag.
 See the \-t option for more details about tags.
-.IP "T"
+.It Ic T
 Go to the previous tag, if there were more than one matches for the current tag.
-.IP "= or ^G or :f"
-Prints some information about the file being viewed,
-including its name
+.It Ic = | ^G | :f
+Prints some information about the file being viewed, including its name
 and the line number and byte offset of the bottom line being displayed.
 If possible, it also prints the length of the file,
 the number of lines in the file
 and the percent of the file above the last displayed line.
-.IP \-
-Followed by one of the command line option letters (see OPTIONS below),
+.It Ic \-
+Followed by one of the command line option letters (see
+.Sx OPTIONS
+below),
 this will change the setting of that option
 and print a message describing the new setting.
 If a ^P (CONTROL-P) is entered immediately after the dash,
@@ -324,96 +361,112 @@ or a string value (such as -P or -t),
 a new value may be entered after the option letter.
 If no new value is entered, a message describing
 the current setting is printed and nothing is changed.
-.IP \-\-
-Like the \- command, but takes a long option name (see OPTIONS below)
+.It Ic \-\-
+Like the \- command, but takes a long option name (see
+.Sx OPTIONS
+below)
 rather than a single option letter.
 You must press RETURN after typing the option name.
-A ^P immediately after the second dash suppresses printing of a 
+A ^P immediately after the second dash suppresses printing of a
 message describing the new setting, as in the \- command.
-.IP \-+
-Followed by one of the command line option letters
-this will reset the option to its default setting
-and print a message describing the new setting.
-(The "\-+\fIX\fP" command does the same thing
-as "\-+\fIX\fP" on the command line.)
+.It Ic \-+
+Followed by one of the command line option letters this will reset the
+option to its default setting and print a message describing the new setting.
+(The "\-+X" command does the same thing as "\-+X" on the command line.)
 This does not work for string-valued options.
-.IP \-\-+
+.It Ic \-\-+
 Like the \-+ command, but takes a long option name
 rather than a single option letter.
-.IP \-!
-Followed by one of the command line option letters,
-this will reset the option to the "opposite" of its default setting
-and print a message describing the new setting.
+.It Ic \-!
+Followed by one of the command line option letters, this will reset the
+option to the "opposite" of its default setting and print a message
+describing the new setting.
 This does not work for numeric or string-valued options.
-.IP \-\-!
+.It Ic \-\-!
 Like the \-! command, but takes a long option name
 rather than a single option letter.
-.IP _
+.It Ic _
 (Underscore.)
 Followed by one of the command line option letters,
 this will print a message describing the current setting of that option.
 The setting of the option is not changed.
-.IP __
+.It Ic __
 (Double underscore.)
 Like the _ (underscore) command, but takes a long option name
 rather than a single option letter.
 You must press RETURN after typing the option name.
-.IP +cmd
+.It Ic +cmd
 Causes the specified cmd to be executed each time a new file is examined.
-For example, +G causes 
-.I less
-to initially display each file starting at the end 
-rather than the beginning.
-.IP V
-Prints the version number of 
-.I less 
+For example, +G causes
+.Nm
+to initially display each file starting at the end rather than the beginning.
+.It Ic V
+Prints the version number of
+.Nm
 being run.
-.IP "q or Q or :q or :Q or ZZ"
+.It Xo
+.Ic q No \&| Ic Q No \&|
+.Ic :q No \&| Ic :Q No \&|
+.Ic ZZ
+.Xc
 Exits
-.I less.
-.PP
-The following 
+.Nm less .
+.El
+.Pp
+The following
 four
 commands may or may not be valid, depending on your particular installation.
-.PP
-.IP v
+.Bl -tag -width XXXX
+.It Ic v
 Invokes an editor to edit the current file being viewed.
-The editor is taken from the environment variable VISUAL if defined,
-or EDITOR if VISUAL is not defined,
-or defaults to "vi" if neither VISUAL nor EDITOR is defined.
-See also the discussion of LESSEDIT under the section on PROMPTS below.
-.IP "! shell-command"
+The editor is taken from the environment variable
+.Ev VISUAL ,
+if defined,
+or
+.Ev EDITOR
+if
+.Ev VISUAL
+is not defined,
+or defaults to "vi" if neither
+.Ev VISUAL
+nor
+.Ev EDITOR
+is defined.
+See also the discussion of LESSEDIT under the section on
+.Sx PROMPTS
+below.
+.It Ic ! Ar shell-command
 Invokes a shell to run the shell-command given.
-A percent sign (%) in the command is replaced by the name of the
-current file.  
+A percent sign (%) in the command is replaced by the name of the current file.
 A pound sign (#) is replaced by the name of the previously examined file.
 "!!" repeats the last shell command.
 "!" with no shell command simply invokes a shell.
-On Unix systems, the shell is taken from the environment variable SHELL,
+The shell is taken from the environment variable
+.Ev SHELL ,
 or defaults to "sh".
-On MS-DOS and OS/2 systems, the shell is the normal command processor.
-.IP "| <m> shell-command"
+.\" On MS-DOS and OS/2 systems, the shell is the normal command processor.
+.It Ic \&| <m> Ar shell-command
 <m> represents any mark letter.
 Pipes a section of the input file to the given shell command.
 The section of the file to be piped is between the first line on
 the current screen and the position marked by the letter.
 <m> may also be ^ or $ to indicate beginning or end of file respectively.
 If <m> is . or newline, the current screen is piped.
-.IP "s filename"
+.It Ic s Ar filename
 Save the input to a file.
 This only works if the input is a pipe, not an ordinary file.
-.PP
-.SH OPTIONS
+.El
+.Sh OPTIONS
 Command line options are described below.
 Most options may be changed while
-.I less 
+.Nm
 is running, via the "\-" command.
-.PP
-Most options may be given in one of two forms: 
-either a dash followed by a single letter,
-or two dashes followed by a long option name.
-A long option name may be abbreviated as long as
-the abbreviation is unambiguous.
+.Pp
+Most options may be given in one of two forms:
+either a dash followed by a single letter, or two dashes followed by a
+long option name.
+A long option name may be abbreviated as long as the abbreviation is
+unambiguous.
 For example, --quit-at-eof may be abbreviated --quit, but not
 --qui, since both --quit-at-eof and --quiet begin with --qui.
 Some long option names are in uppercase, such as --QUIT-AT-EOF, as
@@ -421,162 +474,170 @@ distinct from --quit-at-eof.
 Such option names need only have their first letter capitalized;
 the remainder of the name may be in either case.
 For example, --Quit-at-eof is equivalent to --QUIT-AT-EOF.
-.PP
-Options are also taken from the environment variable "LESS"
+.Pp
+Options are also taken from the environment variable
+.Ev LESS
+if the command is
+.Nm less ,
+or from the environment variable
+.Ev MORE
 if the command is
-.IR less ,
-or from the environment variable "MORE" if the command is
-.IR more .
-For example, 
-to avoid typing "less -options ..." each time 
-.I less 
-is invoked, you might tell 
-.I csh:
-.sp
-setenv LESS "-options"
-.sp
-or if you use 
-.I sh:
-.sp
-LESS="-options"; export LESS
-.sp
-On MS-DOS, you don't need the quotes, but you should replace any 
-percent signs in the options string by double percent signs.
-.sp
+.Nm more .
+For example, to avoid typing "less -options ..." each time
+.Nm
+is invoked, you might tell
+.Xr csh 1 :
+.Pp
+.Dl setenv LESS "-options"
+.Pp
+or if you use
+.Xr sh 1 :
+.Pp
+.Dl LESS="-options"; export LESS
+.Pp
+.\" On MS-DOS, you don't need the quotes, but you should replace any
+.\" percent signs in the options string by double percent signs.
+.\" .Pp
 The environment variable is parsed before the command line,
-so command line options override the LESS environment variable.
-If an option appears in the LESS variable, it can be reset
-to its default value on the command line by beginning the command
-line option with "\-+".
-.sp
-For options like -P or -D which take a following string,
+so command line options override the
+.Ev LESS
+environment variable.
+If an option appears in the
+.Ev LESS
+variable, it can be reset to its default value on the command line by
+beginning the command line option with "\-+".
+.Pp
+For options like -P which take a following string,
 a dollar sign ($) must be used to signal the end of the string.
-For example, to set two -D options on MS-DOS, you must have
-a dollar sign between them, like this:
-.sp
-LESS="-Dn9.1$-Ds4.1"
-.sp
-.IP "-? or --help"
+For example, to separate a prompt value from any other options
+with dollar sign between them:
+.Pp
+.Dl LESS="-Ps--More--$-C -e"
+.Pp
+.Bl -tag -width XXXX
+.It Fl ? | -help
 This option displays a summary of the commands accepted by
-.I less
+.Nm
 (the same as the h command).
 (Depending on how your shell interprets the question mark,
 it may be necessary to quote the question mark, thus: "-\e?".)
-.IP "-a or --search-skip-screen"
-Causes searches to start after the last line
-displayed on the screen, 
+.It Fl a | -search-skip-screen
+Causes searches to start after the last line displayed on the screen,
 thus skipping all lines displayed on the screen.
 By default, searches start at the second line on the screen
 (or after the last found line; see the -j option).
-.IP "-b\fIn\fP or --buffers=\fIn\fP"
+.It Xo
+.Fl b Ns Ar n |
+.Fl -buffers Ns No = Ns Ar n
+.Xc
 Specifies the amount of buffer space
-.I less
+.Nm
 will use for each file, in units of kilobytes (1024 bytes).
 By default 64K of buffer space is used for each file
 (unless the file is a pipe; see the -B option).
-The -b option specifies instead that \fIn\fP kilobytes of 
+The -b option specifies instead that n kilobytes of
 buffer space should be used for each file.
-If \fIn\fP is -1, buffer space is unlimited; that is,
+If n is -1, buffer space is unlimited; that is,
 the entire file is read into memory.
-.IP "-B or --auto-buffers"
+.It Fl B | -auto-buffers
 By default, when data is read from a pipe,
 buffers are allocated automatically as needed.
 If a large amount of data is read from the pipe, this can cause
 a large amount of memory to be allocated.
 The -B option disables this automatic allocation of buffers for pipes,
-so that only 64K 
-(or the amount of space specified by the -b option)
+so that only 64K (or the amount of space specified by the -b option)
 is used for the pipe.
 Warning: use of -B can result in erroneous display, since only the
-most recently viewed part of the file is kept in memory; 
+most recently viewed part of the file is kept in memory;
 any earlier data is lost.
-.IP "-c or --clear-screen"
+.It Fl c | -clear-screen
 Causes full screen repaints to be painted from the top line down.
 By default,
 full screen repaints are done by scrolling from the bottom of the screen.
-.IP "-C or --CLEAR-SCREEN"
+.It Fl C | -CLEAR-SCREEN
 The -C option is like -c, but the screen is cleared before it is repainted.
-.IP "-d or --dumb (less only)"
+.It Fl d | -dumb No (less only)
 The -d option suppresses the error message
 normally displayed if the terminal is dumb;
 that is, lacks some important capability,
 such as the ability to clear the screen or scroll backward.
 The -d option does not otherwise change the behavior of
-.I less
+.Nm
 on a dumb terminal.
 This option is on by default when invoked as
-.IR more .
-.IP "-d (more only)"
+.Nm more .
+.It Fl d No (more only)
 The -d option causes the default prompt to include the
-basic directions ``[Press space to continue, 'q' to quit.]''.  The -d
-option also causes the message ``[Press 'h' for instructions.]'' to be
-displayed when an invalid command is entered (normally, the bell is
-rung).  This option is useful in environments where users may not be
-experienced with pagers.
-.IP "-D\fBx\fP\fIcolor\fP or --color=\fBx\fP\fIcolor\fP"
-[MS-DOS only]
-Sets the color of the text displayed.
-\fBx\fP is a single character which selects the type of text whose color is 
-being set: n=normal, s=standout, d=bold, u=underlined, k=blink.
-\fIcolor\fP is a pair of numbers separated by a period.  
-The first number selects the foreground color and the second selects 
-the background color of the text.
-A single number \fIN\fP is the same as \fIN.0\fP.
-.IP "-e or --quit-at-eof"
-Causes 
-.I less 
-to automatically exit
-the second time it reaches end-of-file.
-By default, the only way to exit 
-.I less
+basic directions ``[Press space to continue, 'q' to quit.]''.
+The -d option also causes the message ``[Press 'h' for instructions.]'' to be
+displayed when an invalid command is entered (normally, the bell is rung).
+This option is useful in environments where users may not be experienced
+with pagers.
+.\" .It Fl Dxcolor or --color=xcolor"
+.\" [MS-DOS only]
+.\" Sets the color of the text displayed.
+.\" x is a single character which selects the type of text whose color is
+.\" being set: n=normal, s=standout, d=bold, u=underlined, k=blink.
+.\" color is a pair of numbers separated by a period.
+.\" The first number selects the foreground color and the second selects
+.\" the background color of the text.
+.\" A single number N is the same as N.0.
+.It Fl e | -quit-at-eof
+Causes
+.Nm
+to automatically exit the second time it reaches end-of-file.
+By default, the only way to exit
+.Nm
 is via the "q" command.
-.IP "-E or --QUIT-AT-EOF"
-Causes 
-.I less
+.It Fl E | -QUIT-AT-EOF
+Causes
+.Nm
 to automatically exit the first time it reaches end-of-file.
-.IP "-f or --force"
+.It Fl f | -force
 Forces non-regular files to be opened.
 (A non-regular file is a directory or a device special file.)
 Also suppresses the warning message when a binary file is opened.
 By default,
-.I less
+.Nm
 will refuse to open non-regular files.
-.IP "-F or --quit-if-one-screen"
+.It Fl F | -quit-if-one-screen
 Causes
-.I less
-to automatically exit
-if the entire file can be displayed on the first screen.
-.IP "-g or --hilite-search"
-Normally, 
-.I less 
+.Nm
+to automatically exit if the entire file can be displayed on the first screen.
+.It Fl g | -hilite-search
+Normally,
+.Nm
 will highlight ALL strings which match the last search command.
-The -g option changes this behavior to highlight only the particular string 
+The -g option changes this behavior to highlight only the particular string
 which was found by the last search command.
-This can cause 
-.I less 
+This can cause
+.Nm
 to run somewhat faster than the default.
-.IP "-G or --HILITE-SEARCH"
+.It Fl G | -HILITE-SEARCH
 The -G option suppresses all highlighting of strings found by search commands.
-.IP "-h\fIn\fP or ---max-back-scroll=\fIn\fP"
+.It Xo
+.Fl h Ns Ar n |
+.Fl -max-back-scroll Ns No = Ns Ar n
+.Xc
 Specifies a maximum number of lines to scroll backward.
-If it is necessary to scroll backward more than \fIn\fP lines,
+If it is necessary to scroll backward more than n lines,
 the screen is repainted in a forward direction instead.
-(If the terminal does not have the ability to scroll
-backward, -h0 is implied.)
-.IP "-i or --ignore-case"
+(If the terminal does not have the ability to scroll backward, -h0 is implied.)
+.It Fl i | -ignore-case
 Causes searches to ignore case; that is,
 uppercase and lowercase are considered identical.
-This option is ignored if any uppercase letters
-appear in the search pattern; 
+This option is ignored if any uppercase letters appear in the search pattern;
 in other words,
 if a pattern contains uppercase letters, then that search does not ignore case.
-.IP "-I or --IGNORE-CASE"
-Like -i, but searches ignore case even if 
-the pattern contains uppercase letters.
-.IP "-j\fIn\fP or --jump-target=\fIn\fP"
-Specifies a line on the screen where the "target" line
-is to be positioned.
-A target line is the object of a text search, 
+.It Fl I | -IGNORE-CASE
+Like -i, but searches ignore case even if the pattern contains uppercase
+letters.
+.It Xo
+.Fl j Ns Ar n |
+.Fl -jump-target Ns No = Ns Ar n
+.Xc
+Specifies a line on the screen where the "target" line is to be positioned.
+A target line is the object of a text search,
 tag search, jump to a line number,
 jump to a file percentage, or jump to a marked position.
 The screen line is specified by a number: the top line on the screen
@@ -587,201 +648,228 @@ to the bottom is -2, and so on.
 If the -j option is used, searches begin at the line immediately
 after the target line.
 For example, if "-j4" is used, the target line is the
-fourth line on the screen, so searches begin at the fifth line
-on the screen.
-.IP "-J or --status-column"
+fourth line on the screen, so searches begin at the fifth line on the screen.
+.It Fl J | -status-column
 Displays a status column at the left edge of the screen.
 The status column shows the lines that matched the current search.
 The status column is also used if the -w or -W option is in effect.
-.IP "-k\fIfilename\fP or --lesskey-file=\fIfilename\fP"
+.It Xo
+.Fl k Ns Ar filename |
+.Fl -lesskey-file Ns No = Ns Ar filename
+.Xc
 Causes
-.I less
+.Nm
 to open and interpret the named file as a
-.I lesskey
-(1) file.
-Multiple -k options may be specified.
-If the LESSKEY or LESSKEY_SYSTEM environment variable is set, or
-if a lesskey file is found in a standard place (see KEY BINDINGS),
-it is also used as a 
-.I lesskey
+.Xr lesskey 1
 file.
-.IP "-L or --no-lessopen"
-Ignore the LESSOPEN environment variable
-(see the INPUT PREPROCESSOR section below).
-This option can be set from within \fIless\fP, 
-but it will apply only to files opened subsequently, not to the 
+Multiple -k options may be specified.
+If the
+.Ev LESSKEY
+or
+.Ev LESSKEY_SYSTEM
+environment variable is set, or if a lesskey file is found in a standard place
+(see
+.Sx KEY BINDINGS ) ,
+it is also used as a lesskey file.
+.It Fl L | -no-lessopen
+Ignore the
+.Ev LESSOPEN
+environment variable (see the
+.Sx INPUT PREPROCESSOR
+section below).
+This option can be set from within
+.Nm less ,
+but it will apply only to files opened subsequently, not to the
 file which is currently open.
 When invoked as
-.IR more ,
-the LESSOPEN environment variable is ignored by default.
-.IP "-m or --long-prompt"
-Causes 
-.I less
-to prompt verbosely (like \fImore\fP),
-with the percent into the file.
+.Nm more ,
+the
+.Ev LESSOPEN
+environment variable is ignored by default.
+.It Fl m | -long-prompt
+Causes
+.Nm
+to prompt verbosely (like more), with the percent into the file.
 By default,
-.I less
+.Nm
 prompts with a colon.
-.IP "-M or --LONG-PROMPT"
-Causes 
-.I less
-to prompt even more verbosely than 
-.I more.
-.IP "-n or --line-numbers"
+.It Fl M | -LONG-PROMPT
+Causes
+.Nm
+to prompt even more verbosely than
+.Nm more .
+.It Fl n | -line-numbers
 Suppresses line numbers.
 The default (to use line numbers) may cause
-.I less
+.Nm
 to run more slowly in some cases, especially with a very large input file.
 Suppressing line numbers with the -n option will avoid this problem.
 Using line numbers means: the line number will be displayed in the verbose
-prompt and in the = command,
-and the v command will pass the current line number to the editor
-(see also the discussion of LESSEDIT in PROMPTS below).
-.IP "-N or --LINE-NUMBERS"
-Causes a line number to be displayed at the beginning of
-each line in the display.
-.IP "-o\fIfilename\fP or --log-file=\fIfilename\fP"
+prompt and in the = command, and the v command will pass the current line
+number to the editor (see also the discussion of LESSEDIT in
+.Sx PROMPTS
+below).
+.It Fl N | -LINE-NUMBERS
+Causes a line number to be displayed at the beginning of each line in the
+display.
+.It Xo
+.Fl o Ns Ar filename |
+.Fl -log-file Ns No = Ns Ar filename
+.Xc
 Causes
-.I less
+.Nm
 to copy its input to the named file as it is being viewed.
-This applies only when the input file is a pipe,
-not an ordinary file.
-If the file already exists, 
-.I less
+This applies only when the input file is a pipe, not an ordinary file.
+If the file already exists,
+.Nm
 will ask for confirmation before overwriting it.
-.IP "-O\fIfilename\fP or --LOG-FILE=\fIfilename\fP"
+.It Xo
+.Fl O Ns Ar filename |
+.Fl -LOG-FILE Ns No = Ns Ar filename
+.Xc
 The -O option is like -o, but it will overwrite an existing
 file without asking for confirmation.
-.sp
+.Pp
 If no log file has been specified,
-the -o and -O options can be used from within 
-.I less
+the -o and -O options can be used from within
+.Nm
 to specify a log file.
 Without a file name, they will simply report the name of the log file.
 The "s" command is equivalent to specifying -o from within
-.I less.
-.IP "-p\fIpattern\fP or --pattern=\fIpattern\fP"
-The -p option on the command line is equivalent to 
-specifying +/\fIpattern\fP;
+.Nm less .
+.It Xo
+.Fl p Ns Ar pattern |
+.Fl -pattern Ns No = Ns Ar pattern
+.Xc
+The -p option on the command line is equivalent to specifying +/pattern;
 that is, it tells
-.I less
-to start at the first occurrence of \fIpattern\fP in the file.
-.IP "-P\fIprompt\fP or --prompt=\fIprompt\fP"
-Provides a way to tailor the three prompt
-styles to your own preference.
-This option would normally be put in the LESS environment
-variable, rather than being typed in with each 
-.I less
+.Nm
+to start at the first occurrence of pattern in the file.
+.It Xo
+.Fl P Ns Ar prompt |
+.Fl -prompt Ns No = Ns Ar prompt
+.Xc
+Provides a way to tailor the three prompt styles to your own preference.
+This option would normally be put in the
+.Ev LESS
+environment variable, rather than being typed in with each
+.Nm
 command.
-Such an option must either be the last option in the LESS variable,
-or be terminated by a dollar sign.
--Ps followed by a string changes the default (short) prompt 
-to that string.
+Such an option must either be the last option in the
+.Ev LESS
+variable, or be terminated by a dollar sign.
+-Ps followed by a string changes the default (short) prompt to that string.
 -Pm changes the medium (-m) prompt.
 -PM changes the long (-M) prompt.
 -Ph changes the prompt for the help screen.
 -P= changes the message printed by the = command.
 -Pw changes the message printed while waiting for data (in the F command).
-All prompt strings consist of a sequence of 
-letters and special escape sequences.
-See the section on PROMPTS for more details.
-.IP "-q or --quiet or --silent"
+All prompt strings consist of a sequence of letters and special escape
+sequences.
+See the section on
+.Sx PROMPTS
+for more details.
+.It Fl q | -quiet | -silent
 Causes moderately "quiet" operation:
-the terminal bell is not rung 
-if an attempt is made to scroll past the end of the file
-or before the beginning of the file.
+the terminal bell is not rung if an attempt is made to scroll past the end
+of the file or before the beginning of the file.
 If the terminal has a "visual bell", it is used instead.
 The bell will be rung on certain other errors,
 such as typing an invalid character.
 The default is to ring the terminal bell in all such cases.
-.IP "-Q or --QUIET or --SILENT"
-Causes totally "quiet" operation:
-the terminal bell is never rung.
-.IP "-r or --raw-control-chars"
+.It Fl Q | -QUIET | -SILENT
+Causes totally "quiet" operation: the terminal bell is never rung.
+.It Fl r | -raw-control-chars
 Causes "raw" control characters to be displayed.
 The default is to display control characters using the caret notation;
 for example, a control-A (octal 001) is displayed as "^A".
 Warning: when the -r option is used,
-.I less
+.Nm
 cannot keep track of the actual appearance of the screen
 (since this depends on how the screen responds to
 each type of control character).
 Thus, various display problems may result,
 such as long lines being split in the wrong place.
-.IP "-R or --RAW-CONTROL-CHARS"
+.It Fl R | -RAW-CONTROL-CHARS
 Like -r, but tries to keep track of the screen appearance where possible.
 This works only if the input consists of normal text and possibly some
 ANSI "color" escape sequences, which are sequences of the form:
-.sp
+.Pp
 	ESC [ ... m
-.sp
+.Pp
 where the "..." is zero or more characters other than "m".
 For the purpose of keeping track of screen appearance,
 all control characters and all ANSI color escape sequences are
 assumed to not move the cursor.
 You can make
-.I less
+.Nm
 think that characters other than "m" can end ANSI color escape sequences
-by setting the environment variable LESSANSIENDCHARS to the list of
-characters which can end a color escape sequence.
-.IP "-s or --squeeze-blank-lines"
+by setting the environment variable
+.Ev LESSANSIENDCHARS
+to the list of characters which can end a color escape sequence.
+.It Fl s | -squeeze-blank-lines
 Causes consecutive blank lines to be squeezed into a single blank line.
 This is useful when viewing
-.I nroff
+.Xr nroff 1
 output.
-.IP "-S or --chop-long-lines"
-Causes lines longer than the screen width to be
-chopped rather than folded.
+.It Fl S | -chop-long-lines
+Causes lines longer than the screen width to be chopped rather than folded.
 That is, the portion of a long line that does not fit in
 the screen width is not shown.
 The default is to fold long lines; that is, display the remainder
 on the next line.
-.IP "-t\fItag\fP or --tag=\fItag\fP"
+.It Xo
+.Fl t Ns Ar tag |
+.Fl -tag Ns No = Ns Ar tag
+.Xc
 The -t option, followed immediately by a TAG,
 will edit the file containing that tag.
 For this to work, tag information must be available;
 for example, there may be a file in the current directory called "tags",
-which was previously built by 
-.I ctags
-(1) or an equivalent command.
-If the environment variable LESSGLOBALTAGS is set, it is taken to be
-the name of a command compatible with 
-.I global
-(1), and that command is executed to find the tag.
+which was previously built by
+.Xr ctags 1
+or an equivalent command.
+If the environment variable
+.Ev LESSGLOBALTAGS
+is set, it is taken to be the name of a command compatible with
+.Xr global ,
+and that command is executed to find the tag.
 (See http://www.gnu.org/software/global/global.html).
-The -t option may also be specified from within 
-.I less 
+The -t option may also be specified from within
+.Nm
 (using the \- command) as a way of examining a new file.
 The command ":t" is equivalent to specifying -t from within
-.I less.
-.IP "-T\fItagsfile\fP or --tag-file=\fItagsfile\fP"
+.Nm less .
+.It Xo
+.Fl T Ns Ar tagsfile |
+.Fl -tag-file Ns No = Ns Ar tagsfile
+.Xc
 Specifies a tags file to be used instead of "tags".
-.IP "-u or --underline-special"
+.It Fl u | -underline-special
 Causes backspaces and carriage returns to be treated as printable characters;
 that is, they are sent to the terminal when they appear in the input.
-.IP "-U or --UNDERLINE-SPECIAL"
-Causes backspaces, tabs and carriage returns to be 
+.It Fl U | -UNDERLINE-SPECIAL
+Causes backspaces, tabs and carriage returns to be
 treated as control characters;
 that is, they are handled as specified by the -r option.
-.sp
-By default, if neither -u nor -U is given,
-backspaces which appear adjacent to an underscore character
-are treated specially:
-the underlined text is displayed 
+.Pp
+By default, if neither -u nor -U is given, backspaces which appear adjacent
+to an underscore character are treated specially:
+the underlined text is displayed
 using the terminal's hardware underlining capability.
 Also, backspaces which appear between two identical characters
-are treated specially: 
-the overstruck text is printed 
+are treated specially:
+the overstruck text is printed
 using the terminal's hardware boldface capability.
 Other backspaces are deleted, along with the preceding character.
 Carriage returns immediately followed by a newline are deleted.
-other carriage returns are handled as specified by the -r option.
+Other carriage returns are handled as specified by the -r option.
 Text which is overstruck or underlined can be searched for
 if neither -u nor -U is in effect.
-.IP "-V or --version"
-Displays the version number of 
-.I less.
-.IP "-w or --hilite-unread"
+.It Fl V | -version
+Displays the version number of
+.Nm less .
+.It Fl w | -hilite-unread
 Temporarily highlights the first "new" line after a forward movement
 of a full page.
 The first "new" line is the line immediately following the line previously
@@ -790,49 +878,61 @@ Also highlights the target line after a g or p command.
 The highlight is removed at the next command which causes movement.
 The entire line is highlighted, unless the -J option is in effect,
 in which case only the status column is highlighted.
-.IP "-W or --HILITE-UNREAD"
-Like -w, but temporarily highlights the first new line after any 
+.It Fl W | -HILITE-UNREAD
+Like -w, but temporarily highlights the first new line after any
 forward movement command larger than one line.
-.IP "-x\fIn\fP,... or --tabs=\fIn\fP,..."
+.It Xo
+.Fl x Ns Ar n,... |
+.Fl -tabs Ns No = Ns Ar n,...
+.Xc
 Sets tab stops.
-If only one \fIn\fP is specified, tab stops are set at multiples of \fIn\fP.
-If multiple values separated by commas are specified, tab stops
-are set at those positions, and then continue with the same spacing as the
-last two.
-For example, \fI-x9,17\fP will set tabs at positions 9, 17, 25, 33, etc.
-The default for \fIn\fP is 8.
-.IP "-X or --no-init"
+If only one n is specified, tab stops are set at multiples of n.
+If multiple values separated by commas are specified, tab stops are set at
+those positions, and then continue with the same spacing as the last two.
+For example, -x9,17 will set tabs at positions 9, 17, 25, 33, etc.
+The default for n is 8.
+.It Fl X | -no-init
 Disables sending the termcap initialization and deinitialization strings
 to the terminal.
 This is sometimes desirable if the deinitialization string does
 something unnecessary, like clearing the screen.
-.IP "--no-keypad"
+.It Fl -no-keypad
 Disables sending the keypad initialization and deinitialization strings
 to the terminal.
 This is sometimes useful if the keypad strings make the numeric
 keypad behave in an undesirable manner.
-.IP "-y\fIn\fP or --max-forw-scroll=\fIn\fP"
+.It Xo
+.Fl y Ns Ar n |
+.Fl -max-forw-scroll Ns No = Ns Ar n
+.Xc
 Specifies a maximum number of lines to scroll forward.
-If it is necessary to scroll forward more than \fIn\fP lines,
+If it is necessary to scroll forward more than n lines,
 the screen is repainted instead.
 The -c or -C option may be used to repaint from the top of
 the screen if desired.
 By default, any forward movement causes scrolling.
-.IP "-[z]\fIn\fP or --window=\fIn\fP"
-Changes the default scrolling window size to \fIn\fP lines.
+.It Xo
+.Fl Oo Cm z Oc Ns Ar n |
+.Fl -window Ns No = Ns Ar n
+.Xc
+Changes the default scrolling window size to n lines.
 The default is one screenful.
 The z and w commands can also be used to change the window size.
 The "z" may be omitted for compatibility with
-.I more.
+.Nm more .
 If the number
-.I n
-is negative, it indicates 
-.I n
+.Ar n
+is negative, it indicates
+.Ar n
 lines less than the current screen size.
-For example, if the screen is 24 lines, \fI-z-4\fP sets the 
-scrolling window to 20 lines.  If the screen is resized to 40 lines,
+For example, if the screen is 24 lines, -z-4 sets the
+scrolling window to 20 lines.
+If the screen is resized to 40 lines,
 the scrolling window automatically changes to 36 lines.
-.IP "-\fI\(dqcc\fP\ or\ --quotes=\fIcc\fP"
+.It Xo
+.Ar -cc |
+.Fl -quotes Ns No = Ns Ar cc
+.Xc
 Changes the filename quoting character.
 This may be necessary if you are trying to name a file
 which contains both spaces and quote characters.
@@ -846,326 +946,331 @@ Filenames containing a space should then be preceded by the open quote
 character and followed by the close quote character.
 Note that even after the quote characters are changed, this option
 remains -" (a dash followed by a double quote).
-.IP "-~ or --tilde"
+.It Fl ~ | -tilde
 Normally lines after end of file are displayed as a single tilde (~).
 This option causes lines after end of file to be displayed as blank lines.
-.IP "-# or --shift"
+.It Fl # | -shift
 Specifies the default number of positions to scroll horizontally
 in the RIGHTARROW and LEFTARROW commands.
 If the number specified is zero, it sets the default number of
 positions to one half of the screen width.
-.IP --
+.It Fl -
 A command line argument of "--" marks the end of option arguments.
 Any arguments following this are interpreted as filenames.
 This can be useful when viewing a file whose name begins with a "-" or "+".
-.IP +
-If a command line option begins with \fB+\fP,
+.It Cm +
+If a command line option begins with +,
 the remainder of that option is taken to be an initial command to
-.I less.
+.Nm less .
 For example, +G tells
-.I less
+.Nm
 to start at the end of the file rather than the beginning,
 and +/xyz tells it to start at the first occurrence of "xyz" in the file.
-As a special case, +<number> acts like +<number>g; 
+As a special case, +<number> acts like +<number>g;
 that is, it starts the display at the specified line number
 (however, see the caveat under the "g" command above).
 If the option starts with ++, the initial command applies to
 every file being viewed, not just the first one.
 The + command described previously
 may also be used to set (or change) an initial command for every file.
-
-.SH "LINE EDITING"
+.El
+.Sh LINE EDITING
 When entering command line at the bottom of the screen
 (for example, a filename for the :e command,
 or the pattern for a search command),
 certain keys can be used to manipulate the command line.
 Most commands have an alternate form in [ brackets ] which can be used if
-a key does not exist on a particular keyboard. 
-(The bracketed forms do not work in the MS-DOS version.)
+a key does not exist on a particular keyboard.
+.\" (The bracketed forms do not work in the MS-DOS version.)
 Any of these special keys may be entered literally by preceding
 it with the "literal" character, either ^V or ^A.
 A backslash itself may also be entered literally by entering two backslashes.
-.IP "LEFTARROW [ ESC-h ]"
+.Pp
+.Bl -tag -width Ds
+.It LEFTARROW [ ESC-h ]
 Move the cursor one space to the left.
-.IP "RIGHTARROW [ ESC-l ]"
+.It RIGHTARROW [ ESC-l ]
 Move the cursor one space to the right.
-.IP "^LEFTARROW [ ESC-b or ESC-LEFTARROW ]"
+.It ^LEFTARROW [ ESC-b or ESC-LEFTARROW ]
 (That is, CONTROL and LEFTARROW simultaneously.)
 Move the cursor one word to the left.
-.IP "^RIGHTARROW [ ESC-w or ESC-RIGHTARROW ]"
+.It ^RIGHTARROW [ ESC-w or ESC-RIGHTARROW ]
 (That is, CONTROL and RIGHTARROW simultaneously.)
 Move the cursor one word to the right.
-.IP "HOME [ ESC-0 ]"
+.It HOME [ ESC-0 ]
 Move the cursor to the beginning of the line.
-.IP "END [ ESC-$ ]"
+.It END [ ESC-$ ]
 Move the cursor to the end of the line.
-.IP "BACKSPACE"
+.It BACKSPACE
 Delete the character to the left of the cursor,
 or cancel the command if the command line is empty.
-.IP "DELETE or [ ESC-x ]"
+.It DELETE or [ ESC-x ]
 Delete the character under the cursor.
-.IP "^BACKSPACE [ ESC-BACKSPACE ]"
+.It ^BACKSPACE [ ESC-BACKSPACE ]
 (That is, CONTROL and BACKSPACE simultaneously.)
 Delete the word to the left of the cursor.
-.IP "^DELETE [ ESC-X or ESC-DELETE ]"
+.It ^DELETE [ ESC-X or ESC-DELETE ]
 (That is, CONTROL and DELETE simultaneously.)
 Delete the word under the cursor.
-.IP "UPARROW [ ESC-k ]"
+.It UPARROW [ ESC-k ]
 Retrieve the previous command line.
-.IP "DOWNARROW [ ESC-j ]"
+.It DOWNARROW [ ESC-j ]
 Retrieve the next command line.
-.IP "TAB"
+.It TAB
 Complete the partial filename to the left of the cursor.
 If it matches more than one filename, the first match
 is entered into the command line.
-Repeated TABs will cycle thru the other matching filenames.
+Repeated TABs will cycle through the other matching filenames.
 If the completed filename is a directory, a "/" is appended to the filename.
-(On MS-DOS systems, a "\e" is appended.)
-The environment variable LESSSEPARATOR can be used to specify a 
-different character to append to a directory name.
-.IP "BACKTAB [ ESC-TAB ]"
-Like, TAB, but cycles in the reverse direction thru the matching filenames.
-.IP "^L"
+.\" (On MS-DOS systems, a "\e" is appended.)
+The environment variable
+.Ev LESSSEPARATOR
+can be used to specify a different character to append to a directory name.
+.It BACKTAB [ ESC-TAB ]
+Like TAB, but cycles in the reverse direction through the matching filenames.
+.It ^L
 Complete the partial filename to the left of the cursor.
 If it matches more than one filename, all matches are entered into
 the command line (if they fit).
-.IP "^U (Unix and OS/2) or ESC (MS-DOS)"
+.\" .It ^U (Unix and OS/2) or ESC (MS-DOS)
+.It ^U
 Delete the entire command line,
 or cancel the command if the command line is empty.
-If you have changed your line-kill character in Unix to something
+If you have changed your line-kill character to something
 other than ^U, that character is used instead of ^U.
-
-.SH "KEY BINDINGS"
-You may define your own 
-.I less
-commands by using the program 
-.I lesskey
-(1)
+.El
+.Sh KEY BINDINGS
+You may define your own
+.Nm
+commands by using the program
+.Xr lesskey 1
 to create a lesskey file.
 This file specifies a set of command keys and an action
 associated with each key.
-You may also use
-.I lesskey
-to change the line-editing keys (see LINE EDITING),
+You may also use lesskey
+to change the line-editing keys (see
+.Sx LINE EDITING ) ,
 and to set environment variables.
-If the environment variable LESSKEY is set,
-.I less
+If the environment variable
+.Ev LESSKEY
+is set,
+.Nm
 uses that as the name of the lesskey file.
-Otherwise, 
-.I less
-looks in a standard place for the lesskey file:
-On Unix systems,
-.I less
+Otherwise,
+.Nm
 looks for a lesskey file called "$HOME/.less".
-On MS-DOS and Windows systems,
-.I less
-looks for a lesskey file called "$HOME/_less", and if it is not found there,
-then looks for a lesskey file called "_less" in any directory specified
-in the PATH environment variable.
-On OS/2 systems,
-.I less
-looks for a lesskey file called "$HOME/less.ini", and if it is not found,
-then looks for a lesskey file called "less.ini" in any directory specified
-in the INIT environment variable, and if it not found there,
-then looks for a lesskey file called "less.ini" in any directory specified
-in the PATH environment variable.
+.\" On MS-DOS and Windows systems,
+.\" .I less
+.\" looks for a lesskey file called "$HOME/_less", and if it is not found there,
+.\" then looks for a lesskey file called "_less" in any directory specified
+.\" in the PATH environment variable.
+.\" On OS/2 systems,
+.\" .I less
+.\" looks for a lesskey file called "$HOME/less.ini", and if it is not found,
+.\" then looks for a lesskey file called "less.ini" in any directory specified
+.\" in the INIT environment variable, and if it not found there,
+.\" then looks for a lesskey file called "less.ini" in any directory specified
+.\" in the PATH environment variable.
 See the
-.I lesskey
+.Xr lesskey 1
 manual page for more details.
-.P
+.Pp
 A system-wide lesskey file may also be set up to provide key bindings.
 If a key is defined in both a local lesskey file and in the
-system-wide file, key bindings in the local file take precedence over 
+system-wide file, key bindings in the local file take precedence over
 those in the system-wide file.
-If the environment variable LESSKEY_SYSTEM is set,
-.I less
+If the environment variable
+.Ev LESSKEY_SYSTEM
+is set,
+.Nm
 uses that as the name of the system-wide lesskey file.
 Otherwise,
-.I less 
+.Nm
 looks in a standard place for the system-wide lesskey file:
-On Unix systems, the system-wide lesskey file is /usr/local/etc/sysless.
-(However, if 
-.I less 
-was built with a different sysconf directory than /usr/local/etc,
-that directory is where the sysless file is found.)
-On MS-DOS and Windows systems, the system-wide lesskey file is c:\e_sysless.
-On OS/2 systems, the system-wide lesskey file is c:\esysless.ini.
-
-.SH "INPUT PREPROCESSOR"
-You may define an "input preprocessor" for 
-.I less.
+On
+.Ox ,
+the system-wide lesskey file is
+.Pa /etc/sysless .
+.\" On Unix systems, the system-wide lesskey file is /usr/local/etc/sysless.
+.\" (However, if
+.\" .Nm less
+.\" was built with a different sysconf directory than /usr/local/etc,
+.\" that directory is where the sysless file is found.)
+.\" On MS-DOS and Windows systems, the system-wide lesskey file is c:\e_sysless.
+.\" On OS/2 systems, the system-wide lesskey file is c:\esysless.ini.
+.Sh INPUT PREPROCESSOR
+You may define an "input preprocessor" for
+.Nm less .
 Before
-.I less
+.Nm less
 opens a file, it first gives your input preprocessor a chance to modify the
 way the contents of the file are displayed.
 An input preprocessor is simply an executable program (or shell script),
 which writes the contents of the file to a different file,
 called the replacement file.
-The contents of the replacement file are then displayed 
+The contents of the replacement file are then displayed
 in place of the contents of the original file.
 However, it will appear to the user as if the original file is opened;
-that is, 
-.I less
+that is,
+.Nm less
 will display the original filename as the name of the current file.
-.PP
+.Pp
 An input preprocessor receives one command line argument, the original filename,
 as entered by the user.
-It should create the replacement file, and when finished,
+It should create the replacement file, and when finished
 print the name of the replacement file to its standard output.
-If the input preprocessor does not output a replacement filename, 
-.I less
+If the input preprocessor does not output a replacement filename,
+.Nm
 uses the original file, as normal.
 The input preprocessor is not called when viewing standard input.
-To set up an input preprocessor, set the LESSOPEN environment variable
-to a command line which will invoke your input preprocessor.
-This command line should include one occurrence of the string "%s", 
+To set up an input preprocessor, set the
+.Ev LESSOPEN
+environment variable to a command line which will invoke your
+input preprocessor.
+This command line should include one occurrence of the string "%s",
 which will be replaced by the filename
 when the input preprocessor command is invoked.
-.PP
-When 
-.I less
+.Pp
+When
+.Nm
 closes a file opened in such a way, it will call another program,
 called the input postprocessor,
 which may perform any desired clean-up action (such as deleting the
-replacement file created by LESSOPEN).
+replacement file created by
+.Ev LESSOPEN ) .
 This program receives two command line arguments, the original filename
 as entered by the user, and the name of the replacement file.
-To set up an input postprocessor, set the LESSCLOSE environment variable 
-to a command line which will invoke your input postprocessor.
-It may include two occurrences of the string "%s"; 
-the first is replaced with the original name of the file and 
-the second with the name of the replacement file, 
-which was output by LESSOPEN.
-.PP
-For example, on many Unix systems, these two scripts will allow you
+To set up an input postprocessor, set the
+.Ev LESSCLOSE
+environment variable to a command line which will invoke your
+input postprocessor.
+It may include two occurrences of the string "%s";
+the first is replaced with the original name of the file and the second
+with the name of the replacement file, which was output by
+.Ev LESSOPEN .
+.Pp
+For example, these two scripts will allow you
 to keep files in compressed format, but still let
-.I less
+.Nm
 view them directly:
-.PP
+.Pp
 lessopen.sh:
-.br
-	#! /bin/sh
-.br
-	case "$1" in
-.br
-	*.Z)	uncompress -c $1  >/tmp/less.$$  2>/dev/null
-.br
-		if [ -s /tmp/less.$$ ]; then 
-.br
-			echo /tmp/less.$$
-.br
-		else
-.br
-			rm -f /tmp/less.$$
-.br
-		fi
-.br
-		;;
-.br
-	esac
-.PP
+.Bd -literal -offset indent
+#! /bin/sh
+case "$1" in
+*.Z)	uncompress -c $1  >/tmp/less.$$  2>/dev/null
+	if [ -s /tmp/less.$$ ]; then
+		echo /tmp/less.$$
+	else
+		rm -f /tmp/less.$$
+	fi
+	;;
+esac
+.Ed
+.Pp
 lessclose.sh:
-.br
-	#! /bin/sh
-.br
-	rm $2
-.PP
+.Bd -literal -offset indent
+#! /bin/sh
+rm $2
+.Ed
+.Pp
 To use these scripts, put them both where they can be executed and
-set LESSOPEN="lessopen.sh\ %s", and
-LESSCLOSE="lessclose.sh\ %s\ %s".
+set LESSOPEN="lessopen.sh\ %s", and LESSCLOSE="lessclose.sh\ %s\ %s".
 More complex LESSOPEN and LESSCLOSE scripts may be written
 to accept other types of compressed files, and so on.
-.PP
+.Pp
 It is also possible to set up an input preprocessor to
-pipe the file data directly to 
-.I less,
+pipe the file data directly to
+.Nm less ,
 rather than putting the data into a replacement file.
-This avoids the need to decompress the entire file before 
-starting to view it.
+This avoids the need to decompress the entire file before starting to view it.
 An input preprocessor that works this way is called an input pipe.
 An input pipe, instead of writing the name of a replacement file on
 its standard output,
 writes the entire contents of the replacement file on its standard output.
 If the input pipe does not write any characters on its standard output,
-then there is no replacement file and 
-.I less
+then there is no replacement file and
+.Nm
 uses the original file, as normal.
-To use an input pipe,
-make the first character in the LESSOPEN environment variable a 
-vertical bar (|) to signify that the input preprocessor is an input pipe.
-.PP
-For example, on many Unix systems, this script will work like the
-previous example scripts:
-.PP
+To use an input pipe, make the first character in the
+.Ev LESSOPEN
+environment variable a vertical bar (|) to signify that the
+input preprocessor is an input pipe.
+.Pp
+For example, this script will work like the previous example scripts:
+.Pp
 lesspipe.sh:
-.br
-	#! /bin/sh
-.br
-	case "$1" in
-.br
-	*.Z)	uncompress -c $1  2>/dev/null
-.br
-		;;
-.br
-	esac
-.br
-.PP
+.Bd -literal -offset indent
+#! /bin/sh
+case "$1" in
+*.Z)	uncompress -c $1  2>/dev/null
+	;;
+esac
+.Ed
+.Pp
 To use this script, put it where it can be executed and set
 LESSOPEN="|lesspipe.sh %s".
 When an input pipe is used, a LESSCLOSE postprocessor can be used,
-but it is usually not necessary since there is no replacement file
-to clean up.
+but it is usually not necessary since there is no replacement file to clean up.
 In this case, the replacement file name passed to the LESSCLOSE
 postprocessor is "-".
-
-.SH "NATIONAL CHARACTER SETS"
+.Sh NATIONAL CHARACTER SETS
 There are three types of characters in the input file:
-.IP "normal characters"
-can be displayed directly to the screen.
-.IP "control characters"
-should not be displayed directly, but are expected to be found
+.Bl -tag -width "control characters"
+.It normal characters
+Can be displayed directly to the screen.
+.It control characters
+Should not be displayed directly, but are expected to be found
 in ordinary text files (such as backspace and tab).
-.IP "binary characters"
-should not be displayed directly and are not expected to be found
+.It binary characters
+Should not be displayed directly and are not expected to be found
 in text files.
-.PP
+.El
+.Pp
 A "character set" is simply a description of which characters are to
 be considered normal, control, and binary.
-The LESSCHARSET environment variable may be used to select a character set.
-Possible values for LESSCHARSET are:
-.IP ascii
+The
+.Ev LESSCHARSET
+environment variable may be used to select a character set.
+Possible values for
+.Ev LESSCHARSET
+are:
+.Bl -tag -width "IBM-1047"
+.It ascii
 BS, TAB, NL, CR, and formfeed are control characters,
 all chars with values between 32 and 126 are normal,
 and all others are binary.
-.IP iso8859
+.It iso8859
 Selects an ISO 8859 character set.
 This is the same as ASCII, except characters between 160 and 255 are
 treated as normal characters.
-.IP latin1
+.It latin1
 Same as iso8859.
-.IP latin9
+.It latin9
 Same as iso8859.
-.IP dos
+.It dos
 Selects a character set appropriate for MS-DOS.
-.IP ebcdic
+.It ebcdic
 Selects an EBCDIC character set.
-.IP IBM-1047
+.It IBM-1047
 Selects an EBCDIC character set used by OS/390 Unix Services.
-This is the EBCDIC analogue of latin1.  You get similar results
-by setting either LESSCHARSET=IBM-1047 or LC_CTYPE=en_US
-in your environment.
-.IP koi8-r
+This is the EBCDIC analogue of latin1.
+You get similar results by setting either LESSCHARSET=IBM-1047 or
+LC_CTYPE=en_US in your environment.
+.It koi8-r
 Selects a Russian character set.
-.IP next
+.It next
 Selects a character set appropriate for NeXT computers.
-.IP utf-8
+.It utf-8
 Selects the UTF-8 encoding of the ISO 10646 character set.
-.PP
+.El
+.Pp
 In special cases, it may be desired to tailor
-.I less
+.Nm
 to use a character set other than the ones definable by LESSCHARSET.
-In this case, the environment variable LESSCHARDEF can be used
-to define a character set.
+In this case, the environment variable
+.Ev LESSCHARDEF
+can be used to define a character set.
 It should be set to a string where each character in the string represents
 one character in the character set.
 The character "." is used for a normal character, "c" for control,
@@ -1175,56 +1280,55 @@ For example, "bccc4b." would mean character 0 is binary,
 1, 2 and 3 are control, 4, 5, 6 and 7 are binary, and 8 is normal.
 All characters after the last are taken to be the same as the last,
 so characters 9 through 255 would be normal.
-(This is an example, and does not necessarily 
+(This is an example, and does not necessarily
 represent any real character set.)
-.PP
+.Pp
 This table shows the value of LESSCHARDEF which is equivalent
 to each of the possible values for LESSCHARSET:
-.sp
-	ascii\ 	8bcccbcc18b95.b
-.br
-	dos\ \ \ 	8bcccbcc12bc5b95.b.
-.br
-	ebcdic	5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b
-.br
-	\ \ \ \ \ \ 	9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b.
-.br
-	IBM-1047	4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc
-.br
-	\ \ \ \ \ \ 	191.b
-.br
-	iso8859	8bcccbcc18b95.33b.
-.br
-	koi8-r	8bcccbcc18b95.b128.
-.br
-	latin1	8bcccbcc18b95.33b.
-.br
-	next\ \ 	8bcccbcc18b95.bb125.bb
-.PP
+.Pp
+.Bd -literal -offset indent
+ascii		8bcccbcc18b95.b
+dos		8bcccbcc12bc5b95.b.
+ebcdic		5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b
+		9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b.
+IBM-1047	4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc
+		191.b
+iso8859		8bcccbcc18b95.33b.
+koi8-r		8bcccbcc18b95.b128.
+latin1		8bcccbcc18b95.33b.
+next		8bcccbcc18b95.bb125.bb
+.Ed
+.Pp
 If neither LESSCHARSET nor LESSCHARDEF is set,
-but the string "UTF-8" is found in the LC_ALL, LC_TYPE or LANG
+but the string "UTF-8" is found in the
+.Ev LC_ALL , LC_TYPE
+or
+.Ev LANG
 environment variables, then the default character set is utf-8.
-.PP
+.Pp
 If that string is not found, but your system supports the
-.I setlocale
-interface,
-.I less
+setlocale interface,
+.Nm
 will use setlocale to determine the character set.
-setlocale is controlled by setting the LANG or LC_CTYPE environment
-variables.
-.PP
+setlocale is controlled by setting the
+.Ev LANG
+or
+.Ev LC_CTYPE
+environment variables.
+.Pp
 Finally, if the
-.I setlocale
-interface is also not available, the default character set is latin1.
-.PP
+setlocale interface is also not available, the default character set is latin1.
+.Pp
 Control and binary characters are displayed in standout (reverse video).
 Each such character is displayed in caret notation if possible
-(e.g. ^A for control-A).  Caret notation is used only if 
-inverting the 0100 bit results in a normal printable character.
+(e.g. ^A for control-A).
+Caret notation is used only if inverting the 0100 bit results in a
+normal printable character.
 Otherwise, the character is displayed as a hex number in angle brackets.
-This format can be changed by 
-setting the LESSBINFMT environment variable.
-LESSBINFMT may begin with a "*" and one character to select 
+This format can be changed by setting the
+.Ev LESSBINFMT
+environment variable.
+LESSBINFMT may begin with a "*" and one character to select
 the display attribute:
 "*k" is blinking, "*d" is bold, "*u" is underlined, "*s" is standout,
 and "*n" is normal.
@@ -1234,73 +1338,87 @@ printf-style escape sequence (a % followed by x, X, o, d, etc.).
 For example, if LESSBINFMT is "*u[%x]", binary characters
 are displayed in underlined hexadecimal surrounded by brackets.
 The default if no LESSBINFMT is specified is "*s<%X>".
-
-.SH "PROMPTS"
+.Sh PROMPTS
 The -P option allows you to tailor the prompt to your preference.
 The string given to the -P option replaces the specified prompt string.
 Certain characters in the string are interpreted specially.
 The prompt mechanism is rather complicated to provide flexibility,
 but the ordinary user need not understand the details of constructing
 personalized prompt strings.
-.sp
+.Pp
 A percent sign followed by a single character is expanded
 according to what the following character is:
-.IP "%b\fIX\fP"
+.Bl -tag -width Ds
+.It %b Ns Ar X
 Replaced by the byte offset into the current input file.
-The b is followed by a single character (shown as \fIX\fP above)
-which specifies the line whose byte offset is to be used.
+The b is followed by a single character (shown as
+.Ar X
+above) which specifies the line whose byte offset is to be used.
 If the character is a "t", the byte offset of the top line in the
 display is used,
 an "m" means use the middle line,
 a "b" means use the bottom line,
 a "B" means use the line just after the bottom line,
 and a "j" means use the "target" line, as specified by the -j option.
-.IP "%B"
+.It %B
 Replaced by the size of the current input file.
-.IP "%c"
+.It %c
 Replaced by the column number of the text appearing in the first
 column of the screen.
-.IP "%d\fIX\fP"
+.It %d Ns Ar X
 Replaced by the page number of a line in the input file.
-The line to be used is determined by the \fIX\fP, as with the %b option.
-.IP "%D"
+The line to be used is determined by the
+.Ar X ,
+as with the %b option.
+.It %D
 Replaced by the number of pages in the input file,
 or equivalently, the page number of the last line in the input file.
-.IP "%E"
-Replaced by the name of the editor (from the VISUAL environment variable,
-or the EDITOR environment variable if VISUAL is not defined).
+.It %E
+Replaced by the name of the editor (from the
+.Ev VISUAL
+environment variable, or the
+.Ev EDITOR
+environment variable if
+.Ev VISUAL
+is not defined).
 See the discussion of the LESSEDIT feature below.
-.IP "%f"
+.It %f
 Replaced by the name of the current input file.
-.IP "%i"
+.It %i
 Replaced by the index of the current file in the list of
 input files.
-.IP "%l\fIX\fP"
+.It %l Ns Ar X
 Replaced by the line number of a line in the input file.
-The line to be used is determined by the \fIX\fP, as with the %b option.
-.IP "%L"
+The line to be used is determined by the
+.Ar X ,
+as with the %b option.
+.It %L
 Replaced by the line number of the last line in the input file.
-.IP "%m"
+.It %m
 Replaced by the total number of input files.
-.IP "%p\fIX\fP"
+.It %p Ns Ar X
 Replaced by the percent into the current input file, based on byte offsets.
-The line used is determined by the \fIX\fP as with the %b option.
-.IP "%P\fIX\fP"
+The line used is determined by the
+.Ar X ,
+as with the %b option.
+.It %P Ns Ar X
 Replaced by the percent into the current input file, based on line numbers.
-The line used is determined by the \fIX\fP as with the %b option.
-.IP "%s"
+The line used is determined by the
+.Ar X ,
+as with the %b option.
+.It %s
 Same as %B.
-.IP "%t"
+.It %t
 Causes any trailing spaces to be removed.
 Usually used at the end of the string, but may appear anywhere.
-.IP "%x"
+.It %x
 Replaced by the name of the next input file in the list.
-.PP
-If any item is unknown (for example, the file size if input
-is a pipe), a question mark is printed instead.
-.PP
-The format of the prompt string can be changed
-depending on certain conditions.
+.El
+.Pp
+If any item is unknown (for example, the file size if input is a pipe),
+a question mark is printed instead.
+.Pp
+The format of the prompt string can be changed depending on certain conditions.
 A question mark followed by a single character acts like an "IF":
 depending on the following character, a condition is evaluated.
 If the condition is true, any characters following the question mark
@@ -1308,59 +1426,61 @@ and condition character, up to a period, are included in the prompt.
 If the condition is false, such characters are not included.
 A colon appearing between the question mark and the
 period can be used to establish an "ELSE": any characters between
-the colon and the period are included in the string if and only if
+the colon and the period are included in the string, if and only if
 the IF condition is false.
 Condition characters (which follow a question mark) may be:
-.IP "?a"
+.Bl -tag -width Ds
+.It ?a
 True if any characters have been included in the prompt so far.
-.IP "?b\fIX\fP"
+.It ?b Ns Ar X
 True if the byte offset of the specified line is known.
-.IP "?B"
-True if the size of current input file is known.
-.IP "?c"
+.It ?B
+True if the size of the current input file is known.
+.It ?c
 True if the text is horizontally shifted (%c is not zero).
-.IP "?d\fIX\fP"
+.It ?d Ns Ar X
 True if the page number of the specified line is known.
-.IP "?e"
+.It ?e
 True if at end-of-file.
-.IP "?f"
+.It ?f
 True if there is an input filename
 (that is, if input is not a pipe).
-.IP "?l\fIX\fP"
+.It ?l Ns Ar X
 True if the line number of the specified line is known.
-.IP "?L"
+.It ?L
 True if the line number of the last line in the file is known.
-.IP "?m"
+.It ?m
 True if there is more than one input file.
-.IP "?n"
+.It ?n
 True if this is the first prompt in a new input file.
-.IP "?p\fIX\fP"
+.It ?p Ns Ar X
 True if the percent into the current input file, based on byte offsets,
 of the specified line is known.
-.IP "?P\fIX\fP"
+.It ?P Ns Ar X
 True if the percent into the current input file, based on line numbers,
 of the specified line is known.
-.IP "?s"
+.It ?s
 Same as "?B".
-.IP "?x"
+.It ?x
 True if there is a next input file
 (that is, if the current input file is not the last one).
-.PP
+.El
+.Pp
 Any characters other than the special ones
 (question mark, colon, period, percent, and backslash)
 become literally part of the prompt.
 Any of the special characters may be included in the prompt literally
 by preceding it with a backslash.
-.PP
+.Pp
 Some examples:
-.sp
-?f%f:Standard input.
-.sp
+.Pp
+.Dl ?f%f:Standard input.
+.Pp
 This prompt prints the filename, if known;
 otherwise the string "Standard input".
-.sp
-?f%f .?ltLine %lt:?pt%pt\e%:?btByte %bt:-...
-.sp
+.Pp
+.Dl ?f%f .?ltLine %lt:?pt%pt\e%:?btByte %bt:-...
+.Pp
 This prompt would print the filename, if known.
 The filename is followed by the line number, if known,
 otherwise the percent if known, otherwise the byte offset if known.
@@ -1368,9 +1488,9 @@ Otherwise, a dash is printed.
 Notice how each question mark has a matching period,
 and how the % after the %pt
 is included literally by escaping it with a backslash.
-.sp
-?n?f%f\ .?m(file\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\e:\ %x..%t
-.sp
+.Pp
+.Dl ?n?f%f\ .?m(file\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\e:\ %x..%t
+.Pp
 This prints the filename if this is the first prompt in a file,
 followed by the "file N of N" message if there is more
 than one input file.
@@ -1381,199 +1501,208 @@ This is the default prompt.
 For reference, here are the defaults for
 the other two prompts (-m and -M respectively).
 Each is broken into two lines here for readability only.
-.nf
-.sp
+.Pp
+.Bd -literal -offset indent
 ?n?f%f\ .?m(file\ %i\ of\ %m)\ ..?e(END)\ ?x-\ Next\e:\ %x.:
 	?pB%pB\e%:byte\ %bB?s/%s...%t
-.sp
+
 ?f%f\ .?n?m(file\ %i\ of\ %m)\ ..?ltlines\ %lt-%lb?L/%L.\ :
 	byte\ %bB?s/%s.\ .?e(END)\ ?x-\ Next\e:\ %x.:?pB%pB\e%..%t
-.sp
-.fi
+.Ed
+.Pp
 And here is the default message produced by the = command:
-.nf
-.sp
+.Pp
+.Bd -literal -offset indent
 ?f%f\ .?m(file\ %i\ of\ %m)\ .?ltlines\ %lt-%lb?L/%L.\ .
 	byte\ %bB?s/%s.\ ?e(END)\ :?pB%pB\e%..%t
-.fi
-.PP
+.Ed
+.Pp
 The prompt expansion features are also used for another purpose:
-if an environment variable LESSEDIT is defined, it is used
-as the command to be executed when the v command is invoked.
+if an environment variable
+.Ev LESSEDIT
+is defined, it is used as the command to be executed when the v command
+is invoked.
 The LESSEDIT string is expanded in the same way as the prompt strings.
 The default value for LESSEDIT is:
-.nf
-.sp
-	%E\ ?lm+%lm.\ %f
-.sp
-.fi
+.Pp
+.Dl %E\ ?lm+%lm.\ %f
+.Pp
 Note that this expands to the editor name, followed by a + and the
 line number, followed by the file name.
 If your editor does not accept the "+linenumber" syntax, or has other
-differences in invocation syntax, the LESSEDIT variable can be 
-changed to modify this default.
-
-.SH SECURITY
-When the environment variable LESSSECURE is set to 1,
-.I less
+differences in invocation syntax, the
+.Ev LESSEDIT
+variable can be changed to modify this default.
+.Sh SECURITY
+When the environment variable
+.Ev LESSSECURE
+is set to 1,
+.Nm
 runs in a "secure" mode.
 This means these features are disabled:
-.RS
-.IP "!"
-the shell command
-.IP "|"
-the pipe command
-.IP ":e"
-the examine command.
-.IP "v"
-the editing command
-.IP "s  -o"
-log files
-.IP "-k"
-use of lesskey files
-.IP "-t"
-use of tags files
-.IP " "
-metacharacters in filenames, such as *
-.IP " "
-filename completion (TAB, ^L)
-.RE
-.PP
+.Bl -tag -width Ds
+.It !
+The shell command.
+.It |
+The pipe command.
+.It :e
+The examine command.
+.It v
+The editing command.
+.It s -o
+Log files.
+.It -k
+Use of lesskey files.
+.It -t
+Use of tags files.
+.It " "
+Metacharacters in filenames, such as "*".
+.It " "
+Filename completion (TAB, ^L).
+.El
+.Pp
 Less can also be compiled to be permanently in "secure" mode.
-
-.SH "ENVIRONMENT VARIABLES"
+.Sh ENVIRONMENT VARIABLES
 Environment variables may be specified either in the system environment
-as usual, or in a 
-.I lesskey
-(1) file.
-If environment variables are defined in more than one place, 
+as usual, or in a
+.Xr lesskey 1
+file.
+If environment variables are defined in more than one place,
 variables defined in a local lesskey file take precedence over
 variables defined in the system environment, which take precedence
 over variables defined in the system-wide lesskey file.
-.IP COLUMNS
+.Bl -tag -width Ds
+.It Ev COLUMNS
 Sets the number of columns on the screen.
 Takes precedence over the number of columns specified by the TERM variable.
 (But if you have a windowing system which supports TIOCGWINSZ or WIOCGETD,
 the window system's idea of the screen size takes precedence over the
 LINES and COLUMNS environment variables.)
-.IP EDITOR
+.It Ev EDITOR
 The name of the editor (used for the v command).
-.IP HOME
+.It Ev HOME
 Name of the user's home directory
-(used to find a lesskey file on Unix and OS/2 systems).
-.IP "HOMEDRIVE, HOMEPATH"
-Concatenation of the HOMEDRIVE and HOMEPATH environment variables is
-the name of the user's home directory if the HOME variable is not set
-(only in the Windows version).
-.IP INIT
-Name of the user's init directory (used to find a lesskey file on OS/2 systems).
-.IP LANG
+(used to find a lesskey file).
+.\" .It Ev "HOMEDRIVE, HOMEPATH"
+.\" Concatenation of the HOMEDRIVE and HOMEPATH environment variables is
+.\" the name of the user's home directory if the HOME variable is not set
+.\" (only in the Windows version).
+.\" .It Ev INIT
+.\" Name of the user's init directory
+.\" (used to find a lesskey file on OS/2 systems).
+.It Ev LANG
 Language for determining the character set.
-.IP LC_CTYPE
+.It Ev LC_CTYPE
 Language for determining the character set.
-.IP LESS
-Options which are passed to 
-.I less
+.It Ev LESS
+Options which are passed to
+.Nm
 automatically.
-.IP LESSANSIENDCHARS
+.It Ev LESSANSIENDCHARS
 Characters which are assumed to end an ANSI color escape sequence
 (default "m").
-.IP LESSBINFMT
+.It Ev LESSBINFMT
 Format for displaying non-printable, non-control characters.
-.IP LESSCHARDEF
+.It Ev LESSCHARDEF
 Defines a character set.
-.IP LESSCHARSET
+.It Ev LESSCHARSET
 Selects a predefined character set.
-.IP LESSCLOSE
+.It Ev LESSCLOSE
 Command line to invoke the (optional) input-postprocessor.
-.IP LESSEDIT
+.\" .It Ev LESSECHO
+.\" Name of the lessecho program (default "lessecho").
+.\" The lessecho program is needed to expand metacharacters, such as * and ?,
+.\" in filenames on Unix systems.
+.It Ev LESSEDIT
 Editor prototype string (used for the v command).
-See discussion under PROMPTS.
-.IP LESSGLOBALTAGS
+See discussion under
+.Sx PROMPTS .
+.It Ev LESSGLOBALTAGS
 Name of the command used by the -t option to find global tags.
-Normally should be set to "global" if your system has the
-.I global
-(1) command.  If not set, global tags are not used.
-.IP LESSKEY
+Normally should be set to "global" if your system has the global command.
+If not set, global tags are not used.
+.It Ev LESSKEY
 Name of the default lesskey(1) file.
-.IP LESSKEY_SYSTEM
+.It Ev LESSKEY_SYSTEM
 Name of the default system-wide lesskey(1) file.
-.IP LESSMETACHARS
+.It Ev LESSMETACHARS
 List of characters which are considered "metacharacters" by the shell.
-.IP LESSMETAESCAPE
-Prefix which less will add before each metacharacter in a
-command sent to the shell.
+.It Ev LESSMETAESCAPE
+Prefix which
+.Nm
+will add before each metacharacter in a command sent to the shell.
 If LESSMETAESCAPE is an empty string, commands containing
 metacharacters will not be passed to the shell.
-.IP LESSOPEN
+.It Ev LESSOPEN
 Command line to invoke the (optional) input-preprocessor.
-.IP LESSSECURE
+.It Ev LESSSECURE
 Runs less in "secure" mode.
-See discussion under SECURITY.
-.IP LESSSEPARATOR
+See discussion under
+.Sx SECURITY .
+.It Ev LESSSEPARATOR
 String to be appended to a directory name in filename completion.
-.IP LINES
+.It Ev LINES
 Sets the number of lines on the screen.
 Takes precedence over the number of lines specified by the TERM variable.
 (But if you have a windowing system which supports TIOCGWINSZ or WIOCGETD,
 the window system's idea of the screen size takes precedence over the
 LINES and COLUMNS environment variables.)
-.IP PATH
-User's search path (used to find a lesskey file 
-on MS-DOS and OS/2 systems).
-.IP SHELL
+.\" .It Ev PATH
+.\" User's search path (used to find a lesskey file
+.\" on MS-DOS and OS/2 systems).
+.It Ev SHELL
 The shell used to execute the ! command, as well as to expand filenames.
-.IP TERM
+.It Ev TERM
 The type of terminal on which
-.I less
+.Nm
 is being run.
-.IP VISUAL
+.It Ev VISUAL
 The name of the editor (used for the v command).
-
-.SH "SEE ALSO"
-lesskey(1)
-
-.SH WARNINGS
+.El
+.Sh SEE ALSO
+.Xr lesskey 1
+.Sh WARNINGS
 The = command and prompts (unless changed by -P)
 report the line numbers of the lines at the top and bottom of the screen,
 but the byte and percent of the line after the one at the bottom of the screen.
-.PP
+.Pp
 If the :e command is used to name more than one file,
 and one of the named files has been viewed previously,
 the new files may be entered into the list in an unexpected order.
-.PP
+.Pp
 On certain older terminals (the so-called "magic cookie" terminals),
 search highlighting will cause an erroneous display.
-On such terminals, search highlighting is disabled by default 
+On such terminals, search highlighting is disabled by default
 to avoid possible problems.
-.PP
-In certain cases, when search highlighting is enabled and 
+.Pp
+In certain cases, when search highlighting is enabled and
 a search pattern begins with a ^,
 more text than the matching string may be highlighted.
-(This problem does not occur when less is compiled to use the POSIX
-regular expression package.)
-.PP
+(This problem does not occur when
+.Nm
+is compiled to use the POSIX regular expression package.)
+.Pp
 When viewing text containing ANSI color escape sequences using the -R option,
 searching will not find text containing an embedded escape sequence.
 Also, search highlighting may change the color of some of the text
 which follows the highlighted text.
-.PP
-On some systems,
-.I setlocale
-claims that ASCII characters 0 thru 31 are control characters 
-rather than binary characters.
-This causes 
-.I less 
+.Pp
+On some systems, setlocale claims that ASCII characters 0 through 31 are
+control characters rather than binary characters.
+This causes
+.Nm
 to treat some binary files as ordinary, non-binary files.
 To workaround this problem, set the environment variable
-LESSCHARSET to "ascii" (or whatever character set is appropriate).
-.PP
-See http://www.greenwoodsoftware.com/less for the latest list of known bugs in this
-version of less.
-
-.SH COPYRIGHT
+.Ev LESSCHARSET
+to "ascii" (or whatever character set is appropriate).
+.Pp
+See
+.Pa http://www.greenwoodsoftware.com/less
+for the latest list of known bugs in this version of
+.Nm less .
+.Sh COPYRIGHT
 Copyright (C) 2002  Mark Nudelman
-.PP
+.Pp
 less is part of the GNU project and is free software.
 You can redistribute it and/or modify it
 under the terms of either
@@ -1581,22 +1710,22 @@ under the terms of either
 the Free Software Foundation; or (2) the Less License.
 See the file README in the less distribution for more details
 regarding redistribution.
-You should have received a copy of the GNU General Public License 
+You should have received a copy of the GNU General Public License
 along with the source for less; see the file COPYING.
 If not, write to the Free Software Foundation, 59 Temple Place,
 Suite 330, Boston, MA  02111-1307, USA.
 You should also have received a copy of the Less License;
 see the file LICENSE.
-.PP
+.Pp
 less is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU General Public License for more details.
-
-.SH AUTHOR
-.PP
+.Sh AUTHOR
+.Pp
 Mark Nudelman <markn@greenwoodsoftware.com>
 .br
 Send bug reports or comments to the above address or to bug-less@gnu.org.
 .br
-For more information, see the less homepage at http://www.greenwoodsoftware.com/less.
+For more information, see the less homepage at
+.Pa http://www.greenwoodsoftware.com/less .
diff --git a/usr.bin/less/lesskey.1 b/usr.bin/less/lesskey.1
new file mode 100644
index 00000000000..174e9ea9ed3
--- /dev/null
+++ b/usr.bin/less/lesskey.1
@@ -0,0 +1,402 @@
+.\"	$OpenBSD: lesskey.1,v 1.1 2003/04/16 17:54:20 millert Exp $
+.\"
+.\" Copyright (C) 2000  Mark Nudelman
+.\"
+.\" lesskey is part of the GNU project and is free software;
+.\" you can redistribute it and/or modify it
+.\" under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation;
+.\" either version 2, or (at your option) any later version.
+.\"
+.\" lesskey is distributed in the hope that it will be useful, but
+.\" WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+.\" or FITNESS FOR A PARTICULAR PURPOSE.
+.\" See the GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with lesskey; see the file COPYING.
+.\" If not, write to the Free Software Foundation, 59 Temple Place,
+.\" Suite 330, Boston, MA  02111-1307, USA.
+.\"
+.Dd January 17, 2003
+.Dt LESSKEY 1
+.Os
+.Sh NAME
+.Nm lesskey
+.Nd specify key bindings for less
+.Sh SYNOPSIS
+.Nm lesskey
+.Op Fl o Ar output
+.Op Fl -
+.Op Ar input
+.Nm lesskey
+.Op Fl -output Ns No = Ns Ar output
+.Op Fl -
+.Op Ar input
+.Nm lesskey
+.Fl V
+.Nm lesskey
+.Fl -version
+.Sh DESCRIPTION
+.Nm
+is used to specify a set of key bindings to be used by
+.Xr less 1 .
+The input file is a text file which describes the key bindings.
+If the input file is "-", standard input is read.
+If no input file is specified, a standard filename is used
+as the name of the input file, which depends on the system being used:
+On Unix systems, $HOME/.lesskey is used.
+.\" on MS-DOS systems, $HOME/_lesskey is used;
+.\" and on OS/2 systems $HOME/lesskey.ini is used,
+.\" or $INIT/lesskey.ini if $HOME is undefined.
+The output file is a binary file which is used by less.
+If no output file is specified, and the environment variable
+.Ev LESSKEY
+is set, the value of LESSKEY is used as the name of the output file.
+Otherwise, a standard filename is used as the name of the output file,
+which depends on the system being used:
+On Unix and OS-9 systems, $HOME/.less is used.
+.\" on MS-DOS systems, $HOME/_less is used;
+.\" and on OS/2 systems, $HOME/less.ini is used,
+.\" or $INIT/less.ini if $HOME is undefined.
+If the output file already exists,
+.Nm
+will overwrite it.
+.Pp
+The -V or --version option causes
+.Nm
+to print its version number and immediately exit.
+If -V or --version is present, other options and arguments are ignored.
+.Pp
+The input file consists of one or more sections.
+Each section starts with a line that identifies the type of section.
+Possible sections are:
+.Bl -tag -width "#line-edit"
+.It #command
+Defines new command keys.
+.It #line-edit
+Defines new line-editing keys.
+.It #env
+Defines environment variables.
+.El
+.Pp
+Blank lines and lines which start with a pound sign (#) are ignored,
+except for the special section header lines.
+.Sh COMMAND SECTION
+The command section begins with the line
+.Pp
+.Dl #command
+.Pp
+If the command section is the first section in the file,
+this line may be omitted.
+The command section consists of lines of the form:
+.Pp
+.Xo
+.Ar \&	string No <whitespace>
+.Ar action No [extra-string] <newline>
+.Xc
+.Pp
+Whitespace is any sequence of one or more spaces and/or tabs.
+The
+.Ar string
+is the command key(s) which invoke the action.
+The
+.Ar string
+may be a single command key, or a sequence of up to 15 keys.
+The
+.Ar action
+is the name of the less action, from the list below.
+The characters in the
+.Ar string
+may appear literally, or be prefixed by a caret to indicate a control key.
+A backslash followed by one to three octal digits may be used to
+specify a character by its octal value.
+A backslash followed by certain characters specifies input
+characters as follows:
+.Bl -tag -width Ds
+.It \eb
+BACKSPACE
+.It \ee
+ESCAPE
+.It \en
+NEWLINE
+.It \er
+RETURN
+.It \et
+TAB
+.It \eku
+UP ARROW
+.It \ekd
+DOWN ARROW
+.It \ekr
+RIGHT ARROW
+.It \ekl
+LEFT ARROW
+.It \ekU
+PAGE UP
+.It \ekD
+PAGE DOWN
+.It \ekh
+HOME
+.It \eke
+END
+.It \ekx
+DELETE
+.El
+.Pp
+A backslash followed by any other character indicates that character is
+to be taken literally.
+Characters which must be preceded by backslash include
+caret, space, tab and the backslash itself.
+.Pp
+An action may be followed by an "extra" string.
+When such a command is entered while running less,
+the action is performed, and then the extra
+string is parsed, just as if it were typed in to less.
+This feature can be used in certain cases to extend
+the functionality of a command.
+For example, see the "{" and ":t" commands in the example below.
+The extra string has a special meaning for the "quit" action:
+when less quits,
+first character of the extra string is used as its exit status.
+.Sh EXAMPLE
+The following input file describes the set of
+default command keys used by less:
+.Pp
+.Bd -literal -offset indent
+#command
+\er	forw-line
+\en	forw-line
+e	forw-line
+j	forw-line
+\ekd	forw-line
+^E	forw-line
+^N	forw-line
+k	back-line
+y	back-line
+^Y	back-line
+^K	back-line
+^P	back-line
+J	forw-line-force
+K	back-line-force
+Y	back-line-force
+d	forw-scroll
+^D	forw-scroll
+u	back-scroll
+^U	back-scroll
+\e40	forw-screen
+f	forw-screen
+^F	forw-screen
+^V	forw-screen
+\ekD	forw-screen
+b	back-screen
+^B	back-screen
+\eev	back-screen
+\ekU	back-screen
+z	forw-window
+w	back-window
+\ee\e40	forw-screen-force
+F	forw-forever
+R	repaint-flush
+r	repaint
+^R	repaint
+^L	repaint
+\eeu	undo-hilite
+g	goto-line
+\ekh	goto-line
+<	goto-line
+\ee<	goto-line
+p	percent
+%	percent
+\ee[	left-scroll
+\ee]	right-scroll
+\ee(	left-scroll
+\ee)	right-scroll
+{	forw-bracket {}
+}	back-bracket {}
+(	forw-bracket ()
+)	back-bracket ()
+[	forw-bracket []
+]	back-bracket []
+\ee^F	forw-bracket
+\ee^B	back-bracket
+G	goto-end
+\ee>	goto-end
+>	goto-end
+\eke	goto-end
+=	status
+^G	status
+:f	status
+/	forw-search
+?	back-search
+\ee/	forw-search *
+\ee?	back-search *
+n	repeat-search
+\een	repeat-search-all
+N	reverse-search
+\eeN	reverse-search-all
+m	set-mark
+\'	goto-mark
+^X^X	goto-mark
+E	examine
+:e	examine
+^X^V	examine
+:n	next-file
+:p	prev-file
+t	next-tag
+T	prev-tag
+:x	index-file
+:d	remove-file
+-	toggle-option
+:t	toggle-option t
+s	toggle-option o
+_	display-option
+|	pipe
+v	visual
+!	shell
++	firstcmd
+H	help
+h	help
+V	version
+0	digit
+1	digit
+2	digit
+3	digit
+4	digit
+5	digit
+6	digit
+7	digit
+8	digit
+9	digit
+q	quit
+Q	quit
+:q	quit
+:Q	quit
+ZZ	quit
+.Ed
+.Sh PRECEDENCE
+Commands specified by
+.Nm
+take precedence over the default commands.
+A default command key may be disabled by including it in the
+input file with the action "invalid".
+Alternatively, a key may be defined
+to do nothing by using the action "noaction".
+"noaction" is similar to "invalid", but
+less will give an error beep for an "invalid" command,
+but not for a "noaction" command.
+In addition, ALL default commands may be disabled by
+adding this control line to the input file:
+.Pp
+.Dl #stop
+.Pp
+This will cause all default commands to be ignored.
+The #stop line should be the last line in that section of the file.
+.Pp
+Be aware that #stop can be dangerous.
+Since all default commands are disabled, you must provide sufficient
+commands before the #stop line to enable all necessary actions.
+For example, failure to provide a "quit" command can lead to frustration.
+.Sh LINE EDITING SECTION
+The line-editing section begins with the line:
+.Pp
+.Dl #line-edit
+.Pp
+This section specifies new key bindings for the line editing commands,
+in a manner similar to the way key bindings for
+ordinary commands are specified in the #command section.
+The line-editing section consists of a list of keys and actions,
+one per line as in the example below.
+.Sh EXAMPLE
+The following input file describes the set of
+default line-editing keys used by less:
+.Pp
+.Bd -literal -offset indent
+#line-edit
+\et	forw-complete
+\e17	back-complete
+\ee\et	back-complete
+^L	expand
+^V	literal
+^A	literal
+\eel	right
+\ekr	right
+\eeh	left
+\ekl	left
+\eeb	word-left
+\ee\ekl	word-left
+\eew	word-right
+\ee\ekr	word-right
+\eei	insert
+\eex	delete
+\ekx	delete
+\eeX	word-delete
+\eekx	word-delete
+\ee\eb	word-backspace
+\ee0	home
+\ekh	home
+\ee$	end
+\eke	end
+\eek	up
+\eku	up
+\eej	down
+.Ed
+.Sh LESS ENVIRONMENT VARIABLES
+The environment variable section begins with the line
+.Pp
+.Dl #env
+.Pp
+Following this line is a list of environment variable assignments.
+Each line consists of an environment variable name, an equals sign (=)
+and the value to be assigned to the environment variable.
+Whitespace before and after the equals sign is ignored.
+Variables assigned in this way are visible only to less.
+If a variable is specified in the system environment and also in a
+lesskey file, the value in the lesskey file takes precedence.
+Although the lesskey file can be used to override variables set in the
+environment, the main purpose of assigning variables in the lesskey file
+is simply to have all less configuration information stored in one file.
+.Sh EXAMPLE
+The following input file sets the -i option whenever less is run,
+and specifies the character set to be "latin1":
+.Pp
+.Bd -literal -offset indent
+#env
+LESS = -i
+LESSCHARSET = latin1
+.Ed
+.Sh SEE ALSO
+.Xr less 1
+.Sh WARNINGS
+It is not possible to specify special keys, such as uparrow,
+in a keyboard-independent manner.
+The only way to specify such keys is to specify the escape sequence
+which a particular keyboard sends when such a key is pressed.
+.\" .Pp
+.\" On MS-DOS and OS/2 systems, certain keys send a sequence of characters
+.\" which start with a NUL character (0).
+.\" This NUL character should be represented as \e340 in a lesskey file.
+.Sh COPYRIGHT
+Copyright (C) 2000  Mark Nudelman
+.Pp
+lesskey is part of the GNU project and is free software;
+you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by
+the Free Software Foundation;
+either version 2, or (at your option) any later version.
+.Pp
+lesskey is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+.Pp
+You should have received a copy of the GNU General Public License
+along with lesskey; see the file COPYING.
+If not, write to the Free Software Foundation, 59 Temple Place,
+Suite 330, Boston, MA  02111-1307, USA.
+.Sh AUTHOR
+.Pp
+Mark Nudelman <markn@greenwoodsoftware.com>
+.br
+Send bug reports or comments to the above address or to bug-less@gnu.org.
+
diff --git a/usr.bin/less/lesskey.nro b/usr.bin/less/lesskey.nro
deleted file mode 100644
index 8f866b51011..00000000000
--- a/usr.bin/less/lesskey.nro
+++ /dev/null
@@ -1,216 +0,0 @@
-.TH LESSKEY 1
-.SH NAME
-lesskey \- specify key bindings for less
-.SH SYNOPSIS
-.B "lesskey [-o output] [input]"
-.br
-.B "lesskey -V"
-.SH DESCRIPTION
-.I Lesskey
-is used to specify a set of key bindings to be used by 
-.I less.
-The input file is a text file which describes the key bindings,
-If the input file is "-", standard input is read.
-If no input file is specified, $HOME/.lesskey is read.
-The output file is a binary file which is used by 
-.I less.
-If no output file is specified, $HOME/.less is written.
-If the output file already exists,
-.I lesskey
-will overwrite it.
-.PP
-The input file consists of lines of the form:
-.sp
-	\fIstring\fP <whitespace> \fIaction\fP [extra-string] <newline>
-.sp
-Whitespace is any sequence of one or more spaces and/or tabs.
-The \fIstring\fP is the command key(s) which invoke the action.
-The \fIstring\fP may be a single command key, or a sequence of up to 15 keys.
-The \fIaction\fP is the name of the less action, from the list below.
-The characters in the \fIstring\fP may appear literally, or be
-prefixed by a caret to indicate a control key.
-A backslash followed by one to three octal digits may be used to
-specify a character by its octal value.
-A backslash followed by b, e, n, r or t specifies
-BACKSPACE, ESCAPE, NEWLINE, RETURN or TAB, respectively.
-A backslash followed by any other character indicates that character is
-to be taken literally.
-Characters which must be preceded by backslash include
-caret, space, tab and the backslash itself.
-Blank lines and lines which start with a pound sign (#) are ignored.
-.PP
-An action may be followed by an "extra" string.
-When such a command is entered while running
-.I less,
-the action is performed, and then the extra
-string is parsed, just as if it were typed in to
-.I less.
-This feature can be used in certain cases to extend
-the functionality of a command.
-For example, see the "{" and ":t" commands in the example below.
-.PP
-The -V flag causes
-.I lesskey
-to print its version number and immediately exit.  
-Other flags and arguments are ignored.
-
-.SH EXAMPLE
-The following input file describes the set of
-default command keys used by less:
-.sp
-.nf
-	\er		forw-line 
-	\en		forw-line 
-	e		forw-line 
-	j		forw-line 
-	^E		forw-line 
-	^N		forw-line 
-	k		back-line 
-	y		back-line 
-	^Y		back-line 
-	^K		back-line 
-	^P		back-line 
-	J		forw-line-force 
-	K		back-line-force 
-	Y		back-line-force 
-	d		forw-scroll 
-	^D		forw-scroll 
-	u		back-scroll 
-	^U		back-scroll 
-	\e40		forw-screen 
-	f		forw-screen 
-	^F		forw-screen 
-	^V		forw-screen 
-	b		back-screen 
-	^B		back-screen 
-	\eev		back-screen 
-	z		forw-window 
-	w		back-window 
-	F		forw-forever 
-	R		repaint-flush 
-	r		repaint 
-	^R		repaint 
-	^L		repaint 
-	g		goto-line 
-	<		goto-line 
-	\ee<		goto-line 
-	p		percent 
-	%		percent 
-	{		forw-bracket {}
-	}		back-bracket {}
-	(		forw-bracket ()
-	)		back-bracket ()
-	[		forw-bracket []
-	]		back-bracket []
-	\ee^F		forw-bracket 
-	\ee^B		back-bracket 
-	G		goto-end 
-	\ee>		goto-end 
-	>		goto-end 
-	=		status 
-	^G		status 
-	:f		status 
-	/		forw-search 
-	?		back-search 
-	\ee/		forw-search *
-	\ee?		back-search *
-	n		repeat-search 
-	\een		repeat-search-all 
-	N		reverse-search 
-	\eeN		reverse-search-all 
-	\eu		undo-hilite
-	m		set-mark 
-	'		goto-mark 
-	^X^X		goto-mark 
-	E		examine 
-	:e		examine 
-	^X^V		examine 
-	:n		next-file 
-	:p		prev-file 
-	:x		index-file 
-	-		toggle-option 
-	:t		toggle-option t
-	s		toggle-option o
-	_		display-option 
-	|		pipe 
-	v		visual 
-	!		shell 
-	+		firstcmd 
-	H		help 
-	h		help 
-	V		version 
-	q		quit 
-	:q		quit 
-	:Q		quit 
-	ZZ		quit 
-.fi
-.sp
-.SH PRECEDENCE
-Commands specified by
-.I lesskey
-take precedence over the default commands.
-A default command key may be disabled by including it in the
-input file with the action "invalid".
-Alternatively, a key may be defined 
-to do nothing by using the action "noaction".
-"noaction" is similar to "invalid", but 
-.I less
-will give an error beep for an "invalid" command, 
-but not for a "noaction" command.
-In addition, ALL default commands may be disabled by 
-adding this control line to the input file:
-.sp
-#stop
-.sp
-This will cause all default commands to be ignored.
-The #stop line should be the last line in that section of the file.
-(Another section, introduced by #line-edit, may follow the #stop line.)
-.PP
-Be aware that #stop can be dangerous.  
-Since all default commands are disabled, 
-you must provide sufficient commands before the #stop line
-to enable all necessary actions.
-For example, failure to provide a "quit" command can lead to frustration.
-
-.SH "LINE EDITING"
-New key bindings may be specified for the line editing commands,
-in a manner similar to the way key bindings for 
-ordinary commands are specified.
-This control line marks the beginning of a section of line-editing commands:
-.sp
-#line-edit
-.sp
-Following this line is a list of keys and actions,
-one per line as in the example below.
-
-.SH EXAMPLE
-The following input file describes the set of
-default line-editing keys used by less:
-.sp
-.nf
-	#line-edit
-	\et	    	forw-complete
-	\e17		back-complete
-	\ee\et		back-complete
-	\e14		expand
-	^V		literal
-	^A		literal
-   	\eel		right
-	\eeh		left
-	\eeb		word-left
-	\eew		word-right
-	\eei		insert
-	\eex		delete
-	\ee\eb		word-backspace
-	\ee0		home
-	\ee$		end
-	\eek		up
-	\eej		down
-.fi
-.sp
-
-.SH "SEE ALSO"
-less(1)
-
-.SH COPYRIGHT
-Copyright (c) 1984,1985,1989,1994,1995  Mark Nudelman