mdoc vi(1); also better document current behaviour and add some missing

commands;

feedback and ok millert@ naddy@

1 files changed, 1756 insertions, 1108 deletions

diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index e11385c1f33..2106f899f87 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.14 2003/04/15 21:34:53 millert Exp $
+.\"	$OpenBSD: vi.1,v 1.15 2003/12/31 13:40:35 jmc Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -12,1597 +12,2245 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.TH VI 1 "October 10, 1996"
-.UC
-.SH NAME
-ex, vi, view \- text editors
-.SH SYNOPSIS
-.B ex
-[\c
-.B -eFRrSsv\c
-] [\c
-.BI -c " cmd"\c
-] [\c
-.BI -t " tag"\c
-] [\c
-.BI -w " size"\c
-] [file ...]
-.br
-.B vi
-[\c
-.B -eFlRrSv\c
-] [\c
-.BI -c " cmd"\c
-] [\c
-.BI -t " tag"\c
-] [\c
-.BI -w " size"\c
-] [file ...]
-.br
-.B view
-[\c
-.B -eFRrSv\c
-] [\c
-.BI -c " cmd"\c
-] [\c
-.BI -t " tag"\c
-] [\c
-.BI -w " size"\c
-] [file ...]
-.SH LICENSE
-The vi program is freely redistributable.  You are welcome to copy,
-modify and share it with others under the conditions listed in the
-LICENSE file.  If any company (not individual!) finds vi sufficiently
-useful that you would have purchased it, or if any company wishes to
-redistribute it, contributions to the authors would be appreciated.
-.SH DESCRIPTION
-.I \&Vi
-is a screen oriented text editor.
-.I \&Ex
-is a line-oriented text editor.
-.I \&Ex
+.Dd October 10, 1996
+.Dt VI 1
+.Os
+.Sh NAME
+.Nm ex , vi , view
+.Nd text editor
+.Sh SYNOPSIS
+.Nm ex
+.Op Fl FRrSsv
+.Op Fl c Ar cmd
+.Op Fl t Ar tag
+.Op Fl w Ar size
+.Op Ar file ...
+.Nm vi\ \&
+.Op Fl eFRrS
+.Op Fl c Ar cmd
+.Op Fl t Ar tag
+.Op Fl w Ar size
+.Op Ar file ...
+.Nm view
+.Op Fl eFrS
+.Op Fl c Ar cmd
+.Op Fl t Ar tag
+.Op Fl w Ar size
+.Op Ar file ...
+.Sh DESCRIPTION
+.Nm ex
+is a line-oriented text editor;
+.Nm vi
+is a screen-oriented text editor.
+.Nm ex
 and
-.I \&vi
+.Nm vi
 are different interfaces to the same program,
 and it is possible to switch back and forth during an edit session.
-.I View
+.Nm view
 is the equivalent of using the
-.B \-R
-(read-only) option of
-.IR \&vi .
-.PP
+.Fl R
+.Pq read-only
+option of
+.Nm vi .
+.Pp
 This manual page is the one provided with the
-.I nex/nvi
+.Nm nex Ns / Ns Nm nvi
 versions of the
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 text editors.
-.I Nex/nvi
+.Nm nex Ns / Ns Nm nvi
 are intended as bug-for-bug compatible replacements for the original
-Fourth Berkeley Software Distribution (4BSD)
-.I \&ex
+Fourth Berkeley Software Distribution
+.Pq 4BSD
+.Nm ex
 and
-.I \&vi
+.Nm vi
 programs.
 For the rest of this manual page,
-.I nex/nvi
+.Nm nex Ns / Ns Nm nvi
 is used only when it's necessary to distinguish it from the historic
 implementations of
-.IR ex/vi .
-.PP
+.Nm ex Ns / Ns Nm vi .
+.Pp
 This manual page is intended for users already familiar with
-.IR ex/vi .
+.Nm ex Ns / Ns Nm vi .
 Anyone else should almost certainly read a good tutorial on the
 editor before this manual page.
-If you're in an unfamiliar environment, and you absolutely have to
-get work done immediately, read the section after the options
-description, entitled ``Fast Startup''.
+See the
+.Sx SEE ALSO
+section below, for a list of additional materials.
+If you're in an unfamiliar environment,
+and you absolutely have to get work done immediately,
+read the section after the options description, entitled
+.Dq Fast Startup .
 It's probably enough to get you going.
-.PP
+.Pp
 The following options are available:
-.TP
-.B \-c
+.Bl -tag -width "-w size "
+.It Fl c Ar cmd
 Execute
-.B cmd
+.Ar cmd
 immediately after starting the edit session.
 Particularly useful for initial positioning in the file, although
-.B cmd
+.Ar cmd
 is not limited to positioning commands.
-This is the POSIX 1003.2 interface for the historic ``+cmd'' syntax.
-.I Nex/nvi
+This is the POSIX 1003.2 interface for the historic
+.Dq +cmd
+syntax.
+.Nm nex Ns / Ns Nm nvi
 supports both the old and new syntax.
-.TP
-.B \-e
+.It Fl e
 Start editing in ex mode, as if the command name were
-.IR \&ex .
-.TP
-.B \-F
+.Nm ex .
+.It Fl F
 Don't copy the entire file when first starting to edit.
 (The default is to make a copy in case someone else modifies
 the file during your edit session.)
-.TP
-.B \-l
-Start editing with the lisp and showmatch options set.
-.TP
-.B \-R
+.\" .It Fl l
+.\" Start editing with the lisp and showmatch options set.
+.It Fl R
 Start editing in read-only mode, as if the command name was
-.IR view ,
+.Nm view ,
 or the
-.B readonly
+.Cm readonly
 option was set.
-.TP
-.B \-r
+.It Fl r
 Recover the specified files, or, if no files are specified,
 list the files that could be recovered.
 If no recoverable files by the specified name exist,
-the file is edited as if the
-.B \-r
-option had not been specified.
-.TP
-.B \-S
+.\" the file is edited as if the
+.\" .Fl r
+.\" option had not been specified.
+exit the editor.
+.It Fl S
 Run with the
-.B secure
+.Cm secure
 edit option set, disallowing all access to external programs.
-.TP
-.B \-s
+.It Fl s
 Enter batch mode; applicable only to
-.I \&ex
+.Nm ex
 edit sessions.
 Batch mode is useful when running
-.I \&ex
+.Nm ex
 scripts.
-Prompts, informative messages and other user oriented messages
-are turned off,
+Prompts, informative messages and other user oriented messages are turned off,
 and no startup files or environmental variables are read.
-This is the POSIX 1003.2 interface for the historic ``\-'' argument.
-.I \&Nex/nvi
+This is the POSIX 1003.2 interface for the historic
+.Dq -
+argument.
+.Nm nex Ns / Ns Nm nvi
 supports both the old and new syntax.
-.TP
-.B \-t
-Start editing at the specified tag.
-(See
-.IR ctags (1)).
-.TP
-.B \-w
+.It Fl t Ar tag
+Start editing at the specified
+.Ar tag
+(see
+.Xr ctags 1 ) .
+.It Fl w Ar size
 Set the initial window size to the specified number of lines.
-.TP
-.B \-v
+.It Fl v
 Start editing in vi mode, as if the command name was
-.I \&vi
-or
-.IR view .
-.PP
+.Nm vi .
+.El
+.Pp
 Command input for
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 is read from the standard input.
 In the
-.I \&vi
+.Nm vi
 interface, it is an error if standard input is not a terminal.
 In the
-.I \&ex
+.Nm ex
 interface, if standard input is not a terminal,
-.I \&ex
+.Nm ex
 will read commands from it regardless; however, the session will be a
 batch mode session, exactly as if the
-.B \-s
+.Fl s
 option had been specified.
-.PP
-.I Ex/vi
-exits 0 on success, and greater than 0 if an error occurs.
-.SH FAST STARTUP
+.Pp
+.Nm ex Ns / Ns Nm vi
+exits 0 on success, or greater than 0 if an error occurs.
+.Sh FAST STARTUP
 This section will tell you the minimum amount that you need to
 do simple editing tasks using
-.IR \&vi .
-If you've never used any screen editor before, you're likely to have
-problems even with this simple introduction.
+.Nm vi .
+If you've never used any screen editor before,
+you're likely to have problems even with this simple introduction.
 In that case you should find someone that already knows
-.I \&vi
+.Nm vi
 and have them walk you through this section.
-.PP
-.I \&Vi
+.Pp
+.Nm vi
 is a screen editor.
-This means that it takes up almost the entire screen, displaying part
-of the file on each screen line, except for the last line of the screen.
+This means that it takes up almost the entire screen,
+displaying part of the file on each screen line,
+except for the last line of the screen.
 The last line of the screen is used for you to give commands to
-.IR \&vi ,
+.Nm vi ,
 and for
-.I \&vi
+.Nm vi
 to give information to you.
-.PP
+.Pp
 The other fact that you need to understand is that
-.I \&vi
-is a modeful editor, i.e. you are either entering text or you
-are executing commands, and you have to be in the right mode
-to do one or the other.
+.Nm vi
+is a modeful editor,
+i.e. you are either entering text or you are executing commands,
+and you have to be in the right mode to do one or the other.
 You will be in command mode when you first start editing a file.
 There are commands that switch you into input mode.
 There is only one key that takes you out of input mode,
