Various cleanup.

19 files changed, 405 insertions, 248 deletions

diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index ebc6c68a6d6..99ae97eb183 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: error.1,v 1.8 1999/12/04 19:04:52 aaron Exp $
+.\"	$OpenBSD: error.1,v 1.9 2000/03/07 21:11:07 aaron Exp $
 .\"	$NetBSD: error.1,v 1.3 1995/09/02 06:15:20 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -67,9 +67,7 @@ Do
 touch any files; all error messages are sent to the
 standard output.
 .It Fl q
-The user is
-.Ar queried
-whether s/he wants to touch the file.
+The user is queried whether or not to touch the file.
 A
 .Sq y
 or
@@ -106,15 +104,13 @@ Thus the suffix list:
 allows
 .Nm
 to touch files ending with
-.Sq \&.c ,
-.Sq \&.y ,
-.Sq \&.foo\&* ,
+.Dq \&.c ,
+.Dq \&.y ,
+.Dq \&.foo\&* ,
 and
-.Sq \&.h .
+.Dq \&.h .
 .It Fl s
-Print out
-.Em statistics
-regarding the error categorization.
+Print out statistics regarding the error categorization.
 Not too useful.
 .It Fl I Ar ignorefile
 Specifies a file containing a list of functions to ignore.
@@ -169,8 +165,8 @@ knows about the error messages produced by:
 .Xr pi 1 ,
 .Xr pc 1 ,
 .Xr f77 1 ,
-and
-.Em DEC Western Research Modula\-2 .
+and DEC Western Research Modula\-2.
+.Pp
 .Nm
 knows a standard format for error messages produced by
 the language processors,
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 2597527e8e2..45d634bc5c6 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: expand.1,v 1.6 1999/07/04 11:53:53 aaron Exp $
+.\"	$OpenBSD: expand.1,v 1.7 2000/03/07 21:11:08 aaron Exp $
 .\"	$NetBSD: expand.1,v 1.3 1995/09/02 06:19:45 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -50,12 +50,12 @@
 .Op Fl a
 .Op Ar file Ar ...
 .Sh DESCRIPTION
-.Nm
+.Nm expand
 processes the named files or the standard input writing
 the standard output with tabs changed into blanks.
 Backspace characters are preserved into the output and decrement
 the column count for tab calculations.
-.Nm
+.Nm expand
 is useful for pre-processing character files
 (before sorting, looking at specific columns, etc.) that
 contain tabs.
@@ -72,19 +72,22 @@ specific columns.
 puts tabs back into the data from the standard input or the named
 files and writes the result on the standard output.
 .Pp
-Option (with
+The options (for
 .Nm unexpand
-only):
+only) are as follows:
 .Bl -tag -width flag
 .It Fl a
 By default, only leading blanks and tabs
-are reconverted to maximal strings of tabs.  If the
+are reconverted to maximal strings of tabs.
+If the
 .Fl a
 option is given, tabs are inserted whenever they would compress the
 resultant file by replacing two or more characters.
 .El
+.Sh SEE ALSO
+.Xr fold 1
 .Sh HISTORY
 The
-.Nm
+.Nm expand
 command appeared in
 .Bx 3.0 .
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 18e96e6cb5a..e563265abd9 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.  Poul-Henning Kamp
 .\" ---------------------------------------------------------------------------
 .\"
-.\" $Id: file2c.1,v 1.6 1999/07/04 11:53:54 aaron Exp $
+.\" $Id: file2c.1,v 1.7 2000/03/07 21:11:08 aaron Exp $
 .\"
 .Dd January 28, 1995
 .Dt FILE2C 1
@@ -20,18 +20,21 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility reads a file from stdin and writes it to stdout, converting each
+utility reads a file from the standard input and writes it to the standard
+output, converting each
 byte to its decimal representation on the fly.
 .Pp
 If the first
-.Op string
-is present, it is printed before the data. If the second
-.Op string
+.Ar string
+is present, it is printed before the data.
+If the second
+.Ar string
 is present, it is printed after the data.
 .Pp
 This program is used to embed binary or other files into C source files,
-for instance as a char[].
-.Sh EXAMPLE
+for instance as a
+.Li char[] .
+.Sh EXAMPLES
 The command:
 .Bd -literal -offset indent
 date | file2c 'const char date[] = {' ',0};'
@@ -44,5 +47,6 @@ const char date[] = {
 32,80,83,84,32,49,57,57,53,10
 ,0};
 .Ed
-
-
+.Sh SEE ALSO
+.Xr hexdump 1 ,
+.Xr od 1
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 3306c4e2089..4b5b9251c2a 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: find.1,v 1.25 2000/03/06 03:15:59 aaron Exp $
+.\"	$OpenBSD: find.1,v 1.26 2000/03/07 21:11:08 aaron Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -527,7 +527,7 @@ are extensions to
 .Pp
 Historically, the
 .Fl d ,
-.Fl H
+.Fl H ,
 and
 .Fl x
 options were implemented using the primaries
@@ -600,8 +600,8 @@ construct.
 .Pp
 The
 .Fl W
-option is probably not the most elegant way to handle whiteouts. It may
-be replaced by a more sophisticated algorithm eventually.
+option is probably not the most elegant way to handle whiteouts.
+It may be replaced by a more sophisticated algorithm eventually.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 5203e241377..faafaccfa57 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: finger.1,v 1.12 2000/01/12 01:53:30 aaron Exp $
+.\"	$OpenBSD: finger.1,v 1.13 2000/03/07 21:11:08 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -179,7 +179,8 @@ is case insensitive.
 .It Fl M
 Enable matching of
 .Ar user
-names.  This is disabled by default on systems running YP or with large
+names.
+This is disabled by default on systems running YP or with large
 password databases.
 .El
 .Pp
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 5bbedcf58a3..66cc1c5cfb6 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.8 2000/03/05 00:28:53 aaron Exp $
+.\" $OpenBSD: fmt.1,v 1.9 2000/03/07 21:11:08 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -51,7 +51,7 @@
 .Ar goal
 .Op Ar maximum
 .Oc
