usr.bin/ man page fixes, f-m.

50 files changed, 463 insertions, 450 deletions

diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 819478534e3..dd731e19c5d 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: false.1,v 1.2 1996/06/26 05:32:50 deraadt Exp $
+.\"	$OpenBSD: false.1,v 1.3 1998/09/26 19:54:41 aaron Exp $
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -40,13 +40,13 @@
 .Os BSD 4.2
 .Sh NAME
 .Nm false
-.Nd Return false value.
+.Nd return false value
 .Sh SYNOPSIS
 .Nm false
 .Sh DESCRIPTION
 The
 .Nm false
-utility always exits with a nonzero exit code.
+utility always exits with a non-zero exit code.
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr sh 1 ,
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 17e3a191667..e316534dcde 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.1 1996/08/26 07:47:06 downsj Exp $
+.\" $Id: file2c.1,v 1.2 1998/09/26 19:54:43 aaron Exp $
 .\"
 .Dd Jan 28, 1995
 .Dt FILE2C 1
@@ -15,8 +15,8 @@
 .Nd convert file to c-source.
 .Sh SYNOPSIS
 .Nm file2c
-.Op "string"
-.Op "string"
+.Op Ar string
+.Op Ar string
 .Sh DESCRIPTION
 The
 .Nm file2c
@@ -25,11 +25,11 @@ 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 
+is present, it is printed before the data. If the second 
 .Op string 
 is present, it is printed after the data.
 .Pp
-This program is used to embedd binary or other files into C source files,
+This program is used to embed binary or other files into C source files,
 for instance as a char[].
 .Sh EXAMPLE
 The command:
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 6dc97135d96..afedc030606 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: find.1,v 1.15 1997/11/13 08:30:33 deraadt Exp $
+.\"	$OpenBSD: find.1,v 1.16 1998/09/26 19:54:43 aaron Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -48,7 +48,7 @@
 .Op Ar file ...
 .Ar expression
 .Sh DESCRIPTION
-.Nm Find
+.Nm find
 recursively descends the directory tree for each
 .Ar file
 listed, evaluating an
@@ -60,19 +60,15 @@ The options are as follows:
 .Pp
 .Bl -tag -width Ds
 .It Fl H
-The
-.Fl H
-option causes the file information and file type (see
-.Xr stat  2  ) ,
+Causes the file information and file type (see
+.Xr stat  2  )
 returned for each symbolic link encountered on the command line to be 
 those of the file referenced by the link, not the link itself.
 If the referenced file does not exist, the file information and type will
 be for the link itself.  File information of all symbolic links not on 
 the command line is that of the link itself.
 .It Fl d
-The
-.Fl d
-option causes
+Causes
 .Nm find
 to perform a depth\-first traversal, i.e. directories
 are visited in post\-order and all entries in a directory will be acted
@@ -83,27 +79,21 @@ visits directories in pre\-order, i.e. before their contents.
 Note, the default is
 .Ar not
 a breadth\-first traversal.
-.It Fl f
-The
-.Fl f
-option specifies a file hierarchy for
+.It Fl f Ar file
+Specifies a file hierarchy for
 .Nm find
 to traverse.
 File hierarchies may also be specified as the operands immediately
 following the options.
 .It Fl h