-and that is the <escape> key.
-(Key names are written using less-than and greater-than signs, e.g.
-<escape> means the ``escape'' key, usually labeled ``esc'' on your
+and that is the
+.Aq escape
+key.
+(Key names are written using less-than and greater-than signs, e.g.\&
+.Aq escape
+means the
+.Dq escape
+key, usually labeled
+.Dq Esc
+on your
 terminal's keyboard.)
 If you're ever confused as to which mode you're in,
-keep entering the <escape> key until
-.I \&vi
+keep entering the
+.Aq escape
+key until
+.Nm vi
 beeps at you.
 (Generally,
-.I \&vi
+.Nm vi
 will beep at you if you try and do something that's not allowed.
 It will also display error messages.)
-.PP
-To start editing a file, enter the command ``vi file_name<carriage-return>''.
+.Pp
+To start editing a file, enter the command
+.Pp
+.Dl vi file_name
+.Pp
 The command you should enter as soon as you start editing is
-``:set verbose showmode<carriage-return>''.
+.Pp
+.Dl :set verbose showmode
+.Pp
 This will make the editor give you verbose error messages and display
 the current mode at the bottom of the screen.
-.PP
+.Pp
 The commands to move around the file are:
-.TP
-.B h
+.Bl -tag -width Ds
+.It Cm h
 Move the cursor left one character.
-.TP
-.B j
+.It Cm j
 Move the cursor down one line.
-.TP
-.B k
+.It Cm k
 Move the cursor up one line.
-.TP
-.B l
+.It Cm l
 Move the cursor right one character.
-.TP
-.B <cursor-arrows>
+.It Aq Cm cursor-arrows
 The cursor arrow keys should work, too.
-.TP
-.B /text<carriage-return>
-Search for the string ``text'' in the file,
+.It Cm / Ns text
+Search for the string
+.Dq text
+in the file,
 and move the cursor to its first character.
-.PP
+.El
+.Pp
 The commands to enter new text are:
-.TP
-.B a
-Append new text,
-.I after
-the cursor.
-.TP
-.B i
-Insert new text,
-.I before
-the cursor.
-.TP
-.B o
-Open a new line below the line the cursor is on, and start
-entering text.
-.TP
-.B O
-Open a new line above the line the cursor is on, and start
-entering text.
-.TP
-.B <escape>
+.Bl -tag -width "<escape>"
+.It Cm a
+Append new text, after the cursor.
+.It Cm i
+Insert new text, before the cursor.
+.It Cm O
+Open a new line above the line the cursor is on, and start entering text.
+.It Cm o
+Open a new line below the line the cursor is on, and start entering text.
+.It Aq Cm escape
 Once you've entered input mode using one of the
-.BR \&a ,
-.BR \&i ,
-.BR \&O
+.Cm a ,
+.Cm i ,
+.Cm O
 or
-.B \&o
+.Cm o
 commands, use
-.B <escape>
+.Aq Cm escape
 to quit entering text and return to command mode.
-.PP
+.El
+.Pp
 The commands to copy text are:
-.TP
-.B yy
-Copy the line the cursor is on.
-.TP
-.B p
+.Bl -tag -width Ds
+.It Cm p
 Append the copied line after the line the cursor is on.
-.PP
+.It Cm yy
+Copy the line the cursor is on.
+.El
+.Pp
 The commands to delete text are:
-.TP
-.B dd
+.Bl -tag -width Ds
+.It Cm dd
 Delete the line the cursor is on.
-.TP
-.B x
+.It Cm x
 Delete the character the cursor is on.
-.PP
+.El
+.Pp
 The commands to write the file are:
-.TP
-.B :w<carriage-return>
+.Bl -tag -width Ds
+.It Cm :w
 Write the file back to the file with the name that you originally used
 as an argument on the
-.I \&vi
+.Nm vi
 command line.
-.TP
-.B ":w file_name<carriage-return>"
-Write the file back to the file with the name ``file_name''.
-.PP
+.It Cm :w Ar file_name
+Write the file back to the file with the name
+.Ar file_name .
+.El
+.Pp
 The commands to quit editing and exit the editor are:
-.TP
-.B :q<carriage-return>
-Quit editing and leave vi (if you've modified the file, but not
-saved your changes,
-.I \&vi
+.Bl -tag -width Ds
+.It Cm :q
+Quit editing and leave
+.Nm vi
+(if you've modified the file, but not saved your changes,
+.Nm vi
 will refuse to quit).
-.TP
-.B :q!<carriage-return>
+.It Cm :q!
 Quit, discarding any modifications that you may have made.
-.PP
+.El
+.Pp
 One final caution:
 Unusual characters can take up more than one column on the screen,
 and long lines can take up more than a single screen line.
-The above commands work on ``physical'' characters and lines,
-i.e. they affect the entire line no matter how many screen lines it
-takes up and the entire character no matter how many screen columns
-it takes up.
-.SH VI COMMANDS
+The above commands work on
+.Dq physical
+characters and lines,
+i.e. they affect the entire line no matter how many screen lines it takes up
+and the entire character no matter how many screen columns it takes up.
+.Sh VI COMMANDS
 The following section describes the commands available in the command
 mode of the
-.I \&vi
+.Nm vi
 editor.
-In each entry below, the tag line is a usage synopsis for the command
-character.
-.PP
-.TP
-.B "[count] <control-A>"
+In each entry below, the tag line is a usage synopsis for the command character.
+.Pp
+.Bl -tag -width Ds -compact
+.It Xo
+.\" .Op Ar count
+.Aq Cm control-A
+.Xc
 Search forward
-.I count
-times for the current word.
-.TP
-.B "[count] <control-B>"
+.\" .Ar count
+.\" times
+for the current word.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-B
+.Xc
 Page backwards
-.I count
+.Ar count
 screens.
-.TP
-.B "[count] <control-D>"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-D
+.Xc
 Scroll forward
-.I count
+.Ar count
 lines.
-.TP
-.B "[count] <control-E>"
+If
+.Ar count
+is not given, scroll forward half the number of lines in the current screen.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-E
+.Xc
 Scroll forward
-.I count
+.Ar count
 lines, leaving the current line and column as is, if possible.
-.TP
-.B "[count] <control-F>"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-F
+.Xc
 Page forward
-.I count
+.Ar count
 screens.
-.TP
-.B "<control-G>"
+.Pp
+.It Aq Cm control-G
 Display the file information.
-.TP
-.B "<control-H>"
-.TP
-.B "[count] h"
+.Pp
+.It Aq Cm control-H
+.It Xo
+.Op Ar count
+.Cm h
+.Xc
 Move the cursor back
-.I count
+.Ar count
 characters in the current line.
-.TP
-.B "[count] <control-J>"
-.TP
-.B "[count] <control-N>"
-.TP
-.B "[count] j"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-J
+.Xc
+.It Xo
+.Op Ar count
+.Aq Cm control-N
+.Xc
+.It Xo
+.Op Ar count
+.Cm j
+.Xc
 Move the cursor down
-.I count
+.Ar count
 lines without changing the current column.
-.TP
-.B "<control-L>"
-.TP
-.B "<control-R>"
+.Pp
+.It Aq Cm control-L
+.It Aq Cm control-R
 Repaint the screen.
-.TP
-.B "[count] <control-M>"
-.TP
-.B "[count] +"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-M
+.Xc
+.It Xo
+.Op Ar count
+.Cm +
+.Xc
 Move the cursor down
-.I count
-lines to the first nonblank character of that line.
-.TP
-.B "[count] <control-P>"
-.TP
-.B "[count] k"
+.Ar count
+lines to the first non-blank character of that line.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-P
+.Xc
+.It Xo
+.Op Ar count
+.Cm k
+.Xc
 Move the cursor up
-.I count
+.Ar count
 lines, without changing the current column.
-.TP
-.B "<control-T>"
+.Pp
+.It Aq Cm control-T
 Return to the most recent tag context.
-.TP
-.B "[count] <control-U>"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-U
+.Xc
 Scroll backwards
-.I count
+.Ar count
 lines.
-.TP
-.B "<control-W>"
-Switch to the next lower screen in the window, or to the first
-screen if there are no lower screens in the window.
-.TP
-.B "[count] <control-Y>"
+If
+.Ar count
+is not given, scroll forward half the number of lines in the current screen.
+.Pp
+.It Aq Cm control-W
+Switch to the next lower screen in the window,
+or to the first screen if there are no lower screens in the window.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-Y
+.Xc
 Scroll backwards
-.I count
+.Ar count
 lines, leaving the current line and column as is, if possible.
-.TP
-.B "<control-Z>"
+.Pp
+.It Aq Cm control-Z
 Suspend the current editor session.
-.TP
-.B "<escape>"
+.Pp
+.It Aq Cm escape
 Execute
-.I \&ex
+.Nm ex
 commands or cancel partial commands.
-.TP
-.B "<control-]>"
+.Pp
+.It Aq Cm control-]
 Push a tag reference onto the tag stack.
-.TP
-.B "<control-^>"
+.Pp
+.It Aq Cm control-^
 Switch to the most recently edited file.
-.TP
-.B "[count] <space>"
-.TP
-.B "[count] l"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm space
+.Xc
+.It Xo
+.Op Ar count
+.Cm l
+.Xc
 Move the cursor forward
-.I count
+.Ar count
 characters without changing the current line.
-.TP
-.B "[count] ! motion shell-argument(s)"
+.Pp
+.It Xo
+.Op Ar count
+.Cm !\&
+.Ar motion shell-argument(s)
+.Xc
 Replace text with results from a shell command.
-.TP
-.B "[count] # #|+|-"
-Increment or decrement the cursor number.
-.TP
-.B "[count] $"
+.Pp
+.It Xo
+.Op Ar count
+.Cm #
+.Sm off
+.Cm # | + | -
+.Sm on
+.Xc
+Increment or decrement the number under the cursor.
+If the trailing character is a
+.Sq #
+or
+.Sq + ,
+the number is incremented.
+If the trailing character is a
+.Sq - ,
+the number is decremented.
+.Pp
+.It Xo
+.Op Ar count
+.Cm $
+.Xc
 Move the cursor to the end of a line.
-.TP
-.B "%"
+.Pp
+.It Cm %
 Move to the matching character.
-.TP
-.B "&"
+.Pp
+.It Cm &
 Repeat the previous substitution command on the current line.
-.TP
-.B "'<character>"
-.TP
-.B "`<character>"
+.Pp
+.It Xo
+.Cm ' Ns Aq Ar character
+.Xc
+.It Xo
+.Cm ` Ns Aq Ar character
+.Xc
 Return to a context marked by the character
-.IR <character> .
-.TP
-.B "[count] ("
+.Ar character .
+The first form returns to the beginning of the line marked by
+.Ar character .
+The second form returns to the first character of the context marked by
+.Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm (\&
+.Xc
 Back up
-.I count
+.Ar count
 sentences.
-.TP
-.B "[count] )"
+.Pp
+.It Xo
+.Op Ar count
+.Cm )\&
+.Xc
 Move forward
-.I count
+.Ar count
 sentences.
-.TP
-.B "[count] ,"
+.Pp
+.It Xo
+.Op Ar count
+.Cm ,\&
+.Xc
 Reverse find character
-.I count
+.Ar count
 times.
-.TP
-.B "[count] -"
-Move to first nonblank of the previous line,
-.I count
+.Pp
+.It Xo
+.Op Ar count
+.Cm -
+.Xc
+Move to the first non-blank of the previous line,
+.Ar count
 times.
-.TP
-.B "[count] ."
+.Pp
+.It Xo
+.Op Ar count
+.Cm .\&
+.Xc
 Repeat the last
-.I \&vi
+.Nm vi
 command that modified text.
-.TP
-.B "/RE<carriage-return>"
-.TP
-.B "/RE/ [offset]<carriage-return>"
-.TP
-.B "?RE<carriage-return>"
-.TP
-.B "?RE? [offset]<carriage-return>"
-.TP
-.B "N"
-.TP
-.B "n"
-Search forward or backward for a regular expression.
-.TP
-.B "0"
+.Pp
+.It / Ns Ar RE
+.It Xo
+.Pf / Ns Ar RE Ns /
+.Op Ar offset
+.Xc
+.It ?\& Ns Ar RE
+.It Xo
+.Pf ?\& Ns Ar RE Ns ?\&
+.Op Ar offset
+.Xc
+.It Cm N
+.It Cm n
+Search forward
+.Pq Sq /
+or backward
+.Pq Sq ?\&
+for a regular expression.
+.Cm n
+and
+.Cm N
+repeat the last search in the same or opposite directions, respectively.
+If
+.Ar offset
+is specified, the cursor is placed
+.Ar offset
+lines before or after the matched regular expression.
+.Pp
+.It Cm 0
 Move to the first character in the current line.
-.TP
-.B ":"
-Execute an ex command.
-.TP
-.B "[count] ;"
+.Pp
+.It Cm :\&
+Execute an
+.Nm ex
+command.
+.Pp
+.It Xo
+.Op Ar count
+.Cm ;\&
+.Xc
 Repeat the last character find
-.I count
+.Ar count
 times.
-.TP
-.B "[count] < motion"
-.TP
-.B "[count] > motion"
+.Pp
+.It Xo
+.Op Ar count
+.Pf \ \&< Ar motion
+.Xc
+.It Xo
+.Op Ar count
+.Pf \ \&> Ar motion
+.Xc
 Shift lines left or right.
-.TP
-.B "@ buffer"
-Execute a named buffer.
-.TP
-.B "[count] A"
+.Pp
+.It Cm @ Ar buffer
+Execute a named
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar count
+.Cm A
+.Xc
 Enter input mode, appending the text after the end of the line.
-.TP
-.B "[count] B"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+number of times.
+.Pp
+.It Xo
+.Op Ar count
+.Cm B
+.Xc
 Move backwards
-.I count
+.Ar count
 bigwords.
-.TP
-.B "[buffer] [count] C"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm C
+.Xc
 Change text from the current position to the end-of-line.
-.TP
-.B "[buffer] D"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar buffer
+.Cm D
+.Xc
 Delete text from the current position to the end-of-line.
-.TP
-.B "[count] E"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar count
+.Cm E
+.Xc
 Move forward
-.I count
+.Ar count
 end-of-bigwords.
-.TP
-.B "[count] F <character>"
+.Pp
+.It Xo
+.Op Ar count
+.Cm F Aq Ar character
+.Xc
 Search
-.I count
+.Ar count
 times backward through the current line for
-.IR <character> .
-.TP
-.B "[count] G"
+.Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm G
+.Xc
 Move to line
-.IR count ,
+.Ar count ,
 or the last line of the file if
-.I count
+.Ar count
 is not specified.
-.TP
-.B "[count] H"
+.Pp
+.It Xo
+.Op Ar count
+.Cm H
+.Xc
 Move to the screen line
-.I "count - 1"
-lines below the top of the screen.
-.TP
-.B "[count] I"
+.Ar count
+\- 1 lines below the top of the screen.
+.Pp
+.It Xo
+.Op Ar count
+.Cm I
+.Xc
 Enter input mode, inserting the text at the beginning of the line.
-.TP
-.B "[count] J"
+.Pp
+.It Xo
+.Op Ar count
+.Cm J
+.Xc
 Join lines.
-.TP
-.B "[count] L"
+.Pp
+.It Xo
+.Op Ar count
+.Cm L
+.Xc
 Move to the screen line
-.I "count - 1"
-lines above the bottom of the screen.
-.TP
-.B " M"
+.Ar count
+\- 1 lines above the bottom of the screen.
+.Pp
+.It Cm M
 Move to the screen line in the middle of the screen.
-.TP
-.B "[count] O"
+.Pp
+.It Xo
+.Op Ar count
+.Cm O
+.Xc
 Enter input mode, appending text in a new line above the current line.
-.TP
-.B "[buffer] P"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+number of times.
+.Pp
+.It Xo
+.Op Ar buffer
+.Cm P
+.Xc
 Insert text from a buffer.
-.TP
-.B "Q"
+.Pp
+.It Cm Q
 Exit
-.I \&vi
-(or visual) mode and switch to
-.I \&ex
+.Nm vi
+.Pq or visual
+mode and switch to
+.Nm ex
 mode.
-.TP
-.B "[count] R"
+.Pp
+.It Xo
+.Op Ar count
+.Cm R
+.Xc
 Enter input mode, replacing the characters in the current line.
-.TP
-.B "[buffer] [count] S"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+number of times.
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm S
+.Xc
 Substitute
-.I count
+.Ar count
 lines.
-.TP
-.B "[count] T <character>"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar count
+.Cm T
+.Aq Ar character
+.Xc
 Search backwards,
-.I count
-times,
-through the current line for the character
-.I after
-the specified
-.IR <character> .
-.TP
-.B "U"
-Restore the current line to its state before the cursor last
-moved to it.
-.TP
-.B "[count] W"
+.Ar count
+times, through the current line for the character after the specified
+.Ar character .
+.Pp
+.It Cm U
+Restore the current line to its state before the cursor last moved to it.
+.Pp
+.It Xo
+.Op Ar count
+.Cm W
+.Xc
 Move forward
-.I count
+.Ar count
 bigwords.
-.TP
-.B "[buffer] [count] X"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm X
+.Xc
 Delete
-.I count
+.Ar count
 characters before the cursor.
-.TP
-.B "[buffer] [count] Y"
-Copy (or ``yank'')
-.I count
-lines into the specified buffer.
-.TP
-.B "ZZ"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm Y
+.Xc
+Copy (or
+.Dq yank )
+.Ar count
+lines into the specified
+.Ar buffer ,
+or the default buffer if none is specified.
+.Pp
+.It Cm ZZ
 Write the file and exit
-.IR \&vi .
-.TP
-.B "[count] [["
+.Nm vi .
+.Pp
+.It Xo
+.Op Ar count
+.Cm [[
+.Xc
 Back up
-.I count
+.Ar count
 section boundaries.
-.TP
-.B "[count] ]]"
+.Pp
+.It Xo
+.Op Ar count
+.Cm ]]
+.Xc
 Move forward
-.I count
+.Ar count
 section boundaries.
-.TP
-.B "\&^"
-Move to first nonblank character on the current line.
-.TP
-.B "[count] _"
+.Pp
+.It Cm ^
+Move to first non-blank character on the current line.
+.Pp
+.It Xo
+.Op Ar count
+.Cm _
+.Xc
 Move down
-.I "count - 1"
-lines, to the first nonblank character.
-.TP
-.B "[count] a"
+.Ar count
+\- 1 lines, to the first non-blank character.
+.Pp
+.It Xo
+.Op Ar count
+.Cm a
+.Xc
 Enter input mode, appending the text after the cursor.
-.TP
-.B "[count] b"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+number of times.
+.Pp
+.It Xo
+.Op Ar count
+.Cm b
+.Xc
 Move backwards
-.I count
+.Ar count
 words.
-.TP
-.B "[buffer] [count] c motion"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm c
+.Ar motion
+.Xc
 Change a region of text.
-.TP
-.B "[buffer] [count] d motion"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm d
+.Ar motion
+.Xc
 Delete a region of text.
-.TP
-.B "[count] e"
+.Pp
+.It Xo
+.Op Ar count
+.Cm e
+.Xc
 Move forward
-.I count
+.Ar count
 end-of-words.
-.TP
-.B "[count] f<character>"
+.Pp
+.It Xo
+.Op Ar count
+.Cm f Aq Ar character
+.Xc
 Search forward,
-.I count
+.Ar count
 times, through the rest of the current line for
-.IR <character> .
-.TP
-.B "[count] i"
+.Aq Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm i
+.Xc
 Enter input mode, inserting the text before the cursor.
-.TP
-.B "m <character>"
-Save the current context (line and column) as
-.IR <character> .
-.TP
-.B "[count] o"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+number of times.
+.Pp
+.It Xo
+.Cm m
+.Aq Ar character
+.Xc
+Save the current context
+.Pq line and column
+as
+.Aq Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm o
+.Xc
 Enter input mode, appending text in a new line under the current line.
-.TP
-.B "[buffer] p"
+.Pp
+.It Xo
+.Op Ar buffer
+.Cm p
+.Xc
 Append text from a buffer.
-.TP
-.B "[count] r <character>"
+.Pp
+.It Xo
+.Op Ar count
+.Cm r
+.Aq Ar character
+.Xc
 Replace
-.I count
+.Ar count
 characters.
-.TP
-.B "[buffer] [count] s"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm s
+.Xc
 Substitute
-.I count
+.Ar count
 characters in the current line starting with the current character.
-.TP
-.B "[count] t <character>"
+.Pp
+.It Xo
+.Op Ar count
+.Cm t
+.Aq Ar character
+.Xc
 Search forward,
-.I count
-times, through the current line for the character immediately
-.I before
-.IR <character> .
-.TP
-.B "u"
+.Ar count
+times, through the current line for the character immediately before
+.Aq Ar character .
+.Pp
+.It Cm u
 Undo the last change made to the file.
-.TP
-.B "[count] w"
+.Pp
+.It Xo
+.Op Ar count
+.Cm w
+.Xc
 Move forward
-.I count
+.Ar count
 words.
-.TP
-.B "[buffer] [count] x"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm x
+.Xc
 Delete
-.I count
+.Ar count
 characters.
-.TP
-.B "[buffer] [count] y motion"
-Copy (or ``yank'')
-a text region specified by the
-.I count
-and motion into a buffer.
-.TP
-.B "[count1] z [count2] -|.|+|^|<carriage-return>"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm y
+.Ar motion
+.Xc
+Copy (or
+.Dq yank )
+a text region specified by
+.Ar count
+and
+.Ar motion
+into a buffer.
+.Pp
+.It Xo
+.Op Ar count1
+.Cm z
+.Op Ar count2
+.Cm type
+.Xc
 Redraw, optionally repositioning and resizing the screen.
-.TP
-.B "[count] {"
+If
+.Ar count2
+is specified, limit the screen size to
+.Ar count2
+lines.
+The following
+.Cm type
+characters may be used:
+.Bl -tag -width Ds
+.It Cm +
+If
+.Ar count1
+is specified, place the line
+.Ar count1
+at the top of the screen.
+Otherwise, display the screen after the current screen.
+.It Aq Cm carriage-return
+Place the line
+.Ar count1
+at the top of the screen.
+.It Cm .\&
+Place the line
+.Ar count1
+in the center of the screen.
+.It Cm -
+Place the line
+.Ar count1
+at the bottom of the screen.
+.It Cm ^
+If
+.Ar count1
+is given,
+display the screen before the screen before
+.Ar count1
+.Pq i.e. 2 screens before .
+Otherwise, display the screen before the current screen.
+.El
+.Pp
+.It Xo
+.Op Ar count
+.Cm {\&
+.Xc
 Move backward
-.I count
+.Ar count
 paragraphs.
-.TP
-.B "[count] |"
+.Pp
+.It Xo
+.Op Ar column
+.Cm |\&
+.Xc
 Move to a specific
-.I column
+.Ar column
 position on the current line.
-.TP
-.B "[count] }"
+If
+.Ar column
+is omitted,
+move to the start of the current line.
+.Pp
+.It Xo
+.Op Ar count
+.Cm }\&
+.Xc
 Move forward
-.I count
+.Ar count
 paragraphs.
-.TP
-.B "[count] ~"
+.Pp
+.It Xo
+.Op Ar count
+.Cm ~
+.Xc
 Reverse the case of the next
-.I count
+.Ar count
 character(s).
-.TP
-.B "[count] ~ motion"
+.Pp
+.It Xo
+.Op Ar count
+.Cm ~
+.Ar motion
+.Xc
 Reverse the case of the characters in a text region specified by the
-.I count
+.Ar count
 and
-.IR motion .
-.TP
-.B "<interrupt>"
+.Ar motion .
+Only in effect if the
+.Cm tildeop
+option is set.
+.Pp
+.It Aq Cm interrupt
 Interrupt the current operation.
-.SH VI TEXT INPUT COMMANDS
-The following section describes the commands available in the text
-input mode of the
-.I \&vi
+The
+.Aq interrupt
+character is usually
+.Aq control-C .
+.El
+.Sh VI TEXT INPUT COMMANDS
+The following section describes the commands available in the text input mode
+of the
+.Nm vi
 editor.
-.PP
-.TP
-.B "<nul>"
+.Pp
+.Bl -tag -width Ds -compact
+.It Aq Cm nul
 Replay the previous input.
-.TP
-.B "<control-D>"
+.Pp
+.It Aq Cm control-D
 Erase to the previous
-.B shiftwidth
+.Ar shiftwidth
 column boundary.
-.TP
-.B "^<control-D>"
+.Pp
+.It Cm ^ Ns Aq Cm control-D
 Erase all of the autoindent characters, and reset the autoindent level.
-.TP
-.B "0<control-D>"
+.Pp
+.It Cm 0 Ns Aq Cm control-D
 Erase all of the autoindent characters.
-.TP
-.B "<control-T>"
+.Pp
+.It Aq Cm control-T
 Insert sufficient
-.I <tab>
+.Aq tab
 and
-.I <space>
+.Aq space
 characters to move forward to the next
-.B shiftwidth
+.Ar shiftwidth
 column boundary.
-.TP
-.B "<erase>
-.TP
-.B "<control-H>"
+.Pp
+.It Aq Cm erase
+.It Aq Cm control-H
 Erase the last character.
-.TP
-.B "<literal next>"
-Quote the next character.
-.TP
-.B "<escape>
+.Pp
+.It Aq Cm literal next
+Escape the next character from any special meaning.
+The
+.Aq literal\ \&next
+character is usually
+.Aq control-V .
+.Pp
+.It Aq Cm escape
 Resolve all text input into the file, and return to command mode.
-.TP
-.B "<line erase>"
+.Pp
+.It Aq Cm line erase
 Erase the current line.
-.TP
-.B "<control-W>"
-.TP
-.B "<word erase>"
+.Pp
+.It Aq Cm control-W
+.It Aq Cm word erase
 Erase the last word.
 The definition of word is dependent on the
-.B altwerase
+.Cm altwerase
 and
-.B ttywerase
+.Cm ttywerase
 options.
-.TP
-.B "<control-X>[0-9A-Fa-f]+"
+.Pp
+.Sm off
+.It Xo
+.Aq Cm control-X
+.Bq Cm 0-9A-Fa-f
+.Cm +
+.Xc
+.Sm on
 Insert a character with the specified hexadecimal value into the text.
-.TP
-.B "<interrupt>"
+.Pp
+.It Aq Cm interrupt
 Interrupt text input mode, returning to command mode.
-.SH EX COMMANDS
+The
+.Aq interrupt
+character is usually
+.Aq control-C .
+.El
+.Sh EX COMMANDS
 The following section describes the commands available in the
-.I \&ex
+.Nm ex
 editor.
 In each entry below, the tag line is a usage synopsis for the command.
-.PP
-.TP
-.B "<end-of-file>"
+.Pp
+.Bl -tag -width Ds -compact
+.It Aq Cm end-of-file
 Scroll the screen.
-.TP
-.B "! argument(s)"
-.TP
-.B "[range]! argument(s)"
+.Pp
+.It Cm !\& Ar argument(s)
+.It Xo
+.Op Ar range
+.Cm !\&
+.Ar argument(s)
+.Xc
 Execute a shell command, or filter lines through a shell command.
-.TP
-.B \&"
+.Pp
+.It Cm \&"
 A comment.
-.TP
-.B "[range] nu[mber] [count] [flags]"
-.TP
-.B "[range] # [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm nu Ns Op Cm mber
+.Op Ar count
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm #
+.Op Ar count
+.Op Ar flags
+.Xc
 Display the selected lines, each preceded with its line number.
-.TP
-.B "@ buffer"
-.TP
-.B "* buffer"
+.Pp
+.It Cm @ Ar buffer
+.It Cm * Ar buffer
 Execute a buffer.
-.TP
-.B "[line] a[ppend][!]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm < Ns Op Cm < ...
+.Op Ar count
+.Op Ar flags
+.Xc
+Shift lines left.
+.Pp
+.It Xo
+.Op Ar line
+.Cm =
+.Op Ar flags
+.Xc
+Display the line number of
+.Ar line .
+If
+.Ar line
+is not specified, display the line number of the last line in the file.
+.Pp
+.It Xo
+.Op Ar range
+.Cm > Ns Op Cm > ...
+.Op Ar count
+.Op Ar flags
+.Xc
+Shift lines right.
+.Pp
+.It Xo
+.Cm ab Ns Op Cm brev
+.Ar lhs rhs
+.Xc
+.Nm vi
+only.
+Add
+.Ar lhs
+as an abbreviation for
+.Ar rhs
+to the abbreviation list.
+.Pp
+.It Xo
+.Op Ar line
+.Cm a Ns Op Cm ppend Ns
+.Op Cm !\&
+.Xc
 The input text is appended after the specified line.
-.TP
-.B "[range] c[hange][!] [count]"
+.Pp
+.It Cm ar Ns Op Cm gs
+Display the argument list.
+.Pp
+.It Cm bg
+.Nm vi
+only.
+Background the current screen.
+.Pp
+.It Xo
+.Op Ar range
+.Cm c Ns Op Cm hange Ns
+.Op Cm !\&
+.Op Ar count
+.Xc
 The input text replaces the specified range.
-.TP
-.B "cs[cope] add | find | help | kill | reset"
+.Pp
+.It Xo
+.Cm chd Ns Op Cm ir Ns
+.Op Cm !\&
+.Op Ar directory
+.Xc
+.It Xo
+.Cm cd Ns Op Cm !\&
+.Op Ar directory
+.Xc
+Change the current working directory.
+.Pp
+.It Xo
+.Op Ar range
+.Cm co Ns Op Cm py Ns
+.Op Cm !\&
+.Ar line
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm t Ns Op Cm !\&
+.Ar line
+.Op Ar flags
+.Xc
+Copy the specified lines after the destination
+.Ar line .
+.Pp
+.It Xo
+.Cm cs Ns Op Cm cope
+.Cm add | find | help | kill | reset
+.Xc
 Execute a Cscope command.
-.TP
-.B "[range] d[elete] [buffer] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm d Ns Op Cm elete
+.Op Ar buffer
+.Op Ar count
+.Op Ar flags
+.Xc
 Delete the lines from the file.
-.TP
-.B "di[splay] b[uffers] | c[onnections] | s[creens] | t[ags]"
+.Pp
+.It Xo
+.Cm di Ns Op Cm splay
+.Cm b Ns Oo Cm uffers Oc \&|
+.Cm c Ns Oo Cm onnections Oc \&|
+.Cm s Ns Oo Cm creens Oc \&|
+.Cm t Ns Op Cm ags
+.Xc
 Display buffers, Cscope connections, screens or tags.
-.TP
-.B "[Ee][dit][!] [+cmd] [file]"
-.TP
-.B "[Ee]x[!] [+cmd] [file]"
+.Pp
+.It Xo
+.Op Cm Ee Ns
+.Op Cm dit Ns
+.Op Cm !\&
+.Op Ar +cmd
+.Op Ar file
+.Xc
+.It Xo
+.Op Cm Ee Ns
+.Cm x Ns Op Cm !\&
+.Op Ar +cmd
+.Op Ar file
+.Xc
 Edit a different file.
-.TP
-.B "exu[sage] [command]"
+.Pp
+.It Xo
+.Cm exu Ns Op Cm sage
+.Op Ar command
+.Xc
 Display usage for an
-.I \&ex
+.Nm ex
 command.
-.TP
-.B "f[ile] [file]"
+.Pp
+.It Xo
+.Cm f Ns Op Cm ile
+.Op Ar file
+.Xc
 Display and optionally change the file name.
-.TP
-.B "[Ff]g [name]"
-.I \&Vi
+.Pp
+.It Xo
+.Op Cm Ff Ns
+.Cm g
+.Op Ar name
+.Xc
+.Nm vi
 mode only.
 Foreground the specified screen.
-.TP
-.B "[range] g[lobal] /pattern/ [commands]"
-.TP
-.B "[range] v /pattern/ [commands]"
-Apply commands to lines matching (or not matching) a pattern.
-.TP
-.B "he[lp]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm g Ns Op Cm lobal
+.No / Ns Ar pattern Ns /
+.Op Ar commands
+.Xc
+.It Xo
+.Op Ar range
+.Cm v
+.No / Ns Ar pattern Ns /
+.Op Ar commands
+.Xc
+Apply commands to lines matching
+.Pq or not matching
+a pattern.
+.Pp
+.It Cm he Ns Op Cm lp
 Display a help message.
-.TP
-.B "[line] i[nsert][!]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm i Ns Op Cm nsert Ns
+.Op Cm !\&
+.Xc
 The input text is inserted before the specified line.
-.TP
-.B "[range] j[oin][!] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm j Ns Op Cm oin Ns
+.Op Cm !\&
+.Op Ar count
+.Op Ar flags
+.Xc
 Join lines of text together.
-.TP
-.B "[range] l[ist] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm l Ns Op Cm ist
+.Op Ar count
+.Op Ar flags
+.Xc
 Display the lines unambiguously.
-.TP
-.B "map[!] [lhs rhs]"
+.Pp
+.It Xo
+.Cm map Ns Op Cm !\&
+.Op Ar lhs rhs
+.Xc
 Define or display maps (for
-.I \&vi
+.Nm vi
 only).
-.TP
-.B "[line] ma[rk] <character>"
-.TP
-.B "[line] k <character>"
+.Pp
+.It Xo
+.Op Ar line
+.Cm ma Ns Op Cm rk
+.Aq Ar character
+.Xc
+.It Xo
+.Op Ar line
+.Cm k Aq Ar character
+.Xc
 Mark the line with the mark
-.IR <character> .
-.TP
-.B "[range] m[ove] line"
+.Aq Ar character .
+.Pp
+.It Xo
+.Op Ar range
+.Cm m Ns Op Cm ove
+.Ar line
+.Xc
 Move the specified lines after the target line.
-.TP
-.B "mk[exrc][!] file"
+.Pp
+.It Xo
+.Cm mk Ns Op Cm exrc Ns
+.Op Cm !\&
+.Ar file
+.Xc
 Write the abbreviations, editor options and maps to the specified
-file.
-.TP
-.B "[Nn][ext][!] [file ...]"
+.Ar file .
+.Pp
+.It Xo
+.Op Cm Nn Ns
+.Op Cm ext Ns
+.Op Cm !\&
+.Op Ar file ...
+.Xc
 Edit the next file from the argument list.
-.TP
-.B "[line] o[pen] /pattern/ [flags]"
-Enter open mode.
-.TP
-.B "pre[serve]"
+.\" .Pp
+.\" .It Xo
+.\" .Op Ar line
+.\" .Cm o Ns Op Cm pen
+.\" .No / Ns Ar pattern Ns /
+.\" .Op Ar flags
+.\" .Xc
+.\" Enter open mode.
+.Pp
+.It Cm pre Ns Op Cm serve
 Save the file in a form that can later be recovered using the
-.I \&ex
-.B \-r
+.Nm ex
+.Fl r
 option.
-.TP
-.B "[Pp]rev[ious][!]"
+.Pp
+.It Xo
+.Op Cm \&Pp Ns
+.Cm rev Ns Op Cm ious Ns
+.Op Cm !\&
+.Xc
 Edit the previous file from the argument list.
-.TP
-.B "[range] p[rint] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm p Ns Op Cm rint
+.Op Ar count
+.Op Ar flags
+.Xc
 Display the specified lines.
-.TP
-.B "[line] pu[t] [buffer]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm pu Ns Op Cm t
+.Op Ar buffer
+.Xc
 Append buffer contents to the current line.
-.TP
-.B "q[uit][!]"
+.Pp
+.It Xo
+.Cm q Ns Op Cm uit Ns
+.Op Cm !\&
+.Xc
 End the editing session.
-.TP
-.B "[line] r[ead][!] [file]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm r Ns Op Cm ead Ns
+.Op Cm !\&
+.Op Ar file
+.Xc
 Read a file.
-.TP
-.B "rec[over] file"
+.Pp
+.It Xo
+.Cm rec Ns Op Cm over
+.Ar file
+.Xc
 Recover
-.I file
+.Ar file
 if it was previously saved.
-.TP
-.B "res[ize] [+|-]size"
-.I \&Vi
+.Pp
+.It Xo
+.Cm res Ns Op Cm ize
+.Op Cm + Ns | Ns Cm - Ns
+.Ar size
+.Xc
+.Nm vi
 mode only.
 Grow or shrink the current screen.
-.TP
-.B "rew[ind][!]"
+.Pp
+.It Xo
+.Cm rew Ns Op Cm ind Ns
+.Op Cm !\&
+.Xc
 Rewind the argument list.
-.TP
-.B "se[t] [option[=[value]] ...] [nooption ...] [option? ...] [all]"
+.Pp
+.It Xo
+.Cm se Ns Op Cm t
+.Sm off
+.Op option Oo = Oo value Oc Oc \ \&...
+.Sm on
+.Pf \ \& Op nooption ...
+.Op option? ...
+.Op Ar all
+.Xc
 Display or set editor options.
-.TP
-.B "sh[ell]"
+.Pp
+.It Cm sh Ns Op Cm ell
 Run a shell program.
-.TP
-.B "so[urce] file"
+.Pp
+.It Xo
+.Cm so Ns Op Cm urce
+.Ar file
+.Xc
 Read and execute
-.I \&ex
+.Nm ex
 commands from a file.
-.TP
-.B "[range] s[ubstitute] [/pattern/replace/] [options] [count] [flags]"
-.TP
-.B "[range] & [options] [count] [flags]"
-.TP
-.B "[range] ~ [options] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm s Ns Op Cm ubstitute
+.Sm off
+.Op / Ar pattern No / Ar replace  No /
+.Sm on
+.Pf \ \& Op Ar options
+.Op Ar count
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm &
+.Op Ar options
+.Op Ar count
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm ~
+.Op Ar options
+.Op Ar count
+.Op Ar flags
+.Xc
 Make substitutions.
-.TP
-.B "su[spend][!]"
-.TP
-.B "st[op][!]"
-.TP
-.B <suspend>
+.Pp
+.It Xo
+.Cm su Ns Op Cm spend Ns
+.Op Cm !\&
+.Xc
+.It Xo
+.Cm st Ns Op Cm op Ns
+.Op Cm !\&
+.Xc
+.It Aq Cm suspend
 Suspend the edit session.
-.TP
-.B "[Tt]a[g][!] tagstring"
+The
+.Aq suspend
+character is usually
+.Aq control-Z .
+.Pp
+.It Xo
+.Op Cm Tt Ns
+.Cm a Ns Op Cm g Ns
+.Op Cm !\&
+.Ar tagstring
+.Xc
 Edit the file containing the specified tag.
-.TP
-.B "tagn[ext][!]"
+.Pp
+.It Xo
+.Cm tagn Ns Op Cm ext Ns
+.Op Cm !\&
+.Xc
 Edit the file containing the next context for the current tag.
-.TP
-.B "tagp[op][!] [file | number]"
+.Pp
+.It Xo
+.Cm tagp Ns Op Cm op Ns
+.Op Cm !\&
+.Op Ar file | number
+.Xc
 Pop to the specified tag in the tags stack.
-.TP
-.B "tagp[rev][!]"
+.Pp
+.It Xo
+.Cm tagp Ns Op Cm rev Ns
+.Op Cm !\&
+.Xc
 Edit the file containing the previous context for the current tag.
-.TP
-.B "unm[ap][!] lhs"
+.Pp
+.It Xo
+.Cm tagt Ns Op Cm op Ns
+.Op Cm !\&
+.Xc
+Pop to the least recent tag on the tags stack, clearing the stack.
+.Pp
+.It Xo
+.Cm una Ns Op Cm bbrev
+.Ar lhs
+.Xc
+.Nm vi
+only.
+Delete an abbreviation.
+.Pp
+.It Cm u Ns Op Cm ndo
+Undo the last change made to the file.
+.Pp
+.It Xo
+.Cm unm Ns Op Cm ap Ns
+.Op Cm !\&
+.Ar lhs
+.Xc
 Unmap a mapped string.
-.TP
-.B "ve[rsion]"
+.Pp
+.It Cm ve Ns Op Cm rsion
 Display the version of the
-.I \&ex/vi
+.Nm ex Ns / Ns Nm vi
 editor.
-.TP
-.B "[line] vi[sual] [type] [count] [flags]"
-.I \&Ex
+.Pp
+.It Xo
+.Op Ar line
+.Cm vi Ns Op Cm sual
+.Op Ar type
+.Op Ar count
+.Op Ar flags
+.Xc
+.Nm ex
 mode only.
 Enter
-.IR \&vi .
-.TP
-.B "[Vi]i[sual][!] [+cmd] [file]"
-.I \&Vi
+.Nm vi .
+.Pp
+.It Xo
+.Op Cm Vi Ns
+.Cm i Ns Op Cm sual Ns
+.Op Cm !\&
+.Op Ar +cmd
+.Op Ar file
+.Xc
+.Nm vi
 mode only.
 Edit a new file.
-.TP
-.B "viu[sage] [command]"
+.Pp
+.It Xo
+.Cm viu Ns Op Cm sage
+.Op Ar command
+.Xc
 Display usage for a
-.I \&vi
+.Nm vi
 command.
-.TP
-.B "[range] w[rite][!] [>>] [file]"
-.TP
-.B "[range] w[rite] [!] [file]"
-.TP
-.B "[range] wn[!] [>>] [file]"
-.TP
-.B "[range] wq[!] [>>] [file]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm w Ns Op Cm rite Ns
+.Op Cm !\&
+.Op >>
+.Op Ar file
+.Xc
+.It Xo
+.Op Ar range
+.Cm w Ns Op Cm rite
+.Op Cm !\&
+.Op Ar file
+.Xc
+.It Xo
+.Op Ar range
+.Cm wn Ns Op Cm !\&
+.Op >>
+.Op Ar file
+.Xc
+.It Xo
+.Op Ar range
+.Cm wq Ns Op Cm !\&
+.Op >>
+.Op Ar file
+.Xc
 Write the file.
-.TP
-.B "[range] x[it][!] [file]"
-Write the file if it has been modified.
-.TP
-.B "[range] ya[nk] [buffer] [count]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm x Ns Op Cm it Ns
+.Op Cm !\&
+.Op Ar file
+.Xc
+Exit the editor,
+writing the file if it has been modified.
+.Pp
+.It Xo
+.Op Ar range
+.Cm ya Ns Op Cm nk
+.Op Ar buffer
+.Op Ar count
+.Xc
 Copy the specified lines to a buffer.
-.TP
-.B "[line] z [type] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm z
+.Op Ar type
+.Op Ar count
+.Op Ar flags
+.Xc
 Adjust the window.
-.SH SET OPTIONS
-There are a large number of options that may be set (or unset) to
-change the editor's behavior.
+.El
+.Sh SET OPTIONS
+There are a large number of options that may be set
+.Pq or unset
+to change the editor's behavior.
 This section describes the options, their abbreviations and their
 default values.
-.PP
+.Pp
 In each entry below, the first part of the tag line is the full name
 of the option, followed by any equivalent abbreviations.
 The part in square brackets is the default value of the option.
 Most of the options are boolean, i.e. they are either on or off,
 and do not have an associated value.
-.PP
+.Pp
 Options apply to both
-.I \&ex
+.Nm ex
 and
-.I \&vi
+.Nm vi
 modes, unless otherwise specified.
-.PP
-.TP
-.B "altwerase [off]"
-.I \&Vi
+.Bl -tag -width Ds
+.It Cm altwerase Bq off
+.Nm vi
 only.
 Select an alternate word erase algorithm.
-.TP
-.B "autoindent, ai [off]"
+.It Cm autoindent , ai Bq off
 Automatically indent new lines.
-.TP
-.B "autoprint, ap [off]"
-.I \&Ex
+.It Cm autoprint , ap Bq on
+.Nm ex
 only.
 Display the current line automatically.
-.TP
-.B "autowrite, aw [off]"
+.It Cm autowrite , aw Bq off
 Write modified files automatically when changing files.
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms backup [QQ]
-.TP
-.B "\*(ms"
-.tr QQ
-Backup files before they are overwritten.
-.TP
-.B "beautify, bf [off]"
+.It Cm backup Bq \&"\&"
+Back up files before they are overwritten.
+.It Cm beautify , bf Bq off
 Discard control characters.
-.TP
-.B "cdpath [environment variable CDPATH, or current directory]"
+.It Cm cdpath Bq "environment variable CDPATH, or current directory"
 The directory paths used as path prefixes for the
-.B cd
+.Cm cd
 command.
-.TP
-.B "cedit [no default]"
+.It Cm cedit Bq no default
 Set the character to edit the colon command-line history.
-.TP
-.B "columns, co [80]"
+.It Cm columns , co Bq 80
 Set the number of columns in the screen.
-.TP
-.B "comment [off]"
-.I \&Vi
+.It Cm comment Bq off
+.Nm vi
 only.
 Skip leading comments in shell, C and C++ language files.
-.TP
-.B "directory, dir [environment variable TMPDIR, or /tmp]"
+.It Cm directory , dir Bq "environment variable TMPDIR, or /tmp"
 The directory where temporary files are created.
-.TP
-.B "edcompatible, ed [off]"
-Remember the values of the ``c'' and ``g'' suffixes to the
-.B substitute
-commands, instead of initializing them as unset for each new
-command.
-.TP
-.B "errorbells, eb [off]"
-.I \&Ex
+.It Cm edcompatible , ed Bq off
+Remember the values of the
+.Sq c
+and
+.Sq g
+suffixes to the
+.Cm substitute
+commands, instead of initializing them as unset for each new command.
+.It Cm escapetime Bq 1
+The 10th's of a second
+.Nm ex Ns / Ns Nm vi
+waits for a subsequent key to complete an
+.Aq escape
+key mapping.
+.It Cm errorbells , eb Bq off
+.Nm ex
 only.
 Announce error messages with a bell.
-.TP
-.B "exrc, ex [off]"
+.It Cm exrc , ex Bq off
 Read the startup files in the local directory.
-.TP
-.B "extended [off]"
-Regular expressions are extended (i.e.
-.IR egrep (1)\-\c
+.It Cm extended Bq off
+Regular expressions are extended (i.e.\&
+.Xr egrep 1
 style) expressions.
-.TP
-.B "filec [no default]"
-Set the character to perform file path completion on the colon
-command line.
-.TP
-.B "flash [on]"
+.It Cm filec Bq no default
+Set the character to perform file path completion on the colon command line.
+.It Cm flash Bq on
 Flash the screen instead of beeping the keyboard on error.
-.TP
-.B "hardtabs, ht [8]"
+.It Cm hardtabs , ht Bq 0
 Set the spacing between hardware tab settings.
-.TP
-.B "iclower [off]"
-Makes all Regular Expressions case-insensitive,
+This option currently has no effect.
+.It Cm iclower Bq off
+Makes all regular expressions case-insensitive,
 as long as an upper-case letter does not appear in the search string.
-.TP
-.B "ignorecase, ic [off]"
+.It Cm ignorecase , ic Bq off
 Ignore case differences in regular expressions.
-.TP
-.B "keytime [6]"
+.It Cm keytime Bq 6
 The 10th's of a second
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 waits for a subsequent key to complete a key mapping.
-.TP
-.B "leftright [off]"
-.I \&Vi
+.It Cm leftright Bq off
+.Nm vi
 only.
 Do left-right scrolling.
-.TP
-.B "lines, li [24]"
-.I \&Vi
+.It Cm lines , li Bq 25
+.Nm vi
 only.
 Set the number of lines in the screen.
-.TP
-.B "lisp [off]"
-.I \&Vi
+.It Cm lisp Bq off
+.Nm vi
 only.
 Modify various search commands and options to work with Lisp.
-.I "This option is not yet implemented."
-.TP
-.B "list [off]"
+This option is not yet implemented.
+.It Cm list Bq off
 Display lines in an unambiguous fashion.
-.TP
-.B "lock [on]"
-Attempt to get an exclusive lock on any file being edited,
-read or written.
-.TP
-.B "magic [on]"
+.It Cm lock Bq on
+Attempt to get an exclusive lock on any file being edited, read or written.
+.It Cm magic Bq on
 Treat certain characters specially in regular expressions.
-.TP
-.B "matchtime [7]"
-.I \&Vi
+.It Cm matchtime Bq 7
+.Nm vi
 only.
 The 10th's of a second
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 pauses on the matching character when the
-.B showmatch
+.Cm showmatch
 option is set.
-.TP
-.B "mesg [on]"
+.It Cm mesg Bq on
 Permit messages from other users.
-.TP
-.B "modelines, modeline [off]"
+.It Cm mesgcat Bq /usr/share/vi/catalog/
+Selects a message catalog to be used to display error and informational
+messages in a specified language.
+.It Cm modelines , modeline Bq off
 Read the first and last few lines of each file for
-.I ex
+.Nm ex
 commands.
-.I "This option will never be implemented."
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms noprint [QQ]
-.TP
-.B "\*(ms"
-.tr QQ
+This option will never be implemented.
+.It Cm noprint Bq \&"\&"
 Characters that are never handled as printable characters.
-.TP
-.B "number, nu [off]"
+.It Cm number, nu Bq off
 Precede each line displayed with its current line number.
-.TP
-.B "octal [off]"
+.It Cm octal Bq off
 Display unknown characters as octal numbers, instead of the default
 hexadecimal.
-.TP
-.B "open [on]"
-.I \&Ex
+.It Cm open Bq on
+.Nm ex
 only.
 If this option is not set, the
-.B open
+.Cm open
 and
-.B visual
+.Cm visual
 commands are disallowed.
-.TP
-.B "optimize, opt [on]"
-.I \&Vi
+.It Cm optimize , opt Bq on
+.Nm vi
 only.
 Optimize text throughput to dumb terminals.
-.I "This option is not yet implemented."
-.TP
-.B "paragraphs, para [IPLPPPQPP LIpplpipbp]"
-.I \&Vi
+This option is not yet implemented
+.It Cm paragraphs , para Bq "IPLPPPQPP LIpplpipbp"
+.Nm vi
 only.
 Define additional paragraph boundaries for the
-.B \&{
+.Cm {\&
 and
-.B \&}
+.Cm }\&
 commands.
-.TP
-.B "path []"
+.It Cm path Bq \&"\&"
 Define additional directories to search for files being edited.
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms print [QQ]
-.TP
-.B "\*(ms"
-.tr QQ
+.It Cm print Bq \&"\&"
 Characters that are always handled as printable characters.
-.TP
-.B "prompt [on]"
-.I \&Ex
+.It Cm prompt Bq on
+.Nm ex
 only.
 Display a command prompt.
-.TP
-.B "readonly, ro [off]"
+.It Cm readonly , ro Bq off
 Mark the file and session as read-only.
-.TP
-.B "recdir [/var/tmp/vi.recover]"
+.It Cm recdir Bq /var/tmp/vi.recover
 The directory where recovery files are stored.
-.TP
-.B "redraw, re [off]"
-.I \&Vi
+.It Cm redraw , re Bq off
+.Nm vi
 only.
 Simulate an intelligent terminal on a dumb one.
-.I "This option is not yet implemented."
-.TP
-.B "remap [on]"
+This option is not yet implemented.
+.It Cm remap Bq on
 Remap keys until resolved.
-.TP
-.B "report [5]"
-Set the number of lines about which the editor reports changes
-or yanks.
-.TP
-.B "ruler [off]"
-.I \&Vi
+.It Cm report Bq 5
+Set the number of lines about which the editor reports changes or yanks.
+.It Cm ruler Bq off
+.Nm vi
 only.
 Display a row/column ruler on the colon command line.
-.TP
-.B "scroll, scr [window / 2]"
+.It Cm scroll , scr Bq "window / 2"
 Set the number of lines scrolled.
-.TP
-.B "searchincr [off]"
+.It Cm searchincr Bq off
 Makes the
-.B \&/
+.Cm /
 and
-.B \&?
+.Cm ?\&
 commands incremental.
-.TP
-.B "sections, sect [NHSHH HUnhsh]"
-.I \&Vi
+.It Cm sections , sect Bq "NHSHH HUnhsh"
+.Nm vi
 only.
 Define additional section boundaries for the
-.B \&[[
+.Cm [[
 and
-.B \&]]
+.Cm ]]
 commands.
-.TP
-.B "secure [off]"
+.It Cm secure Bq off
 Turns off all access to external programs.
-.TP
-.B "shell, sh [environment variable SHELL, or /bin/sh]"
+.It Cm shell , sh Bq "environment variable SHELL, or /bin/sh"
 Select the shell used by the editor.
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms shellmeta [~{[*?$`'Q\e]
-.TP
-.B "\*(ms"
-.tr QQ
+.It Cm shellmeta Bq ~{[*?$`'\&"\e
 Set the meta characters checked to determine if file name expansion
 is necessary.
-.TP
-.B "shiftwidth, sw [8]"
+.It Cm shiftwidth , sw Bq 8
 Set the autoindent and shift command indentation width.
-.TP
-.B "showmatch, sm [off]"
-.I \&Vi
+.It Cm showmatch , sm Bq off
+.Nm vi
 only.
-Note matching ``{'' and ``('' for ``}'' and ``)'' characters.
-.TP
-.B "showmode, smd [off]"
-.I \&Vi
+Note matching
+.Sq {
+and
+.Sq (
+for
+.Sq }
+and
+.Sq )\&
+characters.
+.It Cm showmode , smd Bq off
+.Nm vi
 only.
-Display the current editor mode and a ``modified'' flag.
-.TP
-.B "sidescroll [16]"
-.I \&Vi
+Display the current editor mode and a
+.Dq modified
+flag.
+.It Cm sidescroll Bq 16
+.Nm vi
 only.
 Set the amount a left-right scroll will shift.
-.TP
-.B "slowopen, slow [off]"
+.It Cm slowopen , slow Bq off
 Delay display updating during text input.
-.I "This option is not yet implemented."
-.TP
-.B "sourceany [off]"
+This option is not yet implemented.
+.It Cm sourceany Bq off
 Read startup files not owned by the current user.
-.I "This option will never be implemented."
-.TP
-.B "tabstop, ts [8]"
+This option will never be implemented.
+.It Cm tabstop , ts Bq 8
 This option sets tab widths for the editor display.
-.TP
-.B "taglength, tl [0]"
+.It Cm taglength , tl Bq 0
 Set the number of significant characters in tag names.
-.TP
-.B "tags, tag [tags /var/db/libc.tags /sys/kern/tags]"
+.It Cm tags, tag Bq tags
 Set the list of tags files.
-.TP
-.B "term, ttytype, tty [environment variable TERM]"
+.It Xo
+.Cm term , ttytype , tty
+.Bq "environment variable TERM"
+.Xc
 Set the terminal type.
-.TP
-.B "terse [off]"
+.It Cm terse Bq off
 This option has historically made editor messages less verbose.
 It has no effect in this implementation.
-.TP
-.B "tildeop [off]"
+.It Cm tildeop Bq off
 Modify the
-.B \&~
+.Cm ~
 command to take an associated motion.
-.TP
-.B "timeout, to [on]"
+.It Cm timeout , to Bq on
 Time out on keys which may be mapped.
-.TP
-.B "ttywerase [off]"
-.I \&Vi
+.It Cm ttywerase Bq off
+.Nm vi
 only.
 Select an alternate erase algorithm.
-.TP
-.B "verbose [off]"
-.I \&Vi
+.It Cm verbose Bq off
+.Nm vi
 only.
 Display an error message for every error.
-.TP
-.B "w300 [no default]"
-.I \&Vi
-only.
-Set the window size if the baud rate is less than 1200 baud.
-.TP
-.B "w1200 [no default]"
-.I \&Vi
-only.
-Set the window size if the baud rate is equal to 1200 baud.
-.TP
-.B "w9600 [no default]"
-.I \&Vi
+.\" .It Cm w300 Bq no default
+.\" .Nm vi
+.\" only.
+.\" Set the window size if the baud rate is less than 1200 baud.
+.\" .It Cm w1200 Bq no default
+.\" .Nm vi
+.\" only.
+.\" Set the window size if the baud rate is equal to 1200 baud.
+.\" .It Cm w9600 Bq no default
+.\" .Nm vi
+.\" only.
+.\" Set the window size if the baud rate is greater than 1200 baud.
+.It Cm warn Bq on
+.Nm ex
 only.
-Set the window size if the baud rate is greater than 1200 baud.
-.TP
-.B "warn [on]"
-.I \&Ex
-only.
-This option causes a warning message to be printed on the terminal 
+This option causes a warning message to be printed on the terminal
 if the file has been modified since it was last written, before a
-.B \&!
+.Cm !\&
 command.
-.TP
-.B "window, w, wi [environment variable LINES]"
+.It Xo
+.Cm window , w , wi
+.Bq "environment variable LINES \- 1"
+.Xc
 Set the window size for the screen.
-.TP
-.B "windowname [off]"
+.It Cm windowname Bq off
 Change the icon/window name to the current file name even if it can't
 be restored on editor exit.
-.TP
-.B "wraplen, wl [0]"
-.I \&Vi
+.It Cm wraplen , wl Bq 0
+.Nm vi
 only.
-Break lines automatically, the specified number of columns from the
-left-hand margin.
+Break lines automatically,
+the specified number of columns from the left-hand margin.
 If both the
-.B wraplen
+.Cm wraplen
 and
-.B wrapmargin
+.Cm wrapmargin
 edit options are set, the
-.B wrapmargin
+.Cm wrapmargin
 value is used.
-.TP
-.B "wrapmargin, wm [0]"
-.I \&Vi
+.It Cm wrapmargin , wm Bq 0
+.Nm vi
 only.
-Break lines automatically, the specified number of columns from the
-right-hand margin.
+Break lines automatically,
+the specified number of columns from the right-hand margin.
 If both the
-.B wraplen
+.Cm wraplen
 and
-.B wrapmargin
+.Cm wrapmargin
 edit options are set, the
-.B wrapmargin
+.Cm wrapmargin
 value is used.
-.TP
-.B "wrapscan, ws [on]"
+.It Cm wrapscan , ws Bq on
 Set searches to wrap around the end or beginning of the file.
-.TP
-.B "writeany, wa [off]"
+.It Cm writeany , wa Bq off
 Turn off file-overwriting checks.
-.SH ENVIRONMENTAL VARIABLES
-.TP
-.I COLUMNS
+.El
+.Sh ENVIRONMENTAL VARIABLES
+.Bl -tag -width "COLUMNS"
+.It Ev COLUMNS
 The number of columns on the screen.
 This value overrides any system or terminal specific values.
 If the
-.I COLUMNS
+.Ev COLUMNS
 environmental variable is not set when
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 runs, or the
-.B columns
+.Cm columns
 option is explicitly reset by the user,
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 enters the value into the environment.
-.TP
-.I EXINIT
+.It Ev EXINIT
 A list of
-.I \&ex
-startup commands, read if the variable
-.I NEXINIT
+.Nm ex
+startup commands; read if the variable
+.Ev NEXINIT
 is not set.
-.TP
-.I HOME
-The user's home directory, used as the initial directory path
-for the startup ``$\fIHOME\fP/.nexrc'' and ``$\fIHOME\fP/.exrc''
+.It Ev HOME
+The user's home directory, used as the initial directory path for the startup
+.Pa $HOME/.nexrc
+and
+.Pa $HOME/.exrc
 files.
 This value is also used as the default directory for the
-.I \&vi
-.B \&cd
+.Nm vi
+.Cm cd
 command.
-.TP
-.I LINES
+.It Ev LINES
 The number of rows on the screen.
 This value overrides any system or terminal specific values.
 If the
-.I LINES
+.Ev LINES
 environmental variable is not set when
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 runs, or the
-.B lines
+.Cm lines
 option is explicitly reset by the user,
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 enters the value into the environment.
-.TP
-.I NEXINIT
+.It Ev NEXINIT
 A list of
-.I \&ex
+.Nm ex
 startup commands.
-.TP
-.I SHELL
+.It Ev SHELL
 The user's shell of choice (see also the
-.B shell
+.Cm shell
 option).
-.TP
-.I TERM
+.It Ev TERM
 The user's terminal type.
-The default is the type ``unknown''.
+The default is the type
+.Dq unknown .
 If the
-.I TERM
+.Ev TERM
 environmental variable is not set when
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 runs, or the
-.B term
+.Cm term
 option is explicitly reset by the user,
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 enters the value into the environment.
-.TP
-.I TMPDIR
+.It Ev TMPDIR
 The location used to stored temporary files (see also the
-.B directory
+.Cm directory
 edit option).
-.SH ASYNCHRONOUS EVENTS
-.TP
-SIGALRM
-.I \&Vi/ex
-uses this signal for periodic backups of file modifications and to
-display ``busy'' messages when operations are likely to take a long time.
-.TP
-SIGHUP
-.TP
-SIGTERM
-If the current buffer has changed since it was last written in its
-entirety, the editor attempts to save the modified file so it can
-be later recovered.
+.El
+.Sh ASYNCHRONOUS EVENTS
+.Bl -tag -width "SIGWINCH" -compact
+.It Dv SIGALRM
+.Nm vi Ns / Ns Nm ex
+uses this signal for periodic backups of file modifications and to display
+.Dq busy
+messages when operations are likely to take a long time.
+.Pp
+.It Dv SIGHUP
+.It Dv SIGTERM
+If the current buffer has changed since it was last written in its entirety,
+the editor attempts to save the modified file so it can be later recovered.
 See the
-.I \&vi/ex
-Reference manual section entitled ``Recovery'' for more information.
-.TP
-SIGINT
-When an interrupt occurs,
-the current operation is halted,
+.Nm vi Ns / Ns Nm ex
+reference manual section
+.Sx Recovery
+for more information.
+.Pp
+.It Dv SIGINT
+When an interrupt occurs, the current operation is halted
 and the editor returns to the command level.
 If interrupted during text input,
 the text already input is resolved into the file as if the text
 input had been normally terminated.
-.TP
-SIGWINCH
+.Pp
+.It Dv SIGWINCH
 The screen is resized.
 See the
-.I \&vi/ex
-Reference manual section entitled ``Sizing the Screen'' for more information.
-.TP
-SIGCONT
-.TP
-SIGTSTP
-.I \&Vi/ex
-ignores these signals.
-.SH FILES
-.TP
-/bin/sh
+.Nm vi Ns / Ns Nm ex
+reference manual section
+.Sx Sizing the Screen
+for more information.
+.\" .Pp
+.\" .It Dv SIGCONT
+.\" .It Dv SIGTSTP
+.\" .Nm vi Ns / Ns Nm ex
+.\" ignores these signals.
+.El
+.Sh FILES
+.Bl -tag -width "/var/tmp/vi.recover"
+.It Pa /bin/sh
 The default user shell.
-.TP
-/etc/vi.exrc
-System-wide vi startup file.
-.TP
-/tmp
+.It Pa /etc/vi.exrc
+System-wide
+.Nm vi
+startup file.
+.It Pa /tmp
 Temporary file directory.
-.TP
-/var/tmp/vi.recover
+.It Pa /var/tmp/vi.recover
 The default recovery file directory.
-.TP
-$HOME/.nexrc
-1st choice for user's home directory startup file.
-.TP
-$HOME/.exrc
-2nd choice for user's home directory startup file.
-.TP
-\&.nexrc
-1st choice for local directory startup file.
-.TP
-\&.exrc
-2nd choice for local directory startup file.
-.SH SEE ALSO
-.IR ctags (1),
-.IR more (1),
-.IR curses (3),
-.IR dbopen (3)
-.sp
-The ``Vi Quick Reference'' card.
-.sp
-``An Introduction to Display Editing with Vi'', found in the
-``UNIX User's Manual Supplementary Documents''
+.It Pa $HOME/.nexrc
+First choice for user's home directory startup file.
+.It Pa $HOME/.exrc
+Second choice for user's home directory startup file.
+.It Pa .nexrc
+First choice for local directory startup file.
+.It Pa .exrc
+Second choice for local directory startup file.
+.El
+.Sh SEE ALSO
+.Xr ctags 1 ,
+.Xr egrep 1
+.Pp
+The
+.Qq Vi Quick Reference
+card.
+.Pp
+.Qq An Introduction to Display Editing with Vi ,
+found in the UNIX User's Manual Supplementary Documents
 section of both the 4.3BSD and 4.4BSD manual sets.
 This document is the closest thing available to an introduction to the
-.I \&vi
+.Nm vi
 screen editor.
-.sp
-``Ex Reference Manual (Version 3.7)'',
-found in the
-``UNIX User's Manual Supplementary Documents''
+.Pp
+.Qq \&Ex Reference Manual (Version 3.7) ,
+found in the UNIX User's Manual Supplementary Documents
 section of both the 4.3BSD and 4.4BSD manual sets.
 This document is the final reference for the
-.I \&ex
+.Nm ex
 editor, as distributed in most historic 4BSD and System V systems.
-.sp
-``Edit: A tutorial'',
-found in the
-``UNIX User's Manual Supplementary Documents''
+.Pp
+.Qq Edit: A tutorial ,
+found in the UNIX User's Manual Supplementary Documents
 section of the 4.3BSD manual set.
 This document is an introduction to a simple version of the
-.I \&ex
+.Nm ex
 screen editor.
-.sp
-``Ex/Vi Reference Manual'',
-found in the
-``UNIX User's Manual Supplementary Documents''
+.Pp
+.Qq Ex/Vi Reference Manual ,
+found in the UNIX User's Manual Supplementary Documents
 section of the 4.4BSD manual set.
 This document is the final reference for the
-.I \&nex/nvi
+.Nm nex Ns / Ns Nm nvi
 text editors, as distributed in 4.4BSD and 4.4BSD-Lite.
-.PP
-.I Roff
-source for all of these documents is distributed with
-.I nex/nvi
+.Pp
+Roff source for all of these documents is distributed with
+.Nm nex Ns / Ns Nm nvi
 in the
-.I nvi/USD.doc
+.Pa vi/USD.doc
 directory of the
-.I nex/nvi
+.Pa nex/nvi
 source code.
-.sp
-The files ``autowrite'', ``input'', ``quoting'' and ``structures''
+.Pp
+The files
+.Pa autowrite ,
+.Pa input ,
+.Pa quoting ,
+and
+.Pa structures
 found in the
-.I nvi/docs/internals
+.Pa vi/docs/internals
 directory of the
-.I nex/nvi
+.Nm nex Ns / Ns Nm nvi
 source code.
-.SH HISTORY
-The
-.I nex/nvi
-replacements for the
-.I ex/vi
-editor first appeared in 4.4BSD.
-.SH STANDARDS
-.I \&Nex/nvi
-is close to IEEE Std1003.2 (``POSIX'').
+.Sh STANDARDS
+.Nm nex Ns / Ns Nm nvi
+is close to
+.St -p1003.2 .
 That document differs from historical
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 practice in several places; there are changes to be made on both sides.
+.Sh HISTORY
+The
+.Nm nex Ns / Ns Nm nvi
+replacements for the
+.Nm ex Ns / Ns Nm vi
+editor first appeared in
+.Bx 4.4 .
+.Sh LICENSE
+The vi program is freely redistributable.
+You are welcome to copy, modify and share it with others
+under the conditions listed in the LICENSE file.
+If any company (not individual!) finds vi sufficiently useful
+that you would have purchased it, or if any company wishes to redistribute it,
+contributions to the authors would be appreciated.