-.Op name ...
+.Op Ar name ...
 .Sh DESCRIPTION
 .Nm
 is a simple text formatter which reads the concatenation of input
@@ -66,19 +66,21 @@ The
 length defaults
 to 65 and the
 .Ar maximum
-to 10 more than the goal length.  The spacing at the beginning of the
-input lines is preserved in the output, as are blank lines and
-interword spacing.
+to 10 more than the goal length.
+The spacing at the beginning of the input lines is preserved in the output,
+as are blank lines and interword spacing.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl c
-Center the text, line by line. In this case, most of the other
+Center the text, line by line.
+In this case, most of the other
 options are ignored; no splitting or joining of lines is done.
 .It Fl m
 Try to format mail header lines contained in the input sensibly.
 .It Fl p
-Allow indented paragraphs. Without the
+Allow indented paragraphs.
+Without the
 .Fl p
 flag, any change in the amount of whitespace at the start of a line
 results in a new paragraph being begun.
@@ -89,9 +91,11 @@ sentence, a double space.)
 .It Fl d Ar chars
 Treat the
 .Ar chars
-(and no others) as sentence-ending characters. By default the
+(and no others) as sentence-ending characters.
+By default the
 sentence-ending characters are full stop, question mark and
-exclamation mark. Remember that some characters may need to be
+exclamation mark.
+Remember that some characters may need to be
 escaped to protect them from your shell.
 .It Fl l Ar number
 Replace multiple spaces with tabs at the start of each output
@@ -101,7 +105,8 @@ spaces will be replaced with one tab.
 .It Fl t Ar number
 Assume that the input files' tabs assume
 .Ar number
-spaces per tab stop. The default is 8.
+spaces per tab stop.
+The default is 8.
 .El
 .Pp
 .Nm
@@ -128,8 +133,7 @@ command appeared in
 .Bx 3 .
 .Pp
 The version described herein is a complete rewrite and appeared in
-.Bx Open
-2.4.
+.Ox 2.4 .
 .\" .Sh AUTHOR
 .\" Kurt Shoens
 .\" .br
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index 8d881780ae0..72f8830754c 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fsplit.1,v 1.6 1999/07/04 11:53:54 aaron Exp $
+.\"	$OpenBSD: fsplit.1,v 1.7 2000/03/07 21:11:08 aaron Exp $
 .\"	$NetBSD: fsplit.1,v 1.3 1995/09/28 05:15:06 perry Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -54,9 +54,11 @@ form
 .Ar name.f ,
 where
 .Ar name
-is the name of the program unit (e.g. function, subroutine, block data or
-program).  The name for unnamed block data subprograms has the form
-.Ar blkdtaNNN.f
+is the name of the program unit (e.g., function, subroutine, block data or
+program).
+.Pp
+The name for unnamed block data subprograms has the form
+.Ar blkdtaNNN.f ,
 where NNN is three digits and a file of this name does not already exist.
 For unnamed main programs the name has the form
 .Ar mainNNN.f .
@@ -64,20 +66,27 @@ If there is an error in classifying a program unit, or if
 .Ar name.f
 already exists,
 the program unit will be put in a file of the form
-.Ar zzzNNN.f
+.Ar zzzNNN.f ,
 where
 .Ar zzzNNN.f
 does not already exist.
+.Pp
+The options are as follows:
 .Bl -tag -width Fl
 .It Fl e Ar efile
-Normally each subprogram unit is split into a separate file.  When the
+Normally each subprogram unit is split into a separate file.
+When the
 .Fl e
 option is used, only the specified subprogram units are split into separate
-files.  E.g.:
+files. e.g.,
 .Pp
 .Dl fsplit -e readit -e doit prog.f
 .Pp
-will split readit and doit into separate files.
+will split
+.Dq readit
+and
+.Dq doit
+into separate files.
 .El
 .Sh DIAGNOSTICS
 If names specified via the
@@ -95,7 +104,8 @@ Asa Romberger and Jerry Berkman
 .Sh BUGS
 .Nm
 assumes the subprogram name is on the first noncomment line of the subprogram
-unit.  Nonstandard source formats may confuse
+unit.
+Non-standard source formats may confuse
 .Nm fsplit .
 .Pp
 It is hard to use
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 3ff418d574a..fa0365256e0 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: fstat.1,v 1.15 2000/01/19 07:38:25 pjanzen Exp $
+.\"	$OpenBSD: fstat.1,v 1.16 2000/03/07 21:11:09 aaron Exp $
+.\"
 .\" Copyright (c) 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -45,7 +46,7 @@
 .Op Fl N Ar system
 .Op Fl p Ar pid
 .Op Fl u Ar user
-.Op Ar filename...
+.Op Ar file ...
 .Sh DESCRIPTION
 .Nm fstat
 identifies open files.
@@ -59,14 +60,14 @@ reports on all open files in the system.
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl f
-Restrict examination to files open in the same filesystems as
-the named file arguments, or to the filesystem containing the
+Restrict examination to files open in the same file systems as
+the named file arguments, or to the file system containing the
 current directory if there are no additional filename arguments.
-For example, to find all files open in the filesystem where the
+For example, to find all files open in the file system where the
 directory
 .Pa /usr/src
 resides, type
-.Dq Li fstat -f /usr/src .
+.Ic fstat -f /usr/src .
 .It Fl M Ar core
 Extract values associated with the name list from the specified core
 instead of the default
@@ -75,28 +76,30 @@ instead of the default
 Extract the name list from the specified system instead of the default
 .Pa /bsd .
 .It Fl n
-Numerical format.  Print the device number (maj,min) of the filesystem
-the file resides in rather than the mount point name; for special
+Numerical format.
+Print the device number (maj,min) of the file system
+the file resides in rather than the mount point name. For special
 files, print the
 device number that the special device refers to rather than the filename
 in
-.Pa /dev ;
-and print the mode of the file in octal instead of symbolic form.
+.Pa /dev .
+Also, print the mode of the file in octal instead of symbolic form.
 .It Fl p pid
 Report all files open by the specified process.
 .It Fl u user
 Report all files open by the specified user.
 .It Fl v