-The
-.Fl h
-option causes the file information and file type (see
+Causes the file information and file type (see
 .Xr stat  2  ) ,
 returned for each symbolic link to be those of the file referenced by the
 link, not the link itself.
 If the referenced file does not exist, the file information and type will
 be for the link itself.
 .It Fl X
-The
-.Fl X
-option is a modification to permit
+Permit
 .Nm
 to be safely used in conjunction with
 .Xr xargs 1 .
@@ -111,18 +101,16 @@ If a file name contains any of the delimiting characters used by
 .Xr xargs ,
 a diagnostic message is displayed on standard error, and the file
 is skipped.
-The delimiting characters include single (`` ' '') and double (`` " '')
-quotes, backslash (``\e''), space, tab and newline characters.
+The delimiting characters include single (``''') and double (``"'')
+quotes, backslash (``\e''), space, tab and newline (``\en'') characters.
 As an alternative, the
 .Fl print0
 function may be used safely in conjunction with the
 .Fl 0
 argument to
-.Xr xargs 1
+.Xr xargs 1 .
 .It Fl x
-The
-.Fl x
-option prevents
+Prevents
 .Nm find
 from descending into directories that have a device number different
 than that of the file from which the descent began.
@@ -162,10 +150,10 @@ True if the program named
 .Ar utility
 returns a zero value as its exit status.
 Optional arguments may be passed to the utility.
-The expression must be terminated by a semicolon (``;'').
+The expression must be terminated by a semicolon (`;').
 If the string ``{}'' appears anywhere in the utility name or the
 arguments it is replaced by the pathname of the current file.
-.Ar Utility
+.Ar utility
 will be executed from the directory from which
 .Nm find
 was executed.
@@ -175,7 +163,7 @@ The
 primary is identical to the
 .Ic -exec
 primary with the exception that
-.Ar Utility
+.Ar utility
 will be executed from the directory that holds
 the current file.  The filename substituted for
 the string ``{}'' is not qualified.
@@ -187,7 +175,6 @@ True if the file is contained in a file system of type
 Two special file system types are recognized: ``local'' and ``rdonly''.
 These do not describe actual file system types;
 the former matches any file system physically mounted on the system where
-the
 .Nm find
 is being executed, and the latter matches any file system which is
 mounted read-only.
@@ -198,7 +185,7 @@ If
 .Ar gname
 is numeric and there is no such group name, then
 .Ar gname
-is treated as a group id.
+is treated as a group ID.
 .It Ic -inum Ar n 
 True if the file has inode number
 .Ar n  .
@@ -241,11 +228,13 @@ primary is identical to the
 .Ic -exec
 primary with the exception that
 .Nm find
-requests user affirmation for the execution of the utility by printing
+requests user affirmation for the execution of
+.Ar utility
+by printing
 a message to the terminal and reading a response.
 If the response is other than ``y'' the command is not executed and the
 value of the
-.Ar \&ok
+.Ic \&ok
 expression is false.
 .It Ic -name Ar pattern 
 True if the last component of the pathname being examined matches
@@ -254,7 +243,7 @@ Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')
 may be used as part of
 .Ar pattern  .
 These characters may be matched explicitly by escaping them with a
-backslash (``\e'').
+backslash (`\e').
 .It Ic -newer Ar file 
 True if the current file has a more recent last modification time than
 .Ar file  .
@@ -269,8 +258,8 @@ Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')
 may be used as part of
 .Ar pattern  .
 These characters may be matched explicitly by escaping them with a
-backslash (``\e'').
-Slashes (``/'') are treated as normal characters and do not have to be
+backslash (`\e').
+Slashes (`/') are treated as normal characters and do not have to be
 matched explicitly.
 .It Ic -perm Op Fl Ns Ar mode 
 The
@@ -279,7 +268,7 @@ may be either symbolic (see
 .Xr chmod  1  )
 or an octal number.
 If the mode is symbolic, a starting value of zero is assumed and the
-mode sets or clears permissions without regard to the process' file mode
+mode sets or clears permissions without regard to the process's file mode
 creation mask.
 If the mode is octal, only bits 07777
 .Pf ( Dv S_ISUID
@@ -297,13 +286,13 @@ of the file's mode bits participate
 in the comparison.
 If the mode is preceded by a dash (``\-''), this primary evaluates to true
 if at least all of the bits in the mode are set in the file's mode bits.
-If the mode is not preceded by a dash, this primary evaluates to true if
-the bits in the mode exactly match the file's mode bits.
+If the mode is not preceded by a dash (``\-''), this primary evaluates to
+true if the bits in the mode exactly match the file's mode bits.
 Note, the first character of a symbolic mode may not be a dash (``\-'').
 .It Ic -print
 This primary always evaluates to true.
 It prints the pathname of the current file to standard output, followed
-by a newline character.
+by a newline (``\en'') character.
 If neither
 .Ic -exec ,
 .Ic -ls ,
@@ -366,13 +355,13 @@ If
 .Ar uname
 is numeric and there is no such user name, then
 .Ar uname
-is treated as a user id.
+is treated as a user ID.
 .El
 .Pp
 All primaries which take a numeric argument allow the number to be
 preceded by a plus sign (``+'') or a minus sign (``\-'').
 A preceding plus sign means ``more than n'', a preceding minus sign means
-``less than n'' and neither means ``exactly n'' .
+``less than n'', and neither means ``exactly n'' .
 .Sh OPERATORS
 The primaries may be combined using the following operators.
 The operators are listed in order of decreasing precedence.
@@ -416,7 +405,6 @@ Primaries which themselves take arguments expect each argument
 to be a separate argument to
 .Nm find  .
 .Sh EXAMPLES
-.Pp
 The following examples are shown as given to the shell:
 .Bl -tag -width findx
 .It Li "find  /  \e!  -name  \*q*.c\*q  -print"
@@ -436,8 +424,8 @@ that are newer than ``ttt''.
 .Xr locate 1 ,
 .Xr stat 2 ,
 .Xr fts 3 ,
-.Xr getpwent 3 ,
 .Xr getgrent 3 ,
+.Xr getpwent 3 ,
 .Xr strmode 3 ,
 .Xr symlink 7
 .Sh STANDARDS
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 79cc9f042d6..768815c9a80 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: finger.1,v 1.5 1997/06/02 13:52:43 kstailey Exp $
+.\"	$OpenBSD: finger.1,v 1.6 1998/09/26 19:54:44 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -47,12 +47,12 @@
 .Sh DESCRIPTION
 The
 .Nm finger
-displays information about the system users.
+utility displays information about the system users.
 .Pp
 Options are:
 .Bl -tag -width flag
 .It Fl s
-.Nm Finger
+.Nm finger
 displays the user's login name, real name, terminal name and write
 status (as a ``*'' before the terminal name if write permission is
 denied), idle time, login time, and either office location and office
@@ -163,7 +163,7 @@ If no arguments are specified,
 .Nm finger
 will print an entry for each user currently logged into the system.
 .Pp
-.Nm Finger
+.Nm finger
 may be used to look up users on a remote machine.
 The format is to specify a
 .Ar user
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index a0c6d864125..75c88d90dcd 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.4 1998/04/25 23:02:26 millert Exp $
+.\" $OpenBSD: fmt.1,v 1.5 1998/09/26 19:54:44 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -53,14 +53,14 @@
 .Oc
 .Op name ...
 .Sh DESCRIPTION
-.Nm Fmt
+.Nm fmt
 is a simple text formatter which reads the concatenation of input
 files (or standard input if none are given) and produces on standard
 output a version of its input with lines as close to the
 .Ar goal
 length
 as possible without exceeding the
-.Ar maximum.
+.Ar maximum .
 The
 .Ar goal
 length defaults
@@ -104,7 +104,7 @@ Assume that the input files' tabs assume
 spaces per tab stop. The default is 8.
 .El
 .Pp
-.Nm Fmt
+.Nm fmt
 is meant to format mail messages prior to sending, but may also be useful
 for other simple tasks.
 For instance,
@@ -128,7 +128,6 @@ command appeared in
 .Bx 3 .
 .Pp
 The version described herein is a complete rewrite and appeared in
-.\" .Ox 2.4 .
 .Bx Open
 2.4.
 .\" .Sh AUTHOR
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index ad057315048..b5f3e601e91 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fold.1,v 1.2 1996/06/26 05:33:22 deraadt Exp $
+.\"	$OpenBSD: fold.1,v 1.3 1998/09/26 19:54:44 aaron Exp $
 .\"	$NetBSD: fold.1,v 1.5 1995/09/01 01:42:42 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
@@ -39,17 +39,17 @@
 .Os
 .Sh NAME
 .Nm fold
-.Nd "fold long lines for finite width output device"
+.Nd fold long lines for finite width output device
 .Sh SYNOPSIS
 .Nm fold
 .Op Fl bs
 .Op Fl w Ar width
-.Ar
+.Ar file Op Ar ...
 .Sh DESCRIPTION
-.Nm Fold
+.Nm fold
 is a filter which folds the contents of the specified files,
 or the standard input if no files are specified,
-breaking the lines to have maximum of 80 characters.
+breaking the lines to have a maximum of 80 characters.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
@@ -67,7 +67,7 @@ Specifies a line width to use instead of the default 80 characters.
 .Pp
 The 
 .Nm fold
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr expand 1
 .Sh STANDARDS
@@ -78,7 +78,7 @@ utility conforms to
 .Sh BUGS
 If underlining is present it may be messed up by folding.
 .Pp
-.Ar Width
+.Ar width
 should be a multiple of 8 if tabs are present, or the tabs should
 be expanded using
 .Xr expand 1
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 3863866016c..a63f7db22c5 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: from.1,v 1.2 1996/06/26 05:33:27 deraadt Exp $
+.\"	$OpenBSD: from.1,v 1.3 1998/09/26 19:54:45 aaron Exp $
 .\"	$NetBSD: from.1,v 1.4 1995/09/01 01:39:09 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -46,7 +46,7 @@
 .Op Fl f Ar file
 .Op Ar user
 .Sh DESCRIPTION
-.Nm From
+.Nm from
 prints
 out the mail header lines from the invoker's mailbox.
 .Pp
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index 053627bf4cc..13934bf92d1 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fsplit.1,v 1.2 1996/06/26 05:33:29 deraadt Exp $
+.\"	$OpenBSD: fsplit.1,v 1.3 1998/09/26 19:54:45 aaron Exp $
 .\"	$NetBSD: fsplit.1,v 1.3 1995/09/28 05:15:06 perry Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -44,11 +44,10 @@
 .Nd split a multi-routine Fortran file into individual files
 .Sh SYNOPSIS
 .Nm fsplit
-.Op Fl e Ar efile
-\&...
+.Op Fl e Ar efile Op Ar ...
 .Op Ar file
 .Sh DESCRIPTION
-.Nm Fsplit
+.Nm fsplit
 takes as input either a file or standard input containing Fortran source code.
 It attempts to split the input into separate routine files of the
 form
@@ -95,7 +94,7 @@ appeared in
 .Sh AUTHORS
 Asa Romberger and Jerry Berkman
 .Sh BUGS
-.Nm Fsplit
+.Nm fsplit
 assumes the subprogram name is on the first noncomment line of the subprogram
 unit.  Nonstandard source formats may confuse
 .Nm fsplit .
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index d1a74bff8fd..22abd3d7dd5 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fstat.1,v 1.9 1998/09/08 18:59:00 deraadt Exp $
+.\"	$OpenBSD: fstat.1,v 1.10 1998/09/26 19:54:46 aaron Exp $
 .\" Copyright (c) 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -47,7 +47,7 @@
 .Op Fl u Ar user
 .Op Ar filename...
 .Sh DESCRIPTION
-.Nm Fstat
+.Nm fstat
 identifies open files.
 A file is considered open by a process if it was explicitly opened,
 is the working directory, root directory, active pure text, or kernel
@@ -103,11 +103,11 @@ Restrict reports to the specified files.
 The following fields are printed:
 .Bl -tag -width MOUNT
 .It Li USER
-The username of the owner of the process (effective uid).
+The username of the owner of the process (effective UID).
 .It Li CMD
 The command name of the process.
 .It Li PID
-The process id.
+The process ID.
 .It Li FD
 The file number in the per-process open file table or one of the following
 special names:
@@ -148,7 +148,7 @@ using a symbolic format (see
 otherwise, the mode is printed
 as an octal number.
 .It Li SZ\&|DV
-If the file is not a character or block special, prints the size of
+If the file is not a character or block special file, prints the size of
 the file in bytes.  Otherwise, if the
 .Fl n
 flag is not specified, prints
@@ -164,7 +164,7 @@ This column describes the access mode that the file allows.
 The letter ``r'' indicates open for reading;
 the letter ``w'' indicates open for writing.
 This field is useful when trying to find the processes that are
-preventing a filesystem from being down graded to read-only.
+preventing a filesystem from being downgraded to read-only.
 .It Li NAME
 If filename arguments are specified and the
 .Fl f
@@ -184,8 +184,8 @@ In all cases the first field is the domain name, the second field
 is the socket type (stream, dgram, etc), and the third is the socket
 flags field (in hex).
 The remaining fields are protocol dependent.
-For tcp, it is the address of the tcpcb, and for udp, the inpcb (socket pcb).
-For unix domain sockets, it's the address of the socket pcb and the address
+For TCP, it is the address of the tcpcb, and for UDP, the inpcb (socket pcb).
+For Unix domain sockets, it's the address of the socket pcb and the address
 of the connected pcb (if connected).
 Otherwise the protocol number and address of the socket itself are printed.
 The attempt is to make enough information available to 
@@ -194,10 +194,10 @@ permit further analysis without duplicating
 .Pp
 For example, the addresses mentioned above are the addresses which the
 .Dq Li netstat -A
-command would print for tcp, udp, and unixdomain.
+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
+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
 (``<->'').
 .Pp
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index d97a502bc1a..f6f95cdaff9 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: ftp.1,v 1.21 1998/09/19 20:47:16 millert Exp $
+.\" 	$OpenBSD: ftp.1,v 1.22 1998/09/26 19:54:48 aaron Exp $
 .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -44,21 +44,10 @@
 file transfer program
 .Sh SYNOPSIS
 .Nm
-.Op Fl A
-.Op Fl a
-.Op Fl d
-.Op Fl e
-.Op Fl g
-.Op Fl i
-.Op Fl m
-.Op Fl n
+.Op Fl AVadegimnptu
 .Op Fl o Ar output
-.Op Fl p
 .Op Fl P Ar port
 .Op Fl r Ar seconds
-.Op Fl t
-.Op Fl v
-.Op Fl V
 .Op Ar host Op Ar port
 .Nm ftp
 ftp://[\fIuser\fR:\fIpassword\fR@]\fIhost\fR[:\fIport\fR]/\fIfile\fR[/]
@@ -67,7 +56,7 @@ http://\fIhost\fR[:\fIport\fR]/\fIfile\fR
 .Nm ftp
 \fIhost\fR:[/\fIpath\fR/]\fIfile\fR[/]
 .Sh DESCRIPTION
-.Nm Ftp
+.Nm ftp
 is the user interface to the
 .Tn ARPANET
 standard File Transfer Protocol.
@@ -94,7 +83,7 @@ to very old servers that do not implement passive mode properly.
 .It Fl a
 Causes
 .Nm
-to bypass normal login procedure, and use an anonymous login instead.
+to bypass the normal login procedure and use an anonymous login instead.
 .It Fl d
 Enables debugging.
 .It Fl e
@@ -129,10 +118,9 @@ and an account with which to login.
 .It Fl o Ar output
 When fetching a single file or url, save the contents in
 .Ar output .
-To make the contents go to
-.Ar stdout ,
+To make the contents go to stdout,
 use
-.Qq -
+.Dq -
 for
 .Ar output .
 .It Fl p
@@ -175,12 +163,12 @@ will enter its command interpreter and await instructions
 from the user.
 When
 .Nm
-is awaiting commands from the user the prompt
+is awaiting commands the prompt
 .Ql ftp>
 is provided to the user.
 The following commands are recognized
 by
-.Nm ftp  :
+.Nm ftp :
 .Bl -tag -width Fl
 .It Ic \&! Op Ar command Op Ar args
 Invoke an interactive shell on the local machine.
@@ -233,7 +221,7 @@ Terminate the
 session with the remote server
 and exit
 .Nm ftp .
-An end of file will also terminate the session and exit.
+An end-of-file will also terminate the session and exit.
 .It Ic case
 Toggle remote computer file name case mapping during
 .Ic mget
@@ -259,14 +247,14 @@ system to
 .It Ic close
 Terminate the
 .Tn FTP
-session with the remote server, and
+session with the remote server and
 return to the command interpreter.
 Any defined macros are erased.
 .It Ic \&cr
 Toggle carriage return stripping during
-ascii type file retrieval.
+ASCII type file retrieval.
 Records are denoted by a carriage return/linefeed sequence
-during ascii type file transfer.
+during ASCII type file transfer.
 When
 .Ic \&cr
 is on (the default), carriage returns are stripped from this
@@ -277,7 +265,7 @@ delimiter.
 Records on
 .Pf non\- Ns Ux
 remote systems may contain single linefeeds;
-when an ascii type transfer is made, these linefeeds may be
+when an ASCII type transfer is made, these linefeeds may be
 distinguished from a record delimiter only when
 .Ic \&cr
 is off.
@@ -399,7 +387,7 @@ Expansion of a directory name is likely to be
 different from expansion of the name of an ordinary file:
 the exact result depends on the foreign operating system and ftp server,
 and can be previewed by doing
-.Ql mls remote-files \-
+.Dq mls remote-files \- .
 Note:
 .Ic mget
 and
@@ -473,7 +461,7 @@ command is executed.
 The macro processor interprets `$' and `\e' as special characters.
 A `$' followed by a number (or numbers) is replaced by the
 corresponding argument on the macro invocation command line.
-A `$' followed by an `i' signals that macro processor that the
+A `$' followed by an `i' tells the macro processor that the
 executing macro is to be looped.
 On the first pass `$i' is
 replaced by the first argument on the macro invocation command line,
@@ -559,7 +547,7 @@ A synonym for
 .Ic mput .
 .It Ic newer Ar file-name
 Get the file only if the modification time of the remote file is more
-recent that the file on the current system.
+recent than the file on the current system.
 If the file does not
 exist on the current system, the remote file is considered
 .Ic newer .
@@ -589,7 +577,7 @@ The mapping follows the pattern set by
 .Ar inpattern
 and
 .Ar outpattern .
-.Op Ar Inpattern
+.Ar inpattern
 is a template for incoming filenames (which may have already been
 processed according to the
 .Ic ntrans
@@ -602,7 +590,7 @@ sequences `$1', `$2', ..., `$9' in
 Use `\\' to prevent this special treatment of the `$' character.
 All other characters are treated literally, and are used to determine the
 .Ic nmap
-.Op Ar inpattern
+.Ar inpattern
 variable values.
 For example, given
 .Ar inpattern
@@ -615,7 +603,7 @@ The sequences `$1', `$2', ...., `$9' are replaced by any value resulting
 from the
 .Ar inpattern
 template.
-The sequence `$0' is replace by the original filename.
+The sequence `$0' is replaced by the original filename.
 Additionally, the sequence
 .Ql Op Ar seq1 , Ar seq2
 is replaced by
@@ -673,8 +661,8 @@ Establish a connection to the specified
 .Ar host
 .Tn FTP
 server.
-An optional port number may be supplied,
-in which case,
+An optional port number may be supplied
+in which case
 .Nm
 will attempt to contact an
 .Tn FTP
@@ -747,21 +735,21 @@ When prompting is on, the following commands are available at a prompt:
 Do not transfer the file.
 .It Ic a
 Answer
-.Sq yes
-to the current file, and automatically answer
-.Sq yes
+.Dq yes
+to the current file and automatically answer
+.Dq yes
 to any remaining files for the current command.
 .It Ic p
 Answer
-.Sq yes
-to the current file, and turn off prompt mode
-(as is
+.Dq yes
+to the current file and turn off prompt mode
+(as if
 .Dq prompt off
 had been given).
 .El
 .Pp
 Any other reponse will answer
-.Sq yes
+.Dq yes
 to the current file.
 .It Ic proxy Ar ftp-command
 Execute an ftp command on a secondary control connection.
@@ -857,7 +845,7 @@ on remote machine.
 .It Ic rename Op Ar from Op Ar to
 Rename the file
 .Ar from
-on the remote machine, to the file
+on the remote machine to the file
 .Ar to .
 .It Ic reset
 Clear reply queue.
@@ -875,7 +863,9 @@ indicated
 .Ar marker .
 On
 .Ux
-systems, marker is usually a byte
+systems,
+.Ar marker
+is usually a byte
 offset into the file.
 .It Ic rmdir Ar directory-name
 Delete a directory on the remote machine.
@@ -1119,7 +1109,7 @@ Otherwise, the remote name is used as the local name.
 To abort a file transfer, use the terminal interrupt key
 (usually Ctrl-C).
 Sending transfers will be immediately halted.
-Receiving transfers will be halted by sending a ftp protocol
+Receiving transfers will be halted by sending an ftp protocol
 .Dv ABOR
 command to the remote server, and discarding any further data received.
 The speed at which this is accomplished depends upon the remote
@@ -1151,10 +1141,8 @@ commands are processed according to the following rules.
 .It
 If the file name
 .Sq Fl
-is specified, the
-.Ar stdin
-(for reading) or
-.Ar stdout
+is specified, the stdin
+(for reading) or stdout
 (for writing) is used.
 .It
 If the first character of the file name is
@@ -1365,7 +1353,7 @@ command
 By default, this is bound to the TAB key.
 .Sh ENVIRONMENT
 .Nm
-utilizes the following environment variables.
+utilizes the following environment variables:
 .Bl -tag -width "FTPSERVERPORT"
 .It Ev FTPMODE
 Overrides the default operation mode.  Recognized values are:
@@ -1426,10 +1414,10 @@ by the remote server.
 An error in the treatment of carriage returns
 in the
 .Bx 4.2
-ascii-mode transfer code
+ASCII-mode transfer code
 has been corrected.
 This correction may result in incorrect transfers of binary files
 to and from
 .Bx 4.2
-servers using the ascii type.
+servers using the ASCII type.
 Avoid this problem by using the binary image type.
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index acbcb8f3439..64c19ab1ebc 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gencat.1,v 1.3 1997/06/11 15:39:54 kstailey Exp $
+.\"	$OpenBSD: gencat.1,v 1.4 1998/09/26 19:54:49 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Ken Stailey
 .\"
@@ -33,8 +33,8 @@
 .Nd NLS catalog compiler
 .Sh SYNOPSIS
 .Nm gencat
-.Ar "output-file"
-.Ar "input-file..."
+.Ar output-file
+.Ar input-file Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm gencat
@@ -48,7 +48,7 @@ functions.
 .Pp
 The
 .Nm gencat
-utility exits 0 on success, and >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 987ba97cdcf..b59535089e3 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getconf.1,v 1.3 1996/06/26 05:33:42 deraadt Exp $
+.\"	$OpenBSD: getconf.1,v 1.4 1998/09/26 19:54:50 aaron Exp $
 .\"	$NetBSD: getconf.1,v 1.2 1996/04/20 01:15:12 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@ option variable to the standard output.
 .Pp
 The
 .Ar name
-argument specifies the system variable to be queried .
+argument specifies the system variable to be queried.
 The 
 .Ar pathname 
 argument must be supplied for system variables associated with a
@@ -59,7 +59,7 @@ pathname.
 .Sh RETURN VALUE
 The
 .Nm getconf 
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr pathconf 2 ,
 .Xr confstr 3 ,
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 068c1f1de58..0f8317ad6f4 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getopt.1,v 1.2 1996/06/26 05:33:44 deraadt Exp $	-*- nroff -*-
+.\"	$OpenBSD: getopt.1,v 1.3 1998/09/26 19:54:50 aaron Exp $	-*- nroff -*-
 .Dd June 21, 1993
 .Dt GETOPT 1
 .Os
@@ -8,7 +8,7 @@
 .Sh SYNOPSIS
 .Nm set \-\- \`getopt optstring $*\`
 .Sh DESCRIPTION
-.Nm Getopt
+.Nm getopt
 is used to break up options in command lines for easy parsing by
 shell procedures, and to check for legal options.
 .Op Optstring
@@ -21,7 +21,7 @@ separated from it by white space.
 The special option
 .Dq \-\-
 is used to delimit the end of the options.
-.Nm Getopt
+.Nm getopt
 will place
 .Dq \-\-
 in the arguments at the end of the options,
@@ -75,7 +75,7 @@ cmd \-a \-oarg \-\- file file
 .Xr sh 1 ,
 .Xr getopt 3
 .Sh DIAGNOSTICS
-.Nm Getopt
+.Nm getopt
 prints an error message on the standard error output when it
 encounters an option letter not included in
 .Op optstring .
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 19746d535d7..b3b7ea85b41 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gprof.1,v 1.8 1998/09/07 16:44:33 aaron Exp $
+.\"	$OpenBSD: gprof.1,v 1.9 1998/09/26 19:54:50 aaron Exp $
 .\"	$NetBSD: gprof.1,v 1.6 1995/11/21 22:24:55 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -45,7 +45,7 @@
 .Op options
 .Op Ar a.out Op Ar gmon.out ...
 .Sh DESCRIPTION
-.Nm Gprof
+.Nm gprof
 produces an execution profile of C, Pascal, or Fortran77 programs.
 The effect of called routines is incorporated in the profile of each caller.
 The profile data is taken from the call graph profile file
@@ -62,7 +62,7 @@ The
 .Fl pg
 option also links in versions of the library routines
 that are compiled for profiling.
-.Nm Gprof
+.Nm gprof
 reads the given object file (the default is
 .Pa a.out)
 and establishes the relation between its symbol table
@@ -73,7 +73,7 @@ the
 .Nm gprof
 output shows the sum of the profile information in the given profile files.
 .Pp
-.Nm Gprof
+.Nm gprof
 calculates the amount of time spent in each routine.
 Next, these times are propagated along the edges of the call graph.
 Cycles are discovered, and calls into a cycle are made to share the time
@@ -203,7 +203,9 @@ A profile file
 is produced that represents
 the sum of the profile information in all the specified profile files.
 This summary profile file may be given to later
-executions of gprof (probably also with a
+executions of
+.Nm gprof
+(probably also with a
 .Fl s )
 to accumulate profile data across several runs of an
 .Pa a.out
@@ -229,17 +231,17 @@ Otherwise, profiling information is placed in the file
 .Sh FILES
 .Bl -tag -width gmon.sum -compact
 .It Pa a.out
-The namelist and text space.
+namelist and text space
 .It Pa gmon.out
-Dynamic call graph and profile.
+dynamic call graph and profile
 .It Pa gmon.sum
-Summarized dynamic call graph and profile.
+summarized dynamic call graph and profile
 .El
 .Sh SEE ALSO
-.Xr moncontrol 3 ,
-.Xr profil 2 ,
 .Xr cc 1 ,
-.Xr prof 1
+.Xr prof 1 ,
+.Xr profil 2 ,
+.Xr moncontrol 3
 .Rs
 .%T "An Execution Profiler for Modular Programs"
 .%A S. Graham
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 7c35096734d..b72ce9edc58 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hexdump.1,v 1.4 1997/09/02 15:31:51 kstailey Exp $
+.\"	$OpenBSD: hexdump.1,v 1.5 1998/09/26 19:54:51 aaron Exp $
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -47,10 +47,12 @@
 .Bk -words
 .Op Fl s Ar skip
 .Ek
-.Ar file  ...
+.Ar file Op Ar ...
 .Sh DESCRIPTION
-The hexdump utility is a filter which displays the specified files, or
-the standard input, if no files are specified, in a user specified
+The
+.Nm hexdump
+utility is a filter which displays the specified files, or
+the standard input, if no files are specified, in a user-specified
 format.
 .Pp
 The options are as follows:
@@ -66,7 +68,7 @@ Display the input offset in hexadecimal, followed by sixteen
 space-separated, three column, space-filled, characters of input
 data per line.
 .It Fl d
-.Em Two-byte decimal display.
+.Em Two-byte decimal display .
 Display the input offset in hexadecimal, followed by eight
 space-separated, five column, zero-filled, two-byte units
 of input data, in unsigned decimal, per line.
@@ -75,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
-.Pf ( Cm \&# )
+.Pq Dq \&#
 are ignored.
 .It Fl n Ar length 
 Interpret only
@@ -162,7 +164,7 @@ Any whitespace before or after the slash is ignored.
 .Pp
 The format is required and must be surrounded by double quote
 (" ") marks.
-It is interpreted as a fprintf-style format string (see
+It is interpreted as an fprintf-style format string (see
 .Xr fprintf 3 ) ,
 with the
 following exceptions:
@@ -196,7 +198,8 @@ described in the C standard are supported:
 .Ed
 .El
 .Pp
-Hexdump also supports the following additional conversion strings:
+.Nm hexdump
+also supports the following additional conversion strings:
 .Bl -tag -width Fl
 .It Cm \&_a Ns Op Cm dox 
 Display the input offset, cumulative across input files, of the
@@ -307,7 +310,7 @@ to specifying the
 option.
 .Pp
 .Nm hexdump
-exits 0 on success and >0 if an error occurred.
+exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
 Display the input in perusal format:
 .Bd -literal -offset indent
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index aa9cc923ad0..54392d20ca8 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: od.1,v 1.2 1996/06/26 05:34:20 deraadt Exp $
+.\"	$OpenBSD: od.1,v 1.3 1998/09/26 19:54:51 aaron Exp $
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -50,11 +50,11 @@
 .Oc
 .Ar file
 .Sh DESCRIPTION
-.Nm Od
+.Nm od
 has been deprecated in favor of
 .Xr hexdump 1 .
 .Pp
-.Xr Hexdump ,
+.Nm hexdump ,
 if called as
 .Nm od ,
 provides compatibility for the options listed above.
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index fcffe076a4a..a29da0dc7be 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: groups.1,v 1.3 1997/05/30 07:49:19 deraadt Exp $
+.\"	$OpenBSD: groups.1,v 1.4 1998/09/26 19:54:52 aaron Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -59,6 +59,6 @@ belong.
 .Pp
 The
 .Nm groups
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 3569aa644d1..92b5245113b 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: id.1,v 1.3 1997/05/30 07:49:19 deraadt Exp $
+.\"	$OpenBSD: id.1,v 1.4 1998/09/26 19:54:52 aaron Exp $
 .\"	$NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
 .\"
 .\" Copyright (c) 1991, 1993, 1994
@@ -115,7 +115,7 @@ Display the effective user ID as a number.
 .Pp
 The
 .Nm id
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr who 1
 .Sh STANDARDS
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index e734152b642..0bc061fd3d9 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whoami.1,v 1.3 1997/05/30 07:49:20 deraadt Exp $
+.\"	$OpenBSD: whoami.1,v 1.4 1998/09/26 19:54:52 aaron Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -57,6 +57,6 @@ utility displays your effective user ID as a name.
 .Pp
 The
 .Nm whoami
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr id 1
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 945fad5ccf7..237d4cfb4e4 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: indent.1,v 1.4 1997/06/23 22:03:36 deraadt Exp $
+.\"	$OpenBSD: indent.1,v 1.5 1998/09/26 19:54:53 aaron Exp $
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" Copyright (c) 1985 Sun Microsystems, Inc.
 .\" Copyright (c) 1976 Board of Trustees of the University of Illinois.
@@ -80,7 +80,7 @@
 .Op Fl troff
 .Op Fl v | Fl \&nv
 .Sh DESCRIPTION
-.Nm Indent
+.Nm indent
 is a
 .Ar C
 program formatter.  It reformats the
@@ -372,7 +372,7 @@ switches.  The switches should be separated by spaces, tabs or newlines.
 .Ss Comments
 .Sq Em Box
 .Em comments .
-.Nm Indent
+.Nm indent
 assumes that any comment with a dash, star, or newline immediately after
 the start of comment (that is, `/*\-', `/**' or `/*' followed
 immediately by a newline character) is a comment surrounded
@@ -383,7 +383,7 @@ of the comment.
 .Pp
 .Em Straight text .
 All other comments are treated as straight text.
-.Nm Indent
+.Nm indent
 fits as many words (separated by blanks, tabs, or newlines) on a
 line as possible.  Blank lines break paragraphs.
 .Pp
@@ -414,7 +414,7 @@ attempts to correctly
 compensate for the syntactic peculiarities introduced.
 .Pp
 .Ss C syntax
-.Nm Indent
+.Nm indent
 understands a substantial amount about the syntax of C, but it
 has a `forgiving' parser.  It attempts to cope with the usual sorts of
 incomplete and misformed syntax.  In particular, the use of macros like:
@@ -423,7 +423,7 @@ incomplete and misformed syntax.  In particular, the use of macros like:
 .Pp
 is handled properly.
 .Sh ENVIRONMENT
-.Nm Indent
+.Nm indent
 uses the
 .Ev HOME
 environment variable.
@@ -440,7 +440,7 @@ The
 command appeared in
 .Bx 4.2 .
 .Sh BUGS
-.Nm Indent
+.Nm indent
 has even more switches than
 .Xr ls 1 .
 .Pp
diff --git a/usr.bin/info_mkdb/info_mkdb.1 b/usr.bin/info_mkdb/info_mkdb.1
index 97b9478a586..243b0256d13 100644
--- a/usr.bin/info_mkdb/info_mkdb.1
+++ b/usr.bin/info_mkdb/info_mkdb.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: info_mkdb.1,v 1.4 1998/09/06 22:23:17 aaron Exp $
+.\"	$OpenBSD: info_mkdb.1,v 1.5 1998/09/26 19:54:53 aaron Exp $
 .\"
 .\" Copyright (c) 1996 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -91,7 +91,7 @@ name.
 .Sh RETURN VALUE
 The
 .Nm info_mkdb 
-utility exits 0 on success and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr dbopen 3 ,
 .Xr getcap 3 ,
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 50192195d2e..882ec267f5a 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipcrm.1,v 1.2 1996/06/26 05:34:34 deraadt Exp $
+.\" $OpenBSD: ipcrm.1,v 1.3 1998/09/26 19:54:54 aaron Exp $
 .\" Copyright (c) 1994 Adam Glass
 .\" All rights reserved.
 .\" 
@@ -24,7 +24,7 @@
 .\" 
 .\""
 .Dd August 8th, 1994
-.Dt ipcrm 1
+.Dt IPCRM 1
 .Os
 .Sh NAME
 .Nm ipcrm
@@ -43,21 +43,21 @@ segments
 .Nm ipcrm
 removes the specified message queues, semaphores and shared memory
 segments.  These System V IPC objects can be specified by their
-creation id or any associated key.
+creation ID or any associated key.
 .Pp
 The following options are used to specify which IPC objects will be removed.  Any number and combination of these options can be used:
 .Bl -tag -width indent
 .It Fl q Ar msqid
-Remove the message queue associated with the id
+Remove the message queue associated with the ID
 .Nm msqid
 from the system.
 .It Fl m Ar shmid
-Mark the shared memory segment associated with id 
+Mark the shared memory segment associated with ID
 .Nm shmid
 for removal.
 This marked segment will be destroyed after the last detach.
 .It Fl s Ar semid
-Removes the semaphore set associated with id
+Removes the semaphore set associated with ID
 .Nm semid
 from the system.
 .It Fl Q Ar msgkey
@@ -77,7 +77,7 @@ from the system.
 .Pp
 The identifiers and keys associated with these System V IPC objects can be
 determined by using
-.Xr ipcs 1
+.Xr ipcs 1 .
 .
 .Sh SEE ALSO
 .Xr ipcs 1
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 6faa7d20b91..cef160d44cd 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipcs.1,v 1.4 1996/10/08 01:20:53 michaels Exp $
+.\"	$OpenBSD: ipcs.1,v 1.5 1998/09/26 19:54:54 aaron Exp $
 .\"	$NetBSD: ipcs.1,v 1.4 1995/04/15 02:31:16 cgd Exp $
 .\"
 .\" Copyright (c) 1994 SigmaSoft, Th. Lockert
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd June 18, 1994
-.Dt "IPCS" 1
+.Dt IPCS 1
 .Os
 .Sh NAME
 .Nm ipcs
@@ -107,7 +107,6 @@ Display system information about shared memory.
 Extract values associated with the name list from the specified
 core instead of the default
 .Dq Pa /dev/kmem .
-and semaphores.
 .It Fl Q
 Display system information about messages queues.
 .It Fl S
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index a1855cf00d3..a41498fc0be 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -93,9 +93,7 @@ section.)
 Replace empty output fields with
 .Ar string .
 .It Fl o Ar list
-The
-.Fl o
-option specifies the fields that will be output from each file for
+Specifies the fields that will be output from each file for
 each line with matching join fields.
 Each element of
 .Ar list
@@ -161,7 +159,7 @@ is ``-'', the standard input is used.
 .Pp
 The
 .Nm join
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh COMPATIBILITY
 For compatibility with historic versions of
 .Nm join ,
@@ -199,7 +197,7 @@ option.
 This has obvious difficulties in the presence of files named ``1.2''.
 .El
 .Pp
-These options are available only so historic shellscripts don't require
+These options are available only so historic shell scripts don't require
 modification and should not be used.
 .Sh STANDARDS
 The
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 863865146c2..889bb496b98 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kdump.1,v 1.3 1996/07/08 22:09:41 ccappuc Exp $
+.\"	$OpenBSD: kdump.1,v 1.4 1998/09/26 19:54:56 aaron Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -46,10 +46,10 @@
 .Op Fl m Ar maxdata
 .Op Fl t Op cenis
 .Sh DESCRIPTION
-.Nm Kdump
+.Nm kdump
 displays the kernel trace files produced with
 .Xr ktrace 1
-in human readable format.
+in human-readable format.
 By default, the file
 .Pa ktrace.out
 in the current directory is displayed.
@@ -75,7 +75,7 @@ bytes when decoding
 Suppress ad hoc translations.
 Normally
 .Nm kdump
-tries to decode many system calls into a more human readable format.
+tries to decode many system calls into a more human-readable format.
 For example,
 .Xr ioctl 2
 values are replaced with the macro name and
@@ -100,5 +100,5 @@ option of
 .Sh HISTORY
 The
 .Nm kdump
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 699f4112c64..9a65f3fd13e 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ktrace.1,v 1.5 1997/06/18 09:44:08 deraadt Exp $
+.\"	$OpenBSD: ktrace.1,v 1.6 1998/09/26 19:54:56 aaron Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -49,9 +49,9 @@
 .Op Fl adi
 .Op Fl f Ar trfile
 .Op Fl t Ar trstr
-command
+.Ar command
 .Sh DESCRIPTION
-.Nm Ktrace
+.Nm ktrace
 enables kernel trace logging for the specified processes.
 Kernel trace data is logged to the file
 .Pa ktrace.out .
@@ -69,7 +69,7 @@ processes, and, if executed by root, all processes:
 .Pp
 .Dl \&$ ktrace -C
 .Pp
-The trace file is not human readable; use
+The trace file is not human-readable; use
 .Xr kdump 1
 to decode it.
 .Pp
@@ -98,7 +98,7 @@ flag is permitted).
 Inherit; pass the trace flags to all future children of the designated
 processes.
 .It Fl p Ar pid 
-Enable (disable) tracing on the indicated process id (only one
+Enable (disable) tracing on the indicated process ID (only one
 .Fl p
 flag is permitted).
 .It Fl t Ar trstr 
@@ -164,5 +164,5 @@ on process 67
 .Sh HISTORY
 The
 .Nm ktrace
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index c85fed062e2..55beebc2e26 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: last.1,v 1.6 1998/03/10 00:50:39 downsj Exp $
+.\"	$OpenBSD: last.1,v 1.7 1998/09/26 19:54:57 aaron Exp $
 .\"	$NetBSD: last.1,v 1.3 1994/12/21 22:41:23 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -50,9 +50,9 @@
 .Op Fl h Ar host
 .Op Fl t Ar tty
 .Op Fl d Ar [[yy]yy[mm[dd[hh]]]]mm[.ss]
-.Op user ...
+.Op Ar user ...
 .Sh DESCRIPTION
-.Nm Last
+.Nm last
 will either (1) list the sessions of specified
 .Ar users ,
 .Ar ttys ,
@@ -72,7 +72,7 @@ will so indicate.
 .It Fl c
 Calculates the total time displayed and prints it after the output.
 .It Fl f Ar file
-.Nm Last
+.Nm last
 reads the file
 .Ar file
 instead of the default,
@@ -86,13 +86,13 @@ Display time values in seconds since the epoch, instead of formated dates.
 .It Fl t Ar tty
 Specify the
 .Ar tty .
-Tty names may be given fully or abbreviated, for example,
+tty names may be given fully or abbreviated, for example,
 .Dq Li "last -t 03"
 is
 equivalent to
 .Dq Li "last -t tty03" .
 .It Fl h Ar host
-.Ar Host
+.Ar host
 names may be names or internet numbers.
 .It Fl T
 Display better time information, including seconds.
@@ -101,12 +101,12 @@ Specify the snapshot date & time.
 All users logged in at the snapshot date & time will
 be reported.
 This may be used with the 
-.Ar -f file
+.Fl f
 option to derive the results from stored wtmp files.
 When this argument is provided, all other options except for
-.Ar -f file 
+.Fl f
 and 
-.Ar -n
+.Fl n
 are ignored.
 The argument should be in the form
 .Dq [[CC]YY][MMDD]hhmm[.SS]
@@ -130,15 +130,15 @@ Otherwise, a
 .Dq YY
 value of 20 is used.
 .It Ar MM
-The month of the year, from 1 to 12.
+Month of the year, from 1 to 12.
 .It Ar DD
-the day of the month, from 1 to 31.
+Day of the month, from 1 to 31.
 .It Ar hh
-The hour of the day, from 0 to 23.
+Hour of the day, from 0 to 23.
 .It Ar mm
-The minute of the hour, from 0 to 59.
+Minute of the hour, from 0 to 59.
 .It Ar SS
-The second of the minute, from 0 to 61.
+Second of the minute, from 0 to 61.
 .El
 .Pp
 If the
@@ -188,6 +188,6 @@ login data base
 .Xr utmp 5 ,
 .Xr ac 8
 .Sh HISTORY
-.Nm Last
+.Nm last
 appeared in
 .Bx 3.0 .
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index ba2a6ba99ca..d0b66fa35d0 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lastcomm.1,v 1.7 1998/07/26 11:08:24 pjanzen Exp $
+.\"	$OpenBSD: lastcomm.1,v 1.8 1998/09/26 19:54:57 aaron Exp $
 .\"	$NetBSD: lastcomm.1,v 1.5 1995/10/22 01:43:41 ghudson Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -47,7 +47,7 @@
 .Op Ar user ...
 .Op Ar terminal ...
 .Sh DESCRIPTION
-.Nm Lastcomm
+.Nm lastcomm
 gives information on previously executed commands.
 With no arguments,
 .Nm lastcomm
@@ -86,21 +86,21 @@ by user
 on the terminal
 .Ar ttyd0  .
 .Pp
-For each process entry, the following are printed.
+For each process entry, the following are printed:
 .Pp
 .Bl -bullet -offset indent -compact
 .It
-The name of the user who ran the process.
+Name of the user who ran the process.
 .It
 Flags, as accumulated by the accounting facilities in the system.
 .It
-The command name under which the process was called.
+Command name under which the process was called.
 .It
-The amount of cpu time used by the process (in seconds).
+Amount of cpu time used by the process (in seconds).
 .It
-The time the process started.
+Time the process started.
 .It
-The elapsed time of the process.
+Elapsed time of the process.
 .El
 .Pp
 The flags are encoded as follows: ``S'' indicates the command was
@@ -115,7 +115,7 @@ file, and ``X'' indicates the command was terminated with a signal.
 .Sh FILES
 .Bl -tag -width /var/account/acct -compact
 .It Pa /var/account/acct
-Default accounting file.
+default accounting file
 .El
 .Sh SEE ALSO
 .Xr last 1 ,
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index 8c72c581803..59f56493d5d 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: leave.1,v 1.2 1996/06/26 05:34:56 deraadt Exp $
+.\"	$OpenBSD: leave.1,v 1.3 1998/09/26 19:54:58 aaron Exp $
 .\"	$NetBSD: leave.1,v 1.5 1995/08/31 22:32:10 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -49,7 +49,7 @@
 .Oc
 .Sm on
 .Sh DESCRIPTION
-.Nm Leave
+.Nm leave
 waits until the specified time, then reminds you that you
 have to leave.
 You are reminded 5 minutes and 1 minute before the actual
@@ -70,7 +70,7 @@ where
 is a time in
 hours (on a 12 or 24 hour clock), and
 .Ar mm
-are minutes.
+in minutes.
 All times are converted to a 12 hour clock, and assumed to
 be in the next 12 hours.
 .It Cm \&+
@@ -90,12 +90,13 @@ otherwise the reply is assumed to be a time.
 This form is suitable for inclusion in a
 .Pa .login
 or
-.Pa .profile.
+.Pa .profile .
 .Pp
-Leave ignores interrupts, quits, and terminates.
+.Nm leave
+ignores interrupts, quits, and terminates.
 To get rid of it you should either log off or use
 .Ql kill \-s KILL
-giving its process id.
+giving its process ID.
 .Sh SEE ALSO
 .Xr calendar 1
 .Sh HISTORY
diff --git a/usr.bin/lndir/lndir.1 b/usr.bin/lndir/lndir.1
index bf172b76bc9..a196b2bc4b0 100644
--- a/usr.bin/lndir/lndir.1
+++ b/usr.bin/lndir/lndir.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lndir.1,v 1.6 1998/03/08 21:19:52 millert Exp $
+.\" $OpenBSD: lndir.1,v 1.7 1998/09/26 19:54:58 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -186,7 +186,7 @@ will find all files that are not directories.
 .Sh SEE ALSO
 .Xr find 1 ,
 .Xr ln 1 ,
-.Xr patch 1 .
+.Xr patch 1
 .Sh HISTORY
 .Nm lndir
 was first distributed as part of X11.
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 77d12112b85..392a05275ff 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.1,v 1.6 1998/08/12 07:25:33 deraadt Exp $
+.\"	$OpenBSD: locate.1,v 1.7 1998/09/26 19:54:59 aaron Exp $
 .\"
 .\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
 .\" Copyright (c) 1990, 1993
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)locate.1	8.1 (Berkeley) 6/6/93
-.\"	$Id: locate.1,v 1.6 1998/08/12 07:25:33 deraadt Exp $
+.\"	$Id: locate.1,v 1.7 1998/09/26 19:54:59 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
@@ -46,7 +46,7 @@
 .Op Fl Scims
 .Op Fl l Ar limit
 .Op Fl d Ar database 
-pattern ...
+.Ar pattern Op Ar ...
 .Sh DESCRIPTION
 .Nm locate
 searches a database for all pathnames which match the specified
@@ -68,16 +68,18 @@ including slashes (``/'').
 As a special case, a pattern containing no globbing characters (``foo'')
 is matched as though it were ``*foo*''.
 
-Historically, locate stores only characters between 32 and 127.  The
-current implementation store all characters except newline ('\\n') and
+Historically,
+.Nm locate
+stores only characters between 32 and 127.  The
+current implementation stores all characters except newline ('\\n') and
 NUL ('\\0'). The 8-bit character support does not waste extra space for
-plain ASCII file names.  Characters less than 32 or greather than 127
+plain ASCII file names.  Characters less than 32 or greater than 127
 are stored as 2 bytes.
 
 The following options are available:
 .Bl -tag -width 10n indent
 .It Fl S
-Print some statistic about the database and exit.
+Print some statistics about the database and exit.
 .It Fl c
 Suppress normal output; instead print a count of matching file names.
 .It Fl d Ar database
@@ -126,7 +128,7 @@ and use:
 
 $ zcat database.gz | locate -d - pattern
 
-This might be useful on machines with a fast CPU and little RAM and slow
+This might be useful on machines with a fast CPU, little RAM and slow
 I/O. Note: you can only use 
 .Ar one
 pattern for stdin.
@@ -152,14 +154,14 @@ library instead of
 .It Pa /var/db/locate.database
 locate database
 .It Pa /usr/libexec/locate.updatedb
-Script to update the locate database
+script to update the locate database
 .It Pa /etc/weekly
-Script that usually starts the database rebuild
+script that usually starts the database rebuild
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width LOCATE_PATH -compact
-.It Pa LOCATE_PATH
-path to the locate database if set and not empty, ignored if the 
+.It Ev LOCATE_PATH
+Path to the locate database if set and not empty, ignored if the 
 .Fl d 
 option was specified.
 .El
@@ -218,7 +220,7 @@ a locate database which was built on an big-endian machine.
 .Sh HISTORY
 The
 .Nm locate
-command appears in
+command appeared in
 .Bx 4.4 .
 Many new features were
 added in
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index 973e4e58fd8..0177113b9ee 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: locate.updatedb.8,v 1.4 1998/08/12 07:27:09 deraadt Exp $
+.\"	$OpenBSD: locate.updatedb.8,v 1.5 1998/09/26 19:54:59 aaron Exp $
 .\"
 .\" Copyright (c) 1996
 .\"	Mike Pritchard <mpp@FreeBSD.org>.  All rights reserved.
@@ -44,7 +44,7 @@
 .Op Fl -prunepaths='dir1 dir2...'
 .Op Fl -filesystems='type1 type2...'
 .Sh DESCRIPTION
-.Nm Locate.updatedb
+.Nm locate.updatedb
 updates the database used by
 .Xr locate 1 .
 It is typically run once a week by the
@@ -73,13 +73,13 @@ A list of filesystem types to be traversed by
 .Sh FILES
 .Bl -tag -width /var/db/locate.database -compact
 .It Pa /var/db/locate.database
-the default database
+default database
 .It Pa /etc/locate.rc
-the configuration file
+configuration file
 .El
 .Sh SEE ALSO
-.Xr locate 1 ,
-.Xr find 1 
+.Xr find 1 ,
+.Xr locate 1
 .Rs
 .%A Woods, James A.
 .%D 1983
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index ad4ba6725ef..6e829ba26cc 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lock.1,v 1.3 1996/09/06 01:57:15 downsj Exp $
+.\"	$OpenBSD: lock.1,v 1.4 1998/09/26 19:55:00 aaron Exp $
 .\"	$NetBSD: lock.1,v 1.4 1994/12/22 01:16:21 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -46,13 +46,13 @@
 .Op Fl p
 .Op Fl t Ar timeout
 .Sh DESCRIPTION
-.Nm Lock
+.Nm lock
 requests a password from the user, reads it again for verification
 and then will normally not relinquish the terminal until the password is
 repeated.
 There are two other conditions under which it will terminate: it
 will timeout after some interval of time and it may be killed by someone
-with the appropriate permission.
+with the appropriate privileges.
 .Pp
 Options:
 .Pp
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 3a942e88b12..3fe028bfd62 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: logger.1,v 1.2 1996/06/26 05:35:58 deraadt Exp $
+.\"	$OpenBSD: logger.1,v 1.3 1998/09/26 19:55:00 aaron Exp $
 .\"	$NetBSD: logger.1,v 1.4 1994/12/22 06:26:59 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -48,7 +48,7 @@
 .Op Fl t Ar tag
 .Op Ar message ...
 .Sh DESCRIPTION
-.Nm Logger
+.Nm logger
 provides a shell command interface to the
 .Xr syslog  3
 system log module.
@@ -57,7 +57,7 @@ Options:
 .Pp
 .Bl -tag -width "message"
 .It Fl i
-Log the process id of the logger process
+Log the process ID of the logger process
 with each line.
 .It Fl s
 Log the message to standard error, as well as the system log.
@@ -85,7 +85,7 @@ provided, standard input is logged.
 .Pp
 The
 .Nm logger
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
 .Bd -literal -offset indent -compact
 logger System rebooted
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 16d864eb621..61713639775 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: login.1,v 1.6 1997/09/14 01:02:21 deraadt Exp $
+.\"	$OpenBSD: login.1,v 1.7 1998/09/26 19:55:00 aaron Exp $
 .\"	$NetBSD: login.1,v 1.7 1995/08/31 22:52:33 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -119,18 +119,27 @@ If the file
 exists in the user's home directory, all of these messages are suppressed.
 This is to simplify logins for non-human users, such as
 .Xr uucp 1 .
-.Nm Login
+.Nm login
 then records an entry in the
 .Xr wtmp 5
 and
 .Xr utmp 5
 files and executes the user's command interpreter.
 .Pp
-Login enters information into the environment (see
+.Nm login
+enters information into the environment (see
 .Xr environ 7 )
-specifying the user's home directory (HOME), command interpreter (SHELL),
-search path (PATH), terminal type (TERM) and user name (both LOGNAME and
-USER).
+specifying the user's home directory
+.Pq Ev HOME ,
+command interpreter
+.Pq Ev SHELL ,
+search path
+.Pq Ev PATH ,
+terminal type
+.Pq Ev TERM ,
+and user name
+.Po both Ev LOGNAME and Ev USER
+.Pc .
 .Pp
 The standard shells,
 .Xr csh 1
@@ -140,7 +149,7 @@ do not fork before executing the
 .Nm login
 utility.
 .Sh FILES
-.Bl -tag -width /var/mail/userXXX -compact
+.Bl -tag -width /var/log/failedlogin -compact
 .It Pa /etc/fbtab
 changes device protections
 .It Pa /etc/motd
@@ -166,11 +175,11 @@ makes login quieter
 .Xr rlogin 1 ,
 .Xr skey 1 ,
 .Xr getpass 3 ,
+.Xr fbtab 5 ,
 .Xr utmp 5 ,
-.Xr environ 7 ,
-.Xr fbtab 5
+.Xr environ 7
 .Sh HISTORY
 A
 .Nm login
-appeared in
+utility appeared in
 .At v6 .
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 6efb524abeb..9c78703c57a 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: logname.1,v 1.4 1997/07/15 16:31:03 deraadt Exp $
+.\"	$OpenBSD: logname.1,v 1.5 1998/09/26 19:55:01 aaron Exp $
 .\"	$NetBSD: logname.1,v 1.5 1995/07/25 18:31:12 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -62,7 +62,7 @@ because the environment cannot be trusted.
 .Pp
 The
 .Nm logname
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr who 1 ,
 .Xr whoami 1 ,
@@ -75,5 +75,5 @@ utility conforms to
 .Sh HISTORY
 The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index f0f8ea898b2..902cf96a790 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: look.1,v 1.2 1996/06/26 05:36:06 deraadt Exp $
+.\"	$OpenBSD: look.1,v 1.3 1998/09/26 19:55:01 aaron Exp $
 .\"	$NetBSD: look.1,v 1.3 1994/12/23 01:10:59 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -64,7 +64,7 @@ If
 .Ar file
 is not specified, the file
 .Pa /usr/share/dict/words
-is used, only alphanumeric characters are compared and the case of
+is used. Only alphanumeric characters are compared and the case of
 alphabetic characters is ignored.
 .Pp
 Options:
@@ -74,7 +74,7 @@ Dictionary character set and order, i.e. only alphanumeric characters
 are compared.
 .It Fl f
 Ignore the case of alphabetic characters.
-.It Fl t
+.It Fl t Ar termchar
 Specify a string termination character, i.e. only the characters
 in
 .Ar string
@@ -103,5 +103,5 @@ option was specified.
 This was incorrect and the current man page matches the historic
 implementation.
 .Sh HISTORY
-.Nm Look
+.Nm look
 appeared in Version 7 AT&T Unix.
diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index a38ba24010c..6f43b7aa291 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lorder.1,v 1.2 1996/06/26 05:36:08 deraadt Exp $
+.\"	$OpenBSD: lorder.1,v 1.3 1998/09/26 19:55:02 aaron Exp $
 .\"	$NetBSD: lorder.1,v 1.5 1995/08/31 22:42:44 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -42,7 +42,7 @@
 .Nd list dependencies for object files
 .Sh SYNOPSIS
 .Nm lorder
-.Ar
+.Ar file Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm lorder
@@ -50,7 +50,7 @@ utility uses
 .Xr nm 1
 to determine interdependencies in the list of object files
 specified on the command line.
-.Nm Lorder
+.Nm lorder
 outputs a list of file names where the first file contains a symbol
 which is defined by the second file.
 .Pp
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 1d92b1d2705..6199707b26f 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,8 +1,8 @@
-.\"	@(#) $OpenBSD: m4.1,v 1.4 1997/02/12 23:32:31 deraadt Exp $
+.\"	@(#) $OpenBSD: m4.1,v 1.5 1998/09/26 19:55:02 aaron Exp $
 .\"
 .\"
 .Dd January 26, 1993
-.Dt m4 1
+.Dt M4 1
 .Os
 .Sh NAME
 .Nm m4
@@ -25,8 +25,8 @@ the processed text to the standard output.
 Macro calls have the form name(argument1[, argument2, ...,] argumentN).
 .Pp
 There cannot be any space following the macro name and the open
-parentheses '('.  If the macro name is not followed by an open
-parentheses it is processed with no arguments.
+parenthesis '('.  If the macro name is not followed by an open
+parenthesis it is processed with no arguments.
 .Pp
 Macro names consist of a leading alphabetic or underscore
 possibly followed by alphanumeric or underscore characters, therefore
@@ -35,7 +35,9 @@ valid macro names match this pattern [a-zA-Z_][a-zA-Z0-9_]*.
 In arguments to macros, leading unquoted space, tab and newline
 characters are ignored.  To quote strings use left and right single
 quotes (e.g., ` this is a string with a leading space').  You can change
-the quote characters with the changequote built-in macro.
+the quote characters with the
+.Ic changequote
+built-in macro.
 .Pp
 The options are as follows:
 .Bl -tag -width "-Dname[=value]xxx"
@@ -55,18 +57,18 @@ provides the following built-in macros.  They may be
 redefined, losing their original meaning.
 Return values are NULL unless otherwise stated.
 .Bl -tag -width changequotexxx
-.It changecom
+.It Ic changecom
 Change the start and end comment sequences.  The default is
 the pound sign `#' and the newline character.  With no arguments
 comments are turned off.  The maximum length for a comment marker is
 five characters.
-.It changequote
+.It Ic changequote
 Defines the quote symbols to be the first and second arguments.
 The symbols may be up to five characters long.  If no arguments are
 given it restores the default open and close single quotes.
-.It decr
+.It Ic decr
 Decrements the argument by 1.  The argument must be a valid numeric string.
-.It define
+.It Ic define
 Define a new macro named by the first argument to have the
 value of the second argument.  Each occurrence of $n (where n
 is 0 through 9) is replaced by the n'th argument.  $0 is the name
@@ -74,10 +76,10 @@ of the calling macro.  Undefined arguments are replaced by a
 NULL string.  $# is replaced by the number of arguments; $*
 is replaced by all arguments comma separated; $@ is the same
 as $* but all arguments are quoted against further expansion.
-.It defn
+.It Ic defn
 Returns the quoted definition for each argument.  This can be used to rename
 macro definitions (even for built-in macros).
-.It divert
+.It Ic divert
 There are 10 output queues (numbered 0-9).
 At the end of processing
 .Nm m4
@@ -85,94 +87,107 @@ concatenates all the queues in numerical order to produce the
 final output.  Initially the output queue is 0.  The divert
 macro allows you to select a new output queue (an invalid argument
 passed to divert causes output to be discarded).
-.It divnum
+.It Ic divnum
 Returns the current output queue number.
-.It dnl
+.It Ic dnl
 Discard input characters up to and including the next newline.
-.It dumpdef
+.It Ic dumpdef
 Prints the names and definitions for the named items, or for everything
 if no arguments are passed.
-.It errprint
+.It Ic errprint
 Prints the first argument on the standard error output stream.
-.It eval
+.It Ic eval
 Computes the first argument as an arithmetic expression using 32-bit
 arithmetic.  Operators are the standard C ternary, arithmetic, logical,
 shift, relational, bitwise, and parentheses operators.  You can specify
 octal, decimal, and hexadecimal numbers as in C.  The second argument (if
 any) specifies the radix for the result and the third argument (if
 any) specifies the minimum number of digits in the result.
-.It expr
-This is an alias for eval.
-.It ifdef
+.It Ic expr
+This is an alias for
+.Ic eval .
+.It Ic ifdef
 If the macro named by the first argument is defined then return the second
 argument, otherwise the third.  If there is no third argument,
 the value is NULL.  The word `unix' is predefined.
-.It ifelse
-If the first argument matches the second argument then ifelse returns
+.It Ic ifelse
+If the first argument matches the second argument then
+.Ic ifelse
+returns
 the third argument.  If the match fails the three arguments are
 discarded and the next three arguments are used until there is
 zero or one arguments left, either this last argument or NULL is
 returned if no other matches were found.
-.It include
+.It Ic include
 Returns the contents of the file specified in the first argument.
 Include aborts with an error message if the file cannot be included.
-.It incr
+.It Ic incr
 Increments the argument by 1.  The argument must be a valid numeric string.
-.It index
+.It Ic index
 Returns the index of the second argument in the first argument (e.g.,
 index(the quick brown fox jumped, fox) returns 16).  If the second
 argument is not found index returns -1.
-.It len
+.It Ic len
 Returns the number of characters in the first argument.  Extra arguments
 are ignored.
-.It m4exit
+.It Ic m4exit
 Immediately exits with the return value specified by the first argument,
 0 if none.
-.It m4wrap
+.It Ic m4wrap
 Allows you to define what happens at the final EOF, usually for cleanup
 purposes (e.g., m4wrap("cleanup(tempfile)") causes the macro cleanup to
 invoked after all other processing is done.)
-.It maketemp
+.It Ic maketemp
 Translates the string XXXXX in the first argument with the current process
 ID leaving other characters alone.  This can be used to create unique
 temporary file names.
-.It paste
+.It Ic paste
 Includes the contents of the file specified by the first argument without
 any macro processing.  Aborts with an error message if the file cannot be
 included.
-.It popdef
-Restores the pushdef'ed definition for each argument.
-.It pushdef
-Takes the same arguments as define, but it saves the definition on a
-stack for later retrieval by popdef.
-.It shift
+.It Ic popdef
+Restores the
+.Ic pushdef Ns ed
+definition for each argument.
+.It Ic pushdef
+Takes the same arguments as
+.Ic define ,
+but it saves the definition on a
+stack for later retrieval by
+.Ic popdef .
+.It Ic shift
 Returns all but the first argument, the remaining arguments are
 quoted and pushed back with commas in between.  The quoting
 nullifies the effect of the extra scan that will subsequently be
 performed.
-.It sinclude
-Similar to include, except it ignores any errors.
-.It spaste
-Similar to paste, except it ignores any errors.
-.It substr
+.It Ic sinclude
+Similar to
+.Ic include ,
+except it ignores any errors.
+.It Ic spaste
+Similar to
+.Ic paste ,
+except it ignores any errors.
+.It Ic substr
 Returns a substring of the first argument starting at the offset specified
 by the second argument and the length specified by the third argument.
 If no third argument is present it returns the rest of the string.
-.It syscmd
+.It Ic syscmd
 Passes the first argument to the shell.  Nothing is returned.
-.It sysval
-Returns the return value from the last syscmd.
-.It translit
+.It Ic sysval
+Returns the return value from the last
+.Ic syscmd .
+.It Ic translit
 Transliterate the characters in the first argument from the set
 given by the second argument to the set given by the third.  You cannot
 use
 .Xr tr 1
 style abbreviations.
-.It undefine
+.It Ic undefine
 Removes the definition for the macro specified by the first argument.
-.It undivert
+.It Ic undivert
 Flushes the named output queues (or all queues if no arguments).
-.It unix
+.It Ic unix
 A pre-defined macro for testing the OS platform.
 .El
 .Sh AUTHOR
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 5a993a39288..ac2804ac514 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail.1,v 1.18 1998/09/13 03:50:23 aaron Exp $
+.\"	$OpenBSD: mail.1,v 1.19 1998/09/26 19:55:05 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -47,8 +47,8 @@
 .Op Fl s Ar subject
 .Op Fl c Ar cc-addr
 .Op Fl b Ar bcc-addr
-.Ar to-addr...
-.Op Fl Ar sendmail-options...
+.Ar to-addr Op Ar ...
+.Op Fl Ar sendmail-options Op Ar ...
 .Nm mail
 .Op Fl iInNv
 .Fl f
@@ -57,7 +57,7 @@
 .Op Fl iInNv
 .Op Fl u Ar user
 .Sh INTRODUCTION
-.Nm Mail
+.Nm mail
 is an intelligent mail processing system which has
 a command syntax reminiscent of
 .Xr \&ed 1
@@ -294,7 +294,7 @@ See
 .Xr mailaddr 7
 for a description of network addresses.
 .Pp
-.Nm Mail
+.Nm mail
 has a number of options which can be set in the
 .Pa .mailrc
 file to alter its behavior; thus
@@ -698,7 +698,7 @@ program text over the message system.
 A synonym for
 .Ic exit  .
 .It Ic z
-.Nm Mail
+.Nm mail
 presents message headers in windowfuls as described under the
 .Ic headers
 command.
@@ -1034,7 +1034,7 @@ with the
 command; normally, the first five lines are printed.
 .El
 .Sh ENVIRONMENT
-.Nm Mail
+.Nm mail
 utilizes the
 .Ev HOME ,
 .Ev LOGNAME ,
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index a0a7441a186..84b2d80377a 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.13 1998/09/05 17:41:47 deraadt Exp $
+.\"	$OpenBSD: make.1,v 1.14 1998/09/26 19:55:05 aaron Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -55,7 +55,7 @@
 .Op Ar variable=value
 .Op Ar target ...
 .Sh DESCRIPTION
-.Nm Make
+.Nm make
 is a program designed to simplify the maintenance of other programs.
 Its input is a list of specifications as to the files upon which programs
 and other files depend.
@@ -91,7 +91,7 @@ to be 1, in the global context.
 Turn on debugging, and specify which portions of
 .Nm make
 are to print debugging information.
-.Ar Flags
+.Ar flags
 is one or more of the following:
 .Bl -tag -width Ds
 .It Ar A
@@ -133,7 +133,7 @@ If
 is
 .Ql Fl ,
 standard input is read.
-Multiple makefile's may be specified, and are read in the order specified.
+Multiple makefiles may be specified, and are read in the order specified.
 .It Fl I Ar directory
 Specify a directory in which to search for makefiles and included makefiles.
 The system makefile directory (or directories, see the
@@ -156,8 +156,9 @@ that do not depend on the target whose creation caused the error.
 .It Fl m Ar directory
 Specify a directory in which to search for sys.mk and makefiles included
 via the <...> style.  Multiple directories can be added to form a search path.
-This path will override the default system include path: /usr/share/mk.
-Furthermore the system include path will be appended to the search path used
+This path will override the default system include path:
+.Pa /usr/share/mk .
+Furthermore, the system include path will be appended to the search path used
 for "..."-style inclusions (see the
 .Fl I
 option).
@@ -280,7 +281,9 @@ A
 .Ql Ic \-
 causes any non-zero exit status of the command line to be ignored.
 .Sh VARIABLE ASSIGNMENTS
-Variables in make are much like variables in the shell, and, by tradition,
+Variables in
+.Nm make
+are much like variables in the shell, and, by tradition,
 consist of all upper-case letters.
 The five operators that can be used to assign values to variables are as
 follows:
@@ -302,7 +305,7 @@ the result to the variable.
 Any newlines in the result are replaced with spaces.
 .El
 .Pp
-Any white-space before the assigned
+Any whitespace before the assigned
 .Ar value
 is removed; if the value is being appended, a single space is inserted
 between the previous contents of the variable and the appended value.
@@ -367,7 +370,7 @@ The name of the target; also known as
 The shorter forms
 .Ql Va @ ,
 .Ql Va ? ,
-.Ql Va \&>
+.Ql Va \&> ,
 and
 .Ql Va *
 are permitted for backward
@@ -377,7 +380,7 @@ The six variables
 .Ql Va "@D" ,
 .Ql Va "<F" ,
 .Ql Va "<D" ,
-.Ql Va "*F"
+.Ql Va "*F" ,
 and
 .Ql Va "*D"
 are
@@ -409,7 +412,7 @@ sign.
 The name that
 .Nm make
 was executed with
-.Pq Va argv Op 0
+.Pq Va argv Ns Op 0 .
 .It Va .CURDIR
 A path to the directory where
 .Nm make
@@ -440,7 +443,7 @@ Finally, if none of the above directories are available
 will settle for and use the current directory.
 .It Ev MAKEFLAGS
 The environment variable
-.Ql Ev MAKEFLAGS
+.Ev MAKEFLAGS
 may contain anything that
 may be specified on
 .Nm make Ns 's
@@ -448,7 +451,7 @@ command line.
 Anything specified on
 .Nm make Ns 's
 command line is appended to the
-.Ql Ev MAKEFLAGS
+.Ev MAKEFLAGS
 variable which is then
 entered into the environment for all programs which
 .Nm make
@@ -461,15 +464,15 @@ normally sets
 to the canonical path given by
 .Xr getcwd 2 .
 However, if the environment variable
-.Ql Ev PWD
+.Ev PWD
 is set and gives a path to the current directory, then
 .Nm make
 sets
 .Ql Va .CURDIR
 to the value of
-.Ql Ev PWD
+.Ev PWD
 instead.
-.Ql Ev PWD
+.Ev PWD
 is set to the value of
 .Ql Va .OBJDIR
 for all programs which
@@ -478,7 +481,7 @@ executes.
 .El
 .Pp
 Variable expansion may be modified to select or modify each word of the
-variable (where a ``word'' is white-space delimited sequence of characters).
+variable (where a ``word'' is whitespace delimited sequence of characters).
 The general format of a variable expansion is as follows:
 .Pp
 .Dl {variable[:modifier[:...]]}
@@ -505,13 +508,13 @@ The wildcard characters may be escaped with a backslash
 .Pq Ql \e .
 .It Cm N Ns Ar pattern
 This is identical to
-.Ql Cm M ,
+.Cm M ,
 but selects all words which do not match
 the rest of the modifier.
 .It Cm Q
 Quotes every shell meta-character in the variable, so that it can be passed
 safely through recursive invocations of
-.Nm .
+.Nm make .
 .It Cm R
 Replaces each word in the variable with everything but its suffix.
 .Sm off
@@ -779,7 +782,7 @@ Takes a target name as an argument and evaluates to true if the target
 has been defined.
 .El
 .Pp
-.Ar Expression
+.Ar expression
 may also be an arithmetic or string comparison.  Variable expansion is
 performed on both sides of the comparison, after which the integral
 values are compared.  A value is interpreted as hexadecimal if it is
@@ -797,7 +800,7 @@ variable is being compared against 0.
 .Pp
 When
 .Nm make
-is evaluating one of these conditional expression, and it encounters
+is evaluating one of these conditional expressions, and it encounters
 a word it doesn't recognize, either the ``make'' or ``defined''
 expression is applied to it, depending on the form of the conditional.
 If the form is
@@ -809,7 +812,8 @@ is applied.
 Similarly, if the form is
 .Ql Ic .ifmake
 or
-.Ql Ic .ifnmake , the ``make''
+.Ql Ic .ifnmake ,
+the ``make''
 expression is applied.
 .Pp
 If the conditional evaluates to true the parsing of the makefile continues
@@ -838,10 +842,10 @@ The syntax of a for loop is:
 .Xc
 .El
 After the for
-.Ic expression
+.Ar expression
 is evaluated, it is split into words. The
 iteration
-.Ic variable
+.Ar variable
 is successively set to each word, and substituted in the
 .Ic make-rules
 inside the body of the for loop.
@@ -888,7 +892,7 @@ as if they all were preceded by an at sign
 .Pq Ql @ .
 .It Ic .USE
 Turn the target into
-.Nm make Ns 's .
+.Nm make Ns 's
 version of a macro.
 When the target is used as a source for another target, the other target
 acquires the commands, sources, and attributes (except for
@@ -998,7 +1002,7 @@ Each source specifies a suffix to
 .Nm make .
 If no sources are specified, any previous specified suffices are deleted.
 .Sh ENVIRONMENT
-.Nm Make
+.Nm make
 utilizes the following environment variables, if they exist:
 .Ev MACHINE ,
 .Ev MAKE ,
@@ -1008,21 +1012,21 @@ and
 .Ev PWD .
 .Sh FILES
 .Bl -tag -width /usr/share/mk -compact
-.It .depend
+.It Pa .depend
 list of dependencies
-.It Makefile
+.It Pa Makefile
 list of dependencies
-.It makefile
+.It Pa makefile
 list of dependencies
-.It sys.mk
+.It Pa sys.mk
 system makefile
-.It /usr/share/mk
+.It Pa /usr/share/mk
 system makefile directory
 .El
 .Sh SEE ALSO
 .Xr mkdep 1
 .Sh HISTORY
 A
-.Nm Make
+.Nm make
 command appeared in
 .At v7 .
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index 6af6103ee5a..c904c3b12f2 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.1,v 1.7 1998/09/14 05:43:47 deraadt Exp $
+.\"	$OpenBSD: man.1,v 1.8 1998/09/26 19:55:06 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -48,7 +48,7 @@
 .Op Fl s Ar section
 .Op Fl S Ar subsection
 .Op Ar section
-.Ar name Ar ...
+.Ar name Op Ar ...
 .Nm man
 .Fl k Ar keyword
 .Nm man
@@ -65,7 +65,7 @@ manual pages entitled
 The options are as follows:
 .Bl -tag -width indent
 .It Fl k
-Locate manpages matching
+Locate man pages matching
 .Ar keyword
 in much the same way as
 .Xr apropos 1
@@ -92,7 +92,7 @@ and
 .Ar name
 combination.
 (Normally, only the first manual page found is displayed.)
-.It Fl C
+.It Fl C Ar file
 Use the specified 
 .Ar file
 instead of the default configuration file.
@@ -109,7 +109,7 @@ This is done by default if the standard output is not a terminal device.
 Display only the
 .Dq Tn SYNOPSIS
 lines of the requested manual pages.
-.It Fl M
+.It Fl M Ar path
 Override the list of standard directories which
 .Nm man
 searches for manual pages.
@@ -122,7 +122,7 @@ The subdirectories to be searched, and their search order,
 is specified by the ``_subdir'' line in the
 .Nm man
 configuration file.
-.It Fl m
+.It Fl m Ar path
 Augment the list of standard directories which
 .Nm man
 searches for manual pages.
@@ -139,11 +139,11 @@ The subdirectories to be searched, and their search order,
 is specified by the ``_subdir'' line in the
 .Nm man
 configuration file.
-.It Fl s
+.It Fl s Ar section
 Another way of specifying the section, for compatibility with
 .Nm man
 on other operating systems.
-.It Fl S
+.It Fl S Ar subsection
 Specifies the machine-dependent subsection.  This overrides the
 .Ev MACHINE
 environment variable.  See the ``ENVIRONMENT'' section below.
@@ -156,7 +156,7 @@ and
 .Ar name
 combination.
 .It Fl f
-Locate manpages matching the
+Locate man pages matching the
 .Ar command
 in much the same way
 .Xr whatis 1
@@ -213,7 +213,7 @@ will be used instead of the standard pagination program,
 .Sh FILES
 .Bl -tag -width /etc/man.conf -compact
 .It Pa /etc/man.conf
-default man configuration file.
+default man configuration file
 .El
 .Sh SEE ALSO
 .Xr apropos 1 ,
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index e53ca5ace4b..4da4bab6eb4 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.conf.5,v 1.2 1996/06/26 05:37:02 deraadt Exp $
+.\"	$OpenBSD: man.conf.5,v 1.3 1998/09/26 19:55:07 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -116,7 +116,7 @@ and
 .Fl m
 options.
 .It _suffix
-Man file names, regardless of their format are expected to end in
+Man file names, regardless of their format, are expected to end in
 a ``.*'' pattern, i.e. a ``.'' followed by some suffix.
 Each field of a _suffix line is a suffix which indicates
 files which do not need to be reformatted or manipulated
@@ -178,14 +178,16 @@ would search the directories
 and
 .Dq Pa /usr/share/man/cat3 ,
 in that order, for
-the mktemp manual page.
+the
+.Xr mktemp 1
+manual page.
 If a subdirectory with the same name as the current machine type
 existed in any of them, it would be searched as well, before each
 of them were searched.
 .Sh FILES
 .Bl -tag -width /etc/man.conf -compact
 .It Pa /etc/man.conf
-Standard manual directory search path.
+standard manual directory search path
 .El
 .Sh SEE ALSO
 .Xr apropos 1 ,
diff --git a/usr.bin/mixerctl/mixerctl.1 b/usr.bin/mixerctl/mixerctl.1
index 3a11d32f2ff..1d438b90c59 100644
--- a/usr.bin/mixerctl/mixerctl.1
+++ b/usr.bin/mixerctl/mixerctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mixerctl.1,v 1.7 1998/09/01 16:38:24 deraadt Exp $
+.\" $OpenBSD: mixerctl.1,v 1.8 1998/09/26 19:55:07 aaron Exp $
 .\" $NetBSD: mixerctl.1,v 1.8 1998/05/09 12:41:16 augustss Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -51,13 +51,13 @@
 .Op Fl f Ar file
 .Op Fl n
 .Op Fl v
-.Ar name ...
+.Ar name Op Ar ...
 .br
 .Nm
 .Op Fl f Ar file
 .Op Fl n
 .Fl w
-.Ar name=value ...
+.Ar name=value Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -112,7 +112,7 @@ indicating that the control affects the input resp. output to the
 mixer.  The
 .Va name
 indicates what part of the mixer the control affects.
-Continous mixer values, e.g., volume, have numeric values
+Continuous mixer values, e.g., volume, have numeric values
 in the range 0-255.  If value can be set for each channel independently
 the values are printed separated by commas.  Discrete mixer values, e.g.,
 the recording source, have symbolic names.  Depending on the mixer it
@@ -139,7 +139,7 @@ mixer audio device
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width MIXERDEVICE
-.It Pa MIXERDEVICE
+.It Ev MIXERDEVICE
 the mixer device to use.
 .Sh SEE ALSO
 .Xr audioctl 1 ,
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index 97061d115fd..96b72a6bf34 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkdep.1,v 1.2 1996/06/26 05:37:06 deraadt Exp $
+.\"	$OpenBSD: mkdep.1,v 1.3 1998/09/26 19:55:08 aaron Exp $
 .\"	$NetBSD: mkdep.1,v 1.3 1994/12/23 07:34:56 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -45,9 +45,9 @@
 .Op Fl ap
 .Op Fl f Ar file
 .Op Ar flags
-.Ar file ...
+.Ar file Op Ar ...
 .Sh DESCRIPTION
-.Nm Mkdep
+.Nm mkdep
 takes a set of flags for the C compiler and a list
 of C source files as arguments and constructs a set of include
 file dependencies which are written into the file ``.depend''.
@@ -70,7 +70,7 @@ Append to the output file,
 so that multiple
 .Nm mkdep Ns 's
 may be run from a single Makefile.
-.It Fl f
+.It Fl f Ar file
 Write the include file dependencies to 
 .Ar file ,
 instead of the default ``.depend''.
@@ -97,7 +97,7 @@ module.
 .Sh FILES
 .Bl -tag -width .depend -compact
 .It Pa .depend
-File containing list of dependencies.
+file containing list of dependencies
 .El
 .Sh HISTORY
 The
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index c8208b19435..453abc94b1c 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkfifo.1,v 1.5 1998/07/24 00:43:55 espie Exp $
+.\"	$OpenBSD: mkfifo.1,v 1.6 1998/09/26 19:55:08 aaron Exp $
 .\"	$NetBSD: mkfifo.1,v 1.4 1994/12/23 07:16:54 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -42,14 +42,14 @@
 .Os BSD 4.4
 .Sh NAME
 .Nm mkfifo
-.Nd make fifos
+.Nd make FIFOs
 .Sh SYNOPSIS
 .Nm mkfifo
 .Op Fl m Ar mode
 .Ar fifo_name  ...
 .Sh DESCRIPTION
-.Nm Mkfifo
-creates the fifos requested, in the order specified,
+.Nm mkfifo
+creates the FIFOs requested, in the order specified,
 using mode
 .Li \&0666 
 modified by the current
@@ -57,7 +57,7 @@ modified by the current
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl m
+.It Fl m Ar mode
 Set the file permission bits of newly-created directories to
 .Ar mode .
 The mode is specified as in 
@@ -67,19 +67,20 @@ In symbolic mode strings, the
 and 
 .Dq -
 operators are interpreted relative to an assumed initial mode of 
-.Dq a=rw
+.Dq a=rw .
 .El
 .Pp
-.Nm Mkfifo
+.Nm mkfifo
 requires write permission in the parent directory.
 .Pp
-.Nm Mkfifo
-exits 0 if successful, and >0 if an error occurred.
+The
+.Nm mkfifo
+utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr mkdir 1 ,
-.Xr mknod 8 ,
 .Xr rm 1 ,
-.Xr mkfifo 2
+.Xr mkfifo 2 ,
+.Xr mknod 8
 .Sh STANDARDS
 The
 .Nm mkfifo
@@ -87,6 +88,7 @@ utility is expected to be
 .St -p1003.2-92
 compliant.
 .Sh HISTORY
+The
 .Nm
-command appears in
+command appeared in
 .Bx 4.4 .
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 68f5ad8556f..554ce8ccb52 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkstr.1,v 1.2 1996/06/26 05:37:13 deraadt Exp $
+.\"	$OpenBSD: mkstr.1,v 1.3 1998/09/26 19:55:09 aaron Exp $
 .\"	$NetBSD: mkstr.1,v 1.3 1995/09/28 06:22:19 tls Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -44,9 +44,9 @@
 .Nm mkstr
 .Op Fl
 .Ar messagefile
-.Ar prefix file ...
+.Ar prefix file Op Ar ...
 .Sh DESCRIPTION
-.Nm Mkstr
+.Nm mkstr
 creates files containing error messages extracted from C source,
 and restructures the same C source, to utilize the created error message
 file.
@@ -57,7 +57,7 @@ reduce swapping (see
 .Sx BUGS
 section below).
 .Pp
-.Nm Mkstr
+.Nm mkstr
 processes each of the specified
 .Ar files ,
 placing a restructured version of the input in a file whose name
@@ -73,18 +73,18 @@ mkstr pistrings xx *.c
 .Pp
 This command causes all the error messages from the C source
 files in the current directory to be placed in the file
-.Ar pistrings
+.Dq pistrings
 and restructured copies of the sources to be placed in
 files whose names are prefixed with
-.Ar \&xx .
+.Dq \&xx .
 .Pp
 Options:
 .Bl -tag -width indent
 .It Fl
 Error messages are placed at the end of the specified
-message file for recompiling part of a large
-.Nm mkstr
-ed
+.Ar messagefile
+for recompiling part of a large
+.Nm mkstr Ns ed
 program.
 .El
 .Pp
@@ -96,7 +96,7 @@ in the input stream.
 Each time it occurs, the C string starting at the
 .Sq \&"\&
 is stored
-in the message file followed by a null character and a new-line character;
+in the message file followed by a null character and a newline character.
 The new source is restructured with
 .Xr lseek 2
 pointers into the error message file for retrieval.
@@ -122,19 +122,19 @@ oops:
 }
 .Ed
 .Sh SEE ALSO
-.Xr lseek 2 ,
-.Xr xstr 1
+.Xr xstr 1 ,
+.Xr lseek 2
 .Sh HISTORY
-.Nm Mkstr
+.Nm mkstr
 appeared in
 .Bx 3.0 .
 .Sh BUGS
 .Nm mkstr
 was intended for the limited architecture of the PDP 11 family.
 Very few programs actually use it. The pascal interpreter,
-.Xr \&pi 1
+.Xr \&pi 1 ,
 and the editor,
-.Xr \&ex 1
+.Xr \&ex 1 ,
 are two programs that are built this way.
 It is not an efficient method, the error messages
 should be stored in the program text.
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index e4fc0389b07..e9cff350163 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mktemp.1,v 1.9 1998/04/13 17:22:10 millert Exp $
+.\"	$OpenBSD: mktemp.1,v 1.10 1998/09/26 19:55:09 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -77,12 +77,12 @@ is created with mode 0600 (unless the
 flag is given) and the filename is printed
 to standard output.
 .Pp
-.Nm Mktemp
+.Nm mktemp
 is provided to allow shell scripts to safely use temporary files.
 Traditionally, many shell scripts take the name of the program with
-the pid as a suffix and use that as a temporary file name.  This
+the PID as a suffix and use that as a temporary file name.  This
 kind of naming scheme is predictable and the race condition it creates
-is easy for an attacker to win.  A safer, though still inferior, approach
+is easy for an attacker to win.  A safer, though still inferior approach
 is to make a temporary directory using the same naming scheme.  While
 this does allow one to guarantee that a temporary file will not be
 subverted, it still allows a simple denial of service attack.  For these
@@ -111,7 +111,7 @@ option is not encouraged.
 The
 .Nm
 utility
-exits with a value of 0 on success, and 1 on failure.
+exits with a value of 0 on success or 1 on failure.
 .Sh EXAMPLES
 The following
 .Xr sh 1
@@ -133,9 +133,9 @@ if [ $? -ne 0 ]; then
 fi
 .Ed
 .Sh SEE ALSO
-.Xr mktemp 3 ,
 .Xr mkdtemp 3 ,
-.Xr mkstemp 3
+.Xr mkstemp 3 ,
+.Xr mktemp 3
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index 5e67948e3dc..495dfef9900 100644
--- a/usr.bin/modstat/modstat.8
+++ b/usr.bin/modstat/modstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modstat.8,v 1.3 1996/10/08 01:20:54 michaels Exp $
+.\"	$OpenBSD: modstat.8,v 1.4 1998/09/26 19:55:09 aaron Exp $
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
 .\"
@@ -52,7 +52,7 @@ Display the status of only the module with this name.
 The
 .Nm
 utility exits with a status of 0 on success
-and with a nonzero status if an error occurs.
+or with a nonzero status if an error occurred.
 .Sh SEE ALSO
 .Xr lkm 4 ,
 .Xr modunload 8 ,
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 4aa9330658c..2506be953fa 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msgs.1,v 1.2 1996/06/26 05:37:17 deraadt Exp $
+.\"	$OpenBSD: msgs.1,v 1.3 1998/09/26 19:55:10 aaron Exp $
 .\"	$NetBSD: msgs.1,v 1.5 1995/09/28 06:57:39 tls Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -51,14 +51,14 @@
 .Op Fl c
 .Op \-days
 .Sh DESCRIPTION
-.Nm Msgs
+.Nm msgs
 is used to read system messages.
 These messages are
 sent by mailing to the login `msgs' and should be short
 pieces of information which are suitable to be read once by most users
 of the system.
 .Pp
-.Nm Msgs
+.Nm msgs
 is normally invoked each time you login, by placing it in the file
 .Pa .login
 (or
@@ -72,38 +72,39 @@ If there is more to the message, you will be told how
 long it is and asked whether you wish to see the rest of the message.
 The possible responses are:
 .Bl -tag -width Fl
-.It Fl y
+.It Ic y
 Type the rest of the message.
 .It Ic RETURN
-Synonym for y.
-.It Fl n
+Synonym for
+.Ic y .
+.It Ic n
 Skip this message
 and go on to the next message.
-.It Fl
+.It Ic \&-
 Redisplay the last message.
-.It Fl q
+.It Ic q
 Drop out of
 .Nm msgs ;
 the next time
 .Nm msgs
 will pick up where it last left off.
-.It Fl s
+.It Ic s
 Append the current message to the file ``Messages'' in the current directory;
 `s\-' will save the previously displayed message. A `s' or `s\-' may
 be followed by a space and a file name to receive the message replacing
 the default ``Messages''.
-.It Fl m
+.It Ic m
 A copy of the specified message is placed in a temporary
 mailbox and
 .Xr mail  1
 is invoked on that mailbox.
-.It Fl p
+.It Ic p
 The specified message is piped through $PAGER, or, if $PAGER is not defined,
 .Xr more 1  .
 The commands `m', `p', and `s' all accept a numeric argument in place of the `\-'.
 .El
 .Pp
-.Nm Msgs
+.Nm msgs
 keeps track of the next message you will see by a number in the file
 .Pa \&.msgsrc
 in your home directory.
@@ -140,7 +141,7 @@ to enable posting of messages.
 The
 .Fl c
 option is used for performing cleanup on
-.Pa /var/msgs.
+.Pa /var/msgs .
 An entry with the
 .Fl c
 option should be placed in
@@ -166,7 +167,7 @@ Print the first part of messages only.
 Disables the ability to save messages or enter the mailer.  It is
 assumed that $PAGER is set to something secure.
 .It Fl l
-Option causes only locally originated messages to be reported.
+Causes only locally originated messages to be reported.
 .It Ar num
 A message number can be given
 on the command line, causing
@@ -197,7 +198,7 @@ you can also go to any specific message by typing its number when
 .Nm msgs
 requests input as to what to do.
 .Sh ENVIRONMENT
-.Nm Msgs
+.Nm msgs
 uses the
 .Ev HOME
 and
@@ -215,7 +216,8 @@ number of next message to be presented
 .Xr aliases 5 ,
 .\".Xr crontab 5 ,
 .Xr mail 1 ,
-.Xr more 1
+.Xr more 1 ,
+.Xr aliases 5
 .Sh HISTORY
 The
 .Nm msgs