-Verbose mode.  Print error messages upon failures to locate particular
-system data structures rather than silently ignoring them.  Most of
-these data structures are dynamically created or deleted and it is
+Verbose mode.
+Print error messages upon failures to locate particular
+system data structures rather than silently ignoring them.
+Most of these data structures are dynamically created or deleted and it is
 possible for them to disappear while
 .Nm fstat
-is running.  This
-is normal and  unavoidable since the rest of the system is running while
+is running.
+This is normal and  unavoidable since the rest of the system is running while
 .Nm fstat
 itself is running.
-.It Ar filename ...
+.It Ar file ...
 Restrict reports to the specified files.
 .El
 .Pp
@@ -119,8 +122,9 @@ root	- root inode
 tr	- kernel trace file
 .Ed
 .Pp
-If the file number is followed by an asterisk (``*''), the file is
-not an inode, but rather a socket,
+If the file number is followed by an asterisk
+.Pq Ql * ,
+the file is not an inode, but rather a socket,
 .Tn FIFO ,
 or there is an error.
 In this case the remainder of the line doesn't
@@ -131,7 +135,7 @@ is described later under
 If the
 .Fl n
 flag wasn't specified, this header is present and is the
-pathname that the filesystem the file resides in is mounted on.
+pathname that the file system the file resides in is mounted on.
 .It Li DEV
 If the
 .Fl n
@@ -149,22 +153,26 @@ otherwise, the mode is printed
 as an octal number.
 .It Li SZ\&|DV
 If the file is not a character or block special file, prints the size of
-the file in bytes.  Otherwise, if the
+the file in bytes.
+Otherwise, if the
 .Fl n
 flag is not specified, prints
 the name of the special file as located in
 .Pa /dev .
-If that cannot be
-located, or the
+If that cannot be located, or the
 .Fl n
 flag is specified, prints the major/minor device
 number that the special device refers to.
 .It Li R/W
 This column describes the access mode that the file allows.
-The letter ``r'' indicates open for reading;
-the letter ``w'' indicates open for writing.
+The letter
+.Sq r
+indicates open for reading;
+the letter
+.Sq w
+indicates open for writing.
 This field is useful when trying to find the processes that are
-preventing a filesystem from being downgraded to read-only.
+preventing a file system from being downgraded to read-only.
 .It Li NAME
 If filename arguments are specified and the
 .Fl f
@@ -172,7 +180,8 @@ flag is not, then
 this field is present and is the name associated with the given file.
 Normally the name cannot be determined since there is no mapping
 from an open file back to the directory entry that was used to open
-that file.  Also, since different directory entries may reference
+that file.
+Also, since different directory entries may reference
 the same file (via
 .Xr ln 2 ) ,
 the name printed may not be the actual
@@ -193,13 +202,17 @@ permit further analysis without duplicating
 .Xr netstat 1 .
 .Pp
 For example, the addresses mentioned above are the addresses which the
-.Dq Li netstat -A
+.Ic netstat -A
 command would print for TCP, UDP, and Unix domain.
 Note that since pipes are implemented using sockets, a pipe appears as a
 connected Unix domain stream socket.
 A unidirectional Unix domain socket indicates the direction of flow with
-an arrow (``<-'' or ``->''), and a full duplex socket shows a double arrow
-(``<->'').
+an arrow
+.Pf ( Dq <-
+or
+.Dq -> ) ,
+and a full duplex socket shows a double arrow
+.Pq Dq <-> ) .
 .Pp
 For AF_INET sockets,
 .Nm fstat
@@ -207,12 +220,21 @@ also attempts to print the internet address and port for the
 local end of a connection.
 If the socket is connected, it also prints the remote internet address
 and port.
-A ``*'' is used to indicate an INADDR_ANY binding.  In this case, the
-use of the arrow (``<--'' or ``-->'') indicates the direction the socket
-connection was created.
+A
+.Ql *
+is used to indicate an
+.Dv INADDR_ANY
+binding.
+In this case, the
+use of the arrow
+.Pf ( Dq <--
+or
+.Dq --> )
+indicates the direction the socket connection was created.
 .Sh PIPES
 Every pipe is printed as an address which is the same for both sides of
-the pipe and a state that is built of the letters 'RWE'.
+the pipe and a state that is built of the letters
+.Dq RWE .
 W - The pipe blocks waiting for the reader to read data.
 R - The pipe blocks waiting for the writer to write data.
 E - The pipe is in EOF state.
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 377b05851b4..d35d3e5eb78 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: ftp.1,v 1.28 2000/02/29 04:52:37 aaron Exp $
+.\" 	$OpenBSD: ftp.1,v 1.29 2000/03/07 21:11:09 aaron Exp $
 .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -65,19 +65,23 @@ remote network site.
 .Pp
 The latter three usage formats will fetch a file using either the
 HTTP or FTP protocols into the current directory.
-This is ideal for scripts.  Refer to
+This is ideal for scripts.
+Refer to
 .Sx AUTO-FETCHING FILES
 below for more information.
 .Pp
 The options are as follows:
 .Bl -tag -width "port    "
 .It Fl A
-Force active mode ftp.  By default,
+Force active mode ftp.
+By default,
 .Nm
 will try to use passive mode ftp and fall back to active mode
-if passive is not supported by the server.  This option causes
+if passive is not supported by the server.
+This option causes
 .Nm
-to always use an active connection.  It is only useful for connecting
+to always use an active connection.
+It is only useful for connecting
 to very old servers that do not implement passive mode properly.
 .It Fl a
 Causes
@@ -86,7 +90,8 @@ to bypass the normal login procedure and use an anonymous login instead.
 .It Fl d
 Enables debugging.
 .It Fl e
-Disables command line editing.  Useful for Emacs ange-ftp.
+Disables command line editing.
+Useful for Emacs ange-ftp.
 .It Fl g
 Disables file name globbing.
 .It Fl i
@@ -163,7 +168,7 @@ from the user.
 When
 .Nm
 is awaiting commands the prompt
-.Ql ftp>
+.Dq ftp>
 is provided to the user.
 The following commands are recognized
 by
@@ -196,9 +201,9 @@ or
 .Ic nmap
 setting.
 File transfer uses the current settings for
-.Ic type  ,
+.Ic type ,
 .Ic format ,
-.Ic mode  ,
+.Ic mode ,
 and
 .Ic structure .
 .It Ic ascii
@@ -281,7 +286,7 @@ When debugging is on,
 .Nm
 prints each command sent to the remote machine,
 preceded by the string
-.Ql \-\->
+.Ql \-\-> .
 .It Ic dir Op Ar remote-directory Op Ar local-file
 Print a listing of the contents of a
 directory on the remote machine.
@@ -305,7 +310,7 @@ output.
 If no local file is specified, or if
 .Ar local-file
 is
-.Sq Fl ,
+.Dq - ,
 the output is sent to the terminal.
 .It Ic disconnect
 A synonym for
@@ -335,15 +340,15 @@ If the local
 file name is not specified, it is given the same
 name it has on the remote machine, subject to
 alteration by the current
-.Ic case  ,
+.Ic case ,
 .Ic ntrans ,
 and
 .Ic nmap
 settings.
 The current settings for
-.Ic type  ,
+.Ic type ,
 .Ic form ,
-.Ic mode  ,
+.Ic mode ,
 and
 .Ic structure
 are used while transferring the file.
@@ -364,12 +369,12 @@ is also given, that will be used as the port to connect to on the
 gate-ftp server.
 .It Ic glob
 Toggle filename expansion for
-.Ic mdelete  ,
+.Ic mdelete ,
 .Ic mget
 and
 .Ic mput .
 If globbing is turned off with
-.Ic glob  ,
+.Ic glob ,
 the file name arguments
 are taken literally and not expanded.
 Globbing for
@@ -379,7 +384,7 @@ is done as in
 For
 .Ic mdelete
 and
-.Ic mget  ,
+.Ic mget ,
 each remote file name is expanded
 separately on the remote machine and the lists are not merged.
 Expansion of a directory name is likely to be
@@ -398,8 +403,9 @@ transferring a
 .Xr tar 1
 archive of the subtree (in binary mode).
 .It Ic hash Op Ar size
-Toggle hash-sign (``#'') printing for each data block
-transferred.
+Toggle hash mark
+.Pq Ql #
+printing for each data block transferred.
 The size of a data block defaults to 1024 bytes.
 This can be changed by specifying
 .Ar size
@@ -443,12 +449,12 @@ output.
 If no local file is specified, or if
 .Ar local-file
 is
-.Fl  ,
+.Dq - ,
 the output is sent to the terminal.
 .It Ic macdef Ar macro-name
 Define a macro.
 Subsequent lines are stored as the macro
-.Ar macro-name  ;
+.Ar macro-name ;
 a null line (consecutive newline characters
 in a file or
 carriage returns from the terminal) terminates macro input mode.
@@ -457,23 +463,40 @@ defined macros.
 Macros remain defined until a
 .Ic close
 command is executed.
-The macro processor interprets `$' and `\e' as special characters.
-A `$' followed by a number (or numbers) is replaced by the
+The macro processor interprets
+.Ql $
+and
+.Ql \e
+as special characters.
+A
+.Ql $
+followed by a number (or numbers) is replaced by the
 corresponding argument on the macro invocation command line.
-A `$' followed by an `i' tells the macro processor that the
+A
+.Ql $
+followed by an
+.Sq i
+tells the macro processor that the
 executing macro is to be looped.
-On the first pass `$i' is
+On the first pass
+.Ql $i
+is
 replaced by the first argument on the macro invocation command line,
 on the second pass it is replaced by the second argument, and so on.
-A `\e' followed by any character is replaced by that character.
-Use the `\e' to prevent special treatment of the `$'.
+A
+.Ql \e
+followed by any character is replaced by that character.
+Use the
+.Ql \e
+to prevent special treatment of the
+.Ql $ .
 .It Ic mdelete Op Ar remote-files
 Delete the
 .Ar remote-files
 on the remote machine.
 .It Ic mdir Ar remote-files local-file
 Like
-.Ic dir  ,
+.Ic dir ,
 except multiple remote files may be specified.
 If interactive prompting is on,
 .Nm
@@ -492,7 +515,7 @@ See
 .Ic glob
 for details on the filename expansion.
 Resulting file names will then be processed according to
-.Ic case  ,
+.Ic case ,
 .Ic ntrans ,
 and
 .Ic nmap
@@ -506,7 +529,7 @@ new local directories can be created with
 Make a directory on the remote machine.
 .It Ic mls Ar remote-files local-file
 Like
-.Ic ls  ,
+.Ic ls ,
 except multiple remote files may be specified,
 and the
 .Ar local-file
@@ -584,9 +607,18 @@ and
 .Ic case
 settings).
 Variable templating is accomplished by including the
-sequences `$1', `$2', ..., `$9' in
+sequences
+.Ql $1 ,
+.Ql $2 ,
+...,
+.Ql $9
+in
 .Ar inpattern .
-Use `\\' to prevent this special treatment of the `$' character.
+Use
+.Ql \e
+to prevent this special treatment of the
+.Ql $
+character.
 All other characters are treated literally, and are used to determine the
 .Ic nmap
 .Ar inpattern
@@ -598,11 +630,17 @@ $1.$2 and the remote file name "mydata.data", $1 would have the value
 The
 .Ar outpattern
 determines the resulting mapped filename.
-The sequences `$1', `$2', ...., `$9' are replaced by any value resulting
-from the
+The sequences
+.Ql $1 ,
+.Ql $2 ,
+...,
+.Ql $9
+are replaced by any value resulting from the
 .Ar inpattern
 template.
-The sequence `$0' is replaced by the original filename.
+The sequence
+.Ql $0
+is replaced by the original filename.
 Additionally, the sequence
 .Ql Op Ar seq1 , Ar seq2
 is replaced by
@@ -618,14 +656,37 @@ nmap $1.$2.$3 [$1,$2].[$2,file]
 .Ed
 .Pp
 would yield
-the output filename "myfile.data" for input filenames "myfile.data" and
-"myfile.data.old", "myfile.file" for the input filename "myfile", and
-"myfile.myfile" for the input filename ".myfile".
+the output filename
+.Pa myfile.data ,
+for input filenames
+.Pa myfile.data
+and
+.Pa myfile.data.old ,
+.Pa myfile.file
+for the input filename
+.Pa myfile ,
+and
+.Pa myfile.myfile
+for the input filename
+.Pa \&.myfile .
 Spaces may be included in
-.Ar outpattern  ,
-as in the example: `nmap $1 sed "s/  *$//" > $1' .
-Use the `\e' character to prevent special treatment
-of the `$','[','[', and `,' characters.
+.Ar outpattern ,
+as in the example
+.Pp
+.Bd -literal -offset indent -compact
+nmap $1 sed "s/  *$//" > $1 .
+.Ed
+.Pp
+Use the
+.Ql \e
+character to prevent special treatment
+of the
+.Ql $ ,
+.Ql [ ,
+.Ql \&] ,
+and
+.Ql \&,
+characters.
 .It Ic ntrans Op Ar inchars Op Ar outchars
 Set or unset the filename character translation mechanism.
 If no arguments are specified, the filename character
@@ -653,7 +714,7 @@ are replaced with the corresponding character in
 If the character's position in
 .Ar inchars
 is longer than the length of
-.Ar outchars  ,
+.Ar outchars ,
 the character is deleted from the file name.
 .It Ic open Ar host Op Ar port
 Establish a connection to the specified
@@ -685,20 +746,23 @@ if
 .Ev PAGER
 is null or not defined).
 .It Ic passive
-Toggle passive mode.  If passive mode is turned on
-(default is on), the ftp client will
+Toggle passive mode.
+If passive mode is turned on (default is on), the ftp client will
 send a
 .Dv PASV
 command for all data connections instead of the usual
 .Dv PORT
-command.  The
+command.
+The
 .Dv PASV
 command requests that the remote server open a port for the data connection
-and return the address of that port.  The remote server listens on that
-port and the client connects to it.  When using the more traditional
+and return the address of that port.
+The remote server listens on that port and the client connects to it.
+When using the more traditional
 .Dv PORT
 command, the client listens on a port and sends that address to the remote
-server, who connects back to it.  Passive mode is useful when using
+server, who connects back to it.
+Passive mode is useful when using
 .Nm
 through a gateway router or host that controls the directionality of
 traffic.
@@ -712,7 +776,7 @@ Toggle display of transfer progress bar.
 The progress bar will be disabled for a transfer that has
 .Ar local-file
 as
-.Sq Fl
+.Dq -
 or a command that starts with
 .Sq \&| .
 Refer to
@@ -760,12 +824,14 @@ servers for transferring files between the two servers.
 The first
 .Ic proxy
 command should be an
-.Ic open  ,
+.Ic open ,
 to establish the secondary control connection.
-Enter the command "proxy ?" to see other ftp commands executable on the
+Enter the command
+.Ic proxy ?
+to see other ftp commands executable on the
 secondary connection.
 The following commands behave differently when prefaced by
-.Ic proxy  :
+.Ic proxy :
 .Ic open
 will not define new macros during the auto-login process,
 .Ic close
@@ -775,7 +841,7 @@ and
 .Ic mget
 transfer files from the host on the primary control connection
 to the host on the secondary control connection, and
-.Ic put  ,
+.Ic put ,
 .Ic mput ,
 and
 .Ic append
@@ -797,9 +863,9 @@ settings
 in naming the remote file.
 File transfer uses the
 current settings for
-.Ic type  ,
+.Ic type ,
 .Ic format ,
-.Ic mode  ,
+.Ic mode ,
 and
 .Ic structure .
 .It Ic pwd
@@ -820,7 +886,7 @@ Reget acts like get, except that if
 .Ar local-file
 exists and is
 smaller than
-.Ar remote-file  ,
+.Ar remote-file ,
 .Ar local-file
 is presumed to be
 a partially transferred copy of
@@ -878,10 +944,16 @@ local filename for a
 .Ic get
 or
 .Ic mget
-command, a ".1" is appended to the name.
+command, a
+.Dq \&.1
+is appended to the name.
 If the resulting name matches another existing file,
-a ".2" is appended to the original name.
-If this process continues up to ".99", an error
+a
+.Dq \&.2
+is appended to the original name.
+If this process continues up to
+.Dq \&.99 ,
+an error
 message is printed, and the transfer does not take place.
 The generated unique filename will be reported.
 Note that
@@ -1021,7 +1093,9 @@ A synonym for
 .El
 .Pp
 Command arguments which have embedded spaces may be quoted with
-quote `"' marks.
+quote
+.Pq Ql "
+marks.
 .Pp
 Commands which toggle settings can take an explicit
 .Ic on
@@ -1142,10 +1216,10 @@ commands are processed according to the following rules.
 .Bl -enum
 .It
 If the file name
-.Sq Fl
-is specified, the stdin
-(for reading) or stdout
-(for writing) is used.
+.Dq -
+is specified, the standard input (for reading)
+or standard output (for writing)
+is used.
 .It
 If the first character of the file name is
 .Sq \&| ,
@@ -1154,26 +1228,30 @@ remainder of the argument is interpreted as a shell command.
 .Nm
 then forks a shell, using
 .Xr popen 3
-with the argument supplied, and reads (writes) from the stdout
-(stdin).
+with the argument supplied, and reads (writes) from the standard output
+(standard input).
 If the shell command includes spaces, the argument
-must be quoted; e.g.
+must be quoted; e.g.,
 \*(Lq" ls -lt"\*(Rq.
 A particularly
 useful example of this mechanism is: \*(Lqdir \&|more\*(Rq.
 .It
-Failing the above checks, if ``globbing'' is enabled,
+Failing the above checks, if
+.Dq globbing
+is enabled,
 local file names are expanded
 according to the rules used in the
-.Xr csh  1  ;
+.Xr csh 1 ;
 c.f. the
 .Ic glob
 command.
 If the
 .Nm
-command expects a single local file (.e.g.
-.Ic put  ) ,
-only the first filename generated by the "globbing" operation is used.
+command expects a single local file (e.g.,
+.Ic put ) ,
+only the first filename generated by the
+.Dq globbing
+operation is used.
 .It
 For
 .Ic mget
@@ -1181,7 +1259,7 @@ commands and
 .Ic get
 commands with unspecified local file names, the local filename is
 the remote filename, which may be altered by a
-.Ic case  ,
+.Ic case ,
 .Ic ntrans ,
 or
 .Ic nmap
@@ -1224,7 +1302,7 @@ mode transfers.
 .Nm
 supports only the default values for the remaining
 file transfer parameters:
-.Ic mode  ,
+.Ic mode ,
 .Ic form ,
 and
 .Ic struct .
@@ -1296,7 +1374,7 @@ Note that if this token is present in the
 .Pa .netrc
 file for any user other
 than
-.Ar anonymous  ,
+.Ar anonymous ,
 .Nm
 will abort the auto-login process if the
 .Pa .netrc
@@ -1358,7 +1436,8 @@ By default, this is bound to the TAB key.
 utilizes the following environment variables:
 .Bl -tag -width "FTPSERVERPORT"
 .It Ev FTPMODE
-Overrides the default operation mode.  Recognized values are:
+Overrides the default operation mode.
+Recognized values are:
 .Bl -tag -width "passive  "
 .It passive
 passive mode ftp only
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index 22bc401d4e5..d961cc3c9e7 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gencat.1,v 1.8 1999/06/05 01:21:26 aaron Exp $
+.\"	$OpenBSD: gencat.1,v 1.9 2000/03/07 21:11:09 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Ken Stailey
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: gencat.1,v 1.8 1999/06/05 01:21:26 aaron Exp $
+.\"	$Id: gencat.1,v 1.9 2000/03/07 21:11:09 aaron Exp $
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
@@ -35,7 +35,7 @@
 .Sh SYNOPSIS
 .Nm gencat
 .Ar output-file
-.Ar input-file Op Ar input-file...
+.Ar input-file Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -45,7 +45,8 @@ into a formatted message catalog file
 .Ar output-file .
 The file
 .Ar output-file
-will be created if it does not already exist.  If
+will be created if it does not already exist.
+If
 .Ar output-file
 does exist, its messages will be included in the new
 .Ar output-file .
@@ -54,31 +55,39 @@ If set and message numbers collide, the new message text defined in
 will replace the old message text currently contained in
 .Ar output-file .
 .Sh INPUT FILES
-The format of a message text source file is defined below.  Note that
-the fields of a message text source line are separated by a single space
-character: any other space characters are considered to be part of the
-field contents.
+The format of a message text source file is defined below.
+Note that the fields of a message text source line are separated by a
+single space character; any other space characters are considered to be
+part of the field contents.
 .Pp
 .Bl -tag -width
 .It Li $set Ar n comment
 This line specifies the set identifier of the following messages until
 the next
 .Li $set
-or end-of-file appears.  The argument
+or end-of-file appears.
+The argument
 .Ar n
 is the set identifier which is defined as a number in the range
-[1, (NL_SETMAX)].  Set identifiers must occur in ascending order within
-a single source file, but need not be contiguous.  Any string following
-a space following the set identifier is treated as a comment.  If no
+.Bo 1 ,
+.Dv NL_SETMAX Bc .
+Set identifiers must occur in ascending order within
+a single source file, but need not be contiguous.
+Any string following
+a space following the set identifier is treated as a comment.
+If no
 .Li $set
-directive  is specified in a given source file, all messages will
-be located in the default message set NL_SETD.
+directive is specified in a given source file, all messages will
+be located in the default message set
+.Dv NL_SETD .
 .It Li $del Ar n comment
 This line deletes messages from set
 .Ar n
-from a message catalog.  The
+from a message catalog.
+The
 .Ar n
-specifies a set number.  Any string following a space following the set
+specifies a set number.
+Any string following a space following the set
 number is treated as a comment.
 .It Li $ Ar comment
 A line beginning with
@@ -87,7 +96,10 @@ followed by a space is treated as a comment.
 .It Ar m message-text
 A message line consists of a message identifier
 .Ar m
-in the range [1, (NL_MSGMAX)].  The
+in the range
+.Bo 1 ,
+.Dv NL_MSGMAX Bc .
+The
 .Ar message-text
 is stored in the message catalog with the set identifier specified by
 the last
@@ -97,37 +109,43 @@ directive, and the message identifier
 If the
 .Ar message-text
 is empty, and there is a space character following the message identifier,
-an empty string is stored in the message catalog.  If the
+an empty string is stored in the message catalog.
+If the
 .Ar message-text
 is empty, and if there is no space character following the message
 identifier, then the existing message in the current set with the
-specified message identifier is deleted from the catalog.  Message
-identifiers must be in ascending order within a single set, but
-need not be contiguous.  The
+specified message identifier is deleted from the catalog.
+Message identifiers must be in ascending order within a single set, but
+need not be contiguous.
+The
 .Ar message-text
-length must be in the range [0, (NL_TEXTMAX)].
+length must be in the range
+.Bo 0 ,
+.Dv NL_TEXTMAX Bc .
 .It Li $quote Ar c
 This line specifies an optional quote character
 .Ar c
 which can be used to surround
 .Ar message-text
 so that trailing space or empty messages are visible in message
-source files.  By default, or if an empty
+source files.
+By default, or if an empty
 .Li $quote
 directive is specified, no quoting of
 .Ar message-text
 will be recognized.
 .El
 .Pp
-Empty lines in message source files are ignored.  The effect of lines
-beginning with any character other than those described above is
-undefined.
+Empty lines in message source files are ignored.
+The effect of lines beginning with any character other than those
+described above is undefined.
 .Pp
 Text strings can contain the following special characters and escape
-sequences.  In addition, if a quote character is defined, it may be
+sequences.
+In addition, if a quote character is defined, it may be
 escaped as well to embed a literal quote character.
 .Pp
-.Bl -tag -width Ds -offset indent
+.Bl -tag -width Ds -offset indent -compact
 .It Li \en
 line feed
 .It Li \et
@@ -147,7 +165,7 @@ octal number in the range [000, 377]
 .El
 .Pp
 A backslash character immediately before the end of the line in a file
-is used to continue the line onto the next line, e.g.:
+is used to continue the line onto the next line, e.g.,
 .Pp
 .Dl 1 This line is continued \e
 .Dl on this line.
@@ -157,7 +175,7 @@ the backslash is ignored.
 .Pp
 The
 .Nm
-utility exits 0 on success, or >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr catclose 3 ,
 .Xr catgets 3 ,
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index b3073e4954b..39a500ae7b3 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getconf.1,v 1.5 1999/06/05 01:21:26 aaron Exp $
+.\"	$OpenBSD: getconf.1,v 1.6 2000/03/07 21:11:09 aaron Exp $
 .\"	$NetBSD: getconf.1,v 1.2 1996/04/20 01:15:12 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@ The
 .Ar pathname
 argument must be supplied for system variables associated with a
 pathname.
-.Sh RETURN VALUE
+.Pp
 The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 374ceb174d1..ca3f9c373f2 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getopt.1,v 1.5 2000/03/04 22:19:23 aaron Exp $	-*- nroff -*-
+.\"	$OpenBSD: getopt.1,v 1.6 2000/03/07 21:11:09 aaron Exp $	-*- nroff -*-
 .Dd June 21, 1993
 .Dt GETOPT 1
 .Os
@@ -32,14 +32,14 @@ preceded by a
 .Dq \-
 and in its own shell argument;
 each option argument is also in its own shell argument.
-.Sh EXAMPLE
+.Sh EXAMPLES
 The following code fragment shows how one might process the arguments
 for a command that can take the options
-.Op a
+.Fl a
 and
-.Op b ,
+.Fl b ,
 and the option
-.Op o ,
+.Fl o ,
 which requires an argument.
 .Pp
 .Bd -literal -offset indent
@@ -71,14 +71,14 @@ cmd \-a \-o arg file file
 cmd \-oarg -a file file
 cmd \-a \-oarg \-\- file file
 .Ed
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr getopt 3
 .Sh DIAGNOSTICS
 .Nm
 prints an error message on the standard error output when it
 encounters an option letter not included in
 .Op optstring .
+.Sh SEE ALSO
+.Xr sh 1 ,
+.Xr getopt 3
 .Sh HISTORY
 Written by Henry Spencer, working from a Bell Labs manual page.
 Behavior believed identical to the Bell version.
@@ -88,7 +88,7 @@ Whatever
 has.
 .Pp
 Arguments containing whitespace or embedded shell metacharacters
-generally will not survive intact;  this looks easy to fix but isn't.
+generally will not survive intact; this looks easy to fix but isn't.
 .Pp
 The error message for an invalid option is identified as coming
 from
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 36286529846..e5b4fa8b188 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gprof.1,v 1.13 2000/03/05 00:28:53 aaron Exp $
+.\"	$OpenBSD: gprof.1,v 1.14 2000/03/07 21:11:09 aaron Exp $
 .\"	$NetBSD: gprof.1,v 1.6 1995/11/21 22:24:55 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -64,7 +64,7 @@ option also links in versions of the library routines
 that are compiled for profiling.
 .Nm
 reads the given object file (the default is
-.Pa a.out)
+.Pa a.out )
 and establishes the relation between its symbol table
 and the call graph profile from
 .Pa gmon.out .
@@ -92,7 +92,7 @@ time and call counts of the cycle.
 .Pp
 Second, a flat profile is given,
 similar to that provided by
-.Xr prof  1  .
+.Xr prof 1 .
 This listing gives the total execution times, the call counts,
 the time in milliseconds the call spent in the routine itself, and
 the time in milliseconds the call spent in the routine itself including
@@ -141,7 +141,7 @@ option.
 Suppresses the printing of the graph profile entry for routine
 .Ar name
 (and its descendants) as
-.Fl e  ,
+.Fl e ,
 above, and also excludes the time spent in
 .Ar name
 (and its descendants) from the total and percentage time computations.
@@ -218,11 +218,11 @@ This is useful with the
 option for discovering which routines were never called.
 .El
 .Sh ENVIRONMENT
+The following environment variables affect the execution of
+.Nm gprof :
 .Bl -tag -width PROFDIR
 .It Ev PROFDIR
-If the environment variable
-.Ev PROFDIR
-is set, profiling information is placed in that directory in a file named
+Directory to place profiling information in a file named
 .Pa pid.progname .
 If it is set to a null value, no profiling information is output.
 Otherwise, profiling information is placed in the file
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index f6de89d1e7d..238b12c855b 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: head.1,v 1.6 1999/10/17 20:35:45 aaron Exp $
+.\"	$OpenBSD: head.1,v 1.7 2000/03/07 21:11:10 aaron Exp $
+.\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 4fbd9db39cf..4cbe7a96b50 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hexdump.1,v 1.9 1999/07/21 12:43:26 aaron Exp $
+.\"	$OpenBSD: hexdump.1,v 1.10 2000/03/07 21:11:10 aaron Exp $
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -77,7 +77,7 @@ Specify a format string to be used for displaying data.
 .It Fl f Ar format_file
 Specify a file that contains one or more newline separated format strings.
 Empty lines and lines whose first non-blank character is a hash mark
-.Pq Dq \&#
+.Pq Ql #
 are ignored.
 .It Fl n Ar length
 Interpret only
@@ -127,7 +127,8 @@ Without the
 option, any number of groups of output lines, which would be
 identical to the immediately preceding group of output lines (except
 for the input offsets), are replaced with a line comprised of a
-single asterisk.
+single asterisk
+.Pq Ql * .
 .It Fl x
 .Em Two-byte hexadecimal display .
 Display the input offset in hexadecimal, followed by eight, space
@@ -158,12 +159,14 @@ If specified it defines the number of bytes to be interpreted by
 each iteration of the format.
 .Pp
 If an iteration count and/or a byte count is specified, a single slash
+.Pq Sq /
 must be placed after the iteration count and/or before the byte count
 to disambiguate them.
 Any whitespace before or after the slash is ignored.
 .Pp
 The format is required and must be surrounded by double quote
-(" ") marks.
+.Pq \&"\& \&"
+marks.
 It is interpreted as an fprintf-style format string (see
 .Xr fprintf 3 ) ,
 with the
@@ -174,13 +177,18 @@ An asterisk (*) may not be used as a field width or precision.
 .It
 A byte count or field precision
 .Em is
-required for each ``s'' conversion
-character (unlike the
+required for each
+.Sq s
+conversion character (unlike the
 .Xr fprintf 3
 default which prints the entire string if the precision is unspecified).
 .It
-The conversion characters ``h'', ``n'', and ``p'' are not
-supported.
+The conversion characters
+.Sq h ,
+.Sq n ,
+and
+.Sq p
+are not supported.
 .It
 The single character escape sequences
 described in the C standard are supported:
@@ -224,8 +232,8 @@ octal, except for those representable by standard escape notation
 which are displayed as two character strings.
 .It Cm _p
 Output characters in the default character set.
-Nonprinting characters are displayed as a single
-.Dq Cm \&. .
+Nonprinting characters are displayed as a single dot
+.Ql \&. .
 .It Cm _u
 Output US ASCII characters, with the exception that control characters are
 displayed using the following, lower-case, names.
@@ -263,7 +271,9 @@ data required by each format unit, which is the iteration count times the
 byte count, or the iteration count times the number of bytes required by
 the format if the byte count is not specified.
 .Pp
-The input is manipulated in ``blocks'', where a block is defined as the
+The input is manipulated in
+.Dq blocks ,
+where a block is defined as the
 largest amount of data specified by any format string.
 Format strings interpreting less than an input block's worth of data,
 whose last format unit both interprets some number of bytes and does
@@ -298,9 +308,9 @@ output by an
 conversion character with the same field width
 and precision as the original conversion character or conversion
 string but with any
-.Dq Li \&+ ,
-.Dq \&\ \& ,
-.Dq Li \&#
+.Ql + ,
+.Ql \&\ \& ,
+.Ql #
 conversion flag characters
 removed, and referencing a NULL string.
 .Pp
@@ -324,6 +334,8 @@ Implement the \-x option:
 "%07.7_Ax\en"
 "%07.7_ax  " 8/2 "%04x " "\en"
 .Ed
+.Sh SEE ALSO
+.Xr od 1
 .Sh STANDARDS
 The
 .Nm
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 392633fa153..a7970de3a13 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: od.1,v 1.6 1999/07/07 10:50:07 aaron Exp $
+.\"	$OpenBSD: od.1,v 1.7 2000/03/07 21:11:10 aaron Exp $
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -68,8 +68,9 @@ or the
 .Fl p ,
 or
 .Fl w
-options, nor is compatibility provided for the ``label'' component
-of the offset syntax.
+options, nor is compatibility provided for the
+.Dq label
+component of the offset syntax.
 .Sh SEE ALSO
 .Xr hexdump 1 ,
 .Xr strings 1
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index 457b1722f4e..e474dc146ed 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: groups.1,v 1.6 1999/07/07 10:50:07 aaron Exp $
+.\"	$OpenBSD: groups.1,v 1.7 2000/03/07 21:11:10 aaron Exp $
+.\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -34,7 +35,6 @@
 .\"
 .Dd June 6, 1993
 .Dt GROUPS 1
-.UC
 .Os
 .Sh NAME
 .Nm groups
@@ -48,9 +48,9 @@ The
 utility has been obsoleted by the
 .Xr id 1
 utility, and is equivalent to
-.Dq Nm id Fl Gn Op Ar user .
+.Ic id Fl Gn Op Ar user .
 The command
-.Dq Nm id Fl p
+.Ic id Fl p
 is suggested for normal interactive use.
 .Pp
 The
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index c849c14960b..3cff5c2b3de 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: id.1,v 1.8 2000/03/04 22:19:23 aaron Exp $
+.\"	$OpenBSD: id.1,v 1.9 2000/03/07 21:11:10 aaron Exp $
 .\"	$NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
 .\"
 .\" Copyright (c) 1991, 1993, 1994
@@ -94,14 +94,19 @@ If the user name returned by
 is different from the login name referenced by the user ID, the name
 returned by
 .Xr getlogin 2
-is displayed, preceded by the keyword ``login''.
-The user ID as a name is displayed, preceded by the keyword ``uid''.
+is displayed, preceded by the keyword
+.Dq login .
+The user ID as a name is displayed, preceded by the keyword
+.Dq uid .
 If the effective user ID is different from the real user ID, the real user
-ID is displayed as a name, preceded by the keyword ``euid''.
+ID is displayed as a name, preceded by the keyword
+.Dq euid .
 If the effective group ID is different from the real group ID, the real group
-ID is displayed as a name, preceded by the keyword ``rgid''.
+ID is displayed as a name, preceded by the keyword
+.Dq rgid .
 The list of groups to which the user belongs is then displayed as names,
-preceded by the keyword ``groups''.
+preceded by the keyword
+.Dq groups .
 Each display is on a separate line.
 .It Fl r
 Display the real ID for the
@@ -128,13 +133,13 @@ The
 historic
 .Xr groups 1
 command is equivalent to
-.Dq Nm id Fl Gn Op Ar user .
+.Ic id Fl Gn Op Ar user .
 .Pp
 The
 historic
 .Xr whoami 1
 command is equivalent to
-.Dq Nm id Fl un .
+.Ic Nm id Fl un .
 .Pp
 The
 .Nm
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index e5d657ed221..9f774a3f980 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: whoami.1,v 1.6 1999/07/07 10:50:07 aaron Exp $
+.\"	$OpenBSD: whoami.1,v 1.7 2000/03/07 21:11:10 aaron Exp $
+.\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -38,7 +39,7 @@
 .Os
 .Sh NAME
 .Nm whoami
-.Nd display effective user id
+.Nd display effective user ID
 .Sh SYNOPSIS
 .Nm whoami
 .Sh DESCRIPTION
@@ -47,9 +48,9 @@ The
 utility has been obsoleted by the
 .Xr id 1
 utility, and is equivalent to
-.Dq Nm id Fl un .
+.Ic id Fl un .
 The command
-.Dq Nm id Fl p
+.Ic id Fl p
 is suggested for normal interactive use.
 .Pp
 The