13 files changed, 208 insertions, 163 deletions
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index 2ffbc4b6335..2b79320c187 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.16 2000/03/05 00:28:52 aaron Exp $
+.\" $OpenBSD: cdio.1,v 1.17 2000/03/05 20:09:19 aaron Exp $
 .Dd July 3, 1995
 .Dt CDIO 1
 .Os
@@ -14,11 +14,12 @@
 .Sh DESCRIPTION
 The
 .Nm
-program controls audio features of a CD drive. The
+program controls audio features of a CD drive.
+The
 .Ar device
 is a name such
 as
-.Dq cd0 ,
+.Dq cd0
 or
 .Dq mcd0 .
 .Pp
@@ -35,9 +36,11 @@ enters an interactive mode, reading commands from the standard input.
 The options are as follows:
 .Bl -tag -width flag
 .It Fl s
-Silent mode. Do not print table headers or human-readable comments.
+Silent mode.
+Do not print table headers or human-readable comments.
 .It Fl v
-Verbose mode. Print as much information as possible.
+Verbose mode.
+Print as much information as possible.
 .It Fl f Ar device
 Specifies a device name such as
 .Pa /dev/rcd0d
@@ -49,100 +52,108 @@ filenames are possible.
 The raw partition name is added if needed.
 .El
 .Pp
-The available commands are listed below.  Only as many
-characters as are required to uniquely identify a command
-need be specified. The word
-.Cm play
+The available commands are listed below.
+Only as many characters as are required to uniquely identify a command
+need be specified.
+The word
+.Ic play
 may be omitted.
-.Bl -tag -width Cm
-.It Cm play Ar first_track Op Ar last_track
+.Bl -tag -width Ic
+.It Ic play Ar first_track Op Ar last_track
 Play from track
 .Ar first_track
 to track
 .Ar last_track .
 The first track has number 1 and may be omitted in all cases.
-.It Cm play Ar start_m:start_s.start_f Op Ar end_m:end_s.end_f
+.It Ic play Ar start_m:start_s.start_f Op Ar end_m:end_s.end_f
 Play from the absolute address
 (MSF) defined by
 .Ar start_m
 in minutes,
-.Ar start_s,
-in seconds and
+.Ar start_s
+in seconds, and
 .Ar start_f
 (frame number) to the absolute address defined by
 .Ar end_m
 in minutes,
-.Ar end_s,
-in seconds and
+.Ar end_s
+in seconds, and
 .Ar end_f
-(frame number). Minutes are in the range 0-99. Seconds are in the range 0-59.
+(frame number).
+Minutes are in the range 0-99.
+Seconds are in the range 0-59.
 Frame numbers are in the range 0-74.
-.It Cm play Op Ar #start_block Op length
+.It Ic play Op Ar #start_block Op length
 Play starting from the logical block
 .Ar start_block
 using
 .Ar length
 logical blocks.
-.It Cm pause
-Stop playing. Do not stop the disc.
-.It Cm next
-Play the next track. If we're at the last track, stop.
-.It Cm previous
-Play the previous track. If we're at the first track, restart.
-.It Cm replay
+.It Ic pause
+Stop playing.
+Do not stop the disc.
+.It Ic next
+Play the next track.
+If we're at the last track, stop.
+.It Ic previous
+Play the previous track.
+If we're at the first track, restart.
+.It Ic replay
 Replay the current track again.
-.It Cm resume
-Resume playing. Used after the
-.Cm pause
+.It Ic resume
+Resume playing.
+Used after the
+.Ic pause
 command.
-.It Cm stop
+.It Ic stop
 Stop the disc.
-.It Cm eject
+.It Ic eject
 Eject the disc.
-.It Cm close
+.It Ic close
 Inject the disc.
-.It Cm volume Ar left_channel Ar right_channel
+.It Ic volume Ar left_channel Ar right_channel
 Set the volume of the left channel to
 .Ar left_channel
 and the volume of the right channel to
 .Ar right_channel .
 Allowed values are in the range 0-255.
-.It Cm volume Ar mute
+.It Ic volume Ar mute
 Turn the sound off.
-.It Cm volume Ar mono
+.It Ic volume Ar mono
 Set the mono mode.
-.It Cm volume Ar stereo
+.It Ic volume Ar stereo
 Set the stereo mode.
-.It Cm volume Ar left
+.It Ic volume Ar left
 Play the left subtrack on both left and right channels.
-.It Cm volume Ar right
+.It Ic volume Ar right
 Play the right subtrack on both left and right channels.
-.It Cm info
+.It Ic info
 Print the table of contents.
-.It Cm status
+.It Ic status
 Print information about the disc:
 the current playing status and position,
 the current media catalog status,
-the current values of the volume for left and right channels.
-.It Cm help
+and the current values of the volume for left and right channels.
+.It Ic help
 Print the list of available commands.
-.It Cm debug Ar on
+.It Ic debug Ar on
 Enable the debugging mode of the CD device driver.
-.It Cm debug Ar off
+.It Ic debug Ar off
 Disable the driver debugging mode.
-.It Cm device Ar devname
+.It Ic device Ar devname
 Make
 .Ar devname
-the current CD device.  This is the equivalent of quitting
+the current CD device.
+This is the equivalent of quitting
 .Nm
 and restarting with a different device.
-.It Cm reset
+.It Ic reset
 Perform a hardware reset of the device.
-.It Cm set Ar msf
+.It Ic set Ar msf
 Set minute-second-frame ioctl mode (default).
-.It Cm set Ar lba
+.It Ic set Ar lba
 Set LBA ioctl mode.
-.It Cm quit
+.It Ic quit
 Quit the program.
 .Sh FILES
 .Bl -tag -width /dev/rmcd0c -compact
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index f9e8837cd37..509b47aff31 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: checknr.1,v 1.7 1999/10/17 20:24:34 aaron Exp $
+.\"	$OpenBSD: checknr.1,v 1.8 2000/03/05 20:09:20 aaron Exp $
 .\"	$NetBSD: checknr.1,v 1.5 1995/03/26 04:10:14 glass Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -72,7 +72,7 @@ the first macro name,
 another period,
 and the second macro name.
 For example, to define a pair .BS and .ES, use
-.Sq Li \-a.BS.ES
+.Dq Li \-a.BS.ES
 .It Fl c
 Define commands which would otherwise be complained about
 as undefined.
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 3a498bad79c..d334c1c8945 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chflags.1,v 1.9 1999/12/15 16:08:23 aaron Exp $
+.\"	$OpenBSD: chflags.1,v 1.10 2000/03/05 20:09:20 aaron Exp $
 .\"	$NetBSD: chflags.1,v 1.4 1995/08/31 22:50:22 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -139,7 +139,9 @@ command's actions are determined by the last one specified.
 Only the super-user can change the user flags on block and
 character devices.
 .Pp
-You can use "ls -lo" to see the flags of existing files.
+You can use
+.Ic ls -lo
+to see the flags of existing files.
 .Pp
 The
 .Nm
@@ -150,3 +152,8 @@ utility exits 0 on success or >0 if an error occurred.
 .Xr stat 2 ,
 .Xr fts 3 ,
 .Xr symlink 7
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Bx 4.4 .
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 8e0062666b4..71fe39d2f5a 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cksum.1,v 1.10 1999/07/21 01:25:42 deraadt Exp $
+.\"	$OpenBSD: cksum.1,v 1.11 2000/03/05 20:09:20 aaron Exp $
 .\"	$NetBSD: cksum.1,v 1.8 1995/09/02 05:45:15 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -52,7 +52,7 @@
 .Op Ar file ...
 .Sh DESCRIPTION
 The
-.Nm
+.Nm cksum
 utility writes to the standard output three whitespace separated
 fields for each input file.
 These fields are a checksum
@@ -64,7 +64,7 @@ is written.
 The
 .Nm sum
 utility is identical to the
-.Nm
+.Nm cksum
 utility, except that it defaults to using historic algorithm 1, as
 described below.
 It is provided for compatibility only.
@@ -154,18 +154,19 @@ The bit sequence is complemented and the result is the CRC.
 .Ed
 .Pp
 The
-.Nm
+.Nm cksum
 and
 .Nm sum
 utilities exit 0 on success or >0 if an error occurred.
 .Sh WARNING
 Do not use
-.Nm sum
+.Nm cksum
 or
-.Nm
-to detect hostile binary modifications.  An attacker
-can trivially produce backdoored daemons which have the same CRC as the
-standard versions.  Use a cryptographic checksum (such as MD5) instead.
+.Nm sum
+to detect hostile binary modifications.
+An attacker can trivially produce backdoored daemons which have the same
+CRC as the standard versions.
+Use a cryptographic checksum (such as MD5) instead.
 .Sh SEE ALSO
 .Xr md5 1 ,
 .Xr rmd160 1 ,
@@ -183,19 +184,12 @@ article.
 .Re
 .Sh STANDARDS
 The
-.Nm
+.Nm cksum
 utility is compliant with the
 .St -p1003.2-92
 specification.
 .Sh HISTORY
 The
-.Nm
+.Nm cksum
 utility appeared in
 .Bx 4.4 .
-.\" .Pp
-.\" The
-.\" .Nm sum
-.\" utility appeared in
-.\" .Bx ?.?
-.\" and
-.\" .At V .
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index abd6f065775..5a96ef7ab04 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: cmp.1,v 1.7 2000/03/05 00:28:52 aaron Exp $
+.\"     $OpenBSD: cmp.1,v 1.8 2000/03/05 20:09:21 aaron Exp $
 .\"     $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -80,7 +80,10 @@ and
 .Ar file2 ,
 respectively, where the comparison will begin.
 The offset is decimal by default, but may be expressed as a hexadecimal
-or octal value by preceding it with a leading ``0x'' or ``0''.
+or octal value by preceding it with a leading
+.Dq 0x
+or
+.Dq 0 .
 .Pp
 The
 .Nm
@@ -96,7 +99,9 @@ In the latter case, if the
 .Fl s
 option has not been specified,
 .Nm
-writes to standard error that EOF was reached in the shorter
+writes to standard error that
+.Dv EOF
+was reached in the shorter
 file (before any differences were found).
 .It >1
 An error occurred.
@@ -110,3 +115,8 @@ The
 utility is expected to be
 .St -p1003.2
 compatible.
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v1 .
diff --git a/usr.bin/compile_et/compile_et.1 b/usr.bin/compile_et/compile_et.1
index dead7fa6735..f7d860495a1 100644
--- a/usr.bin/compile_et/compile_et.1
+++ b/usr.bin/compile_et/compile_et.1
@@ -1,8 +1,8 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $OpenBSD: compile_et.1,v 1.8 2000/02/19 12:07:18 hin Exp $
-.\" $Header: /cvs/OpenBSD/src/usr.bin/compile_et/compile_et.1,v 1.8 2000/02/19 12:07:18 hin Exp $
+.\" $OpenBSD: compile_et.1,v 1.9 2000/03/05 20:09:21 aaron Exp $
+.\" $Header: /cvs/OpenBSD/src/usr.bin/compile_et/compile_et.1,v 1.9 2000/03/05 20:09:21 aaron Exp $
 .\"
 .Dd	November 22, 1988
 .Dt COMPILE_ET 1
@@ -20,42 +20,38 @@ a C source file suitable for use with the
 .Xr com_err 3
 library.
 .Pp
-The source file name must end with a suffix of ``.et''; the file
+The source file name must end with a suffix of
+.Dq .et ;
+the file
 consists of headers and declarations supplying the name (up to four characters
 long) of the error-code table.
-
+.Pp
 The file may have these declarations:
-
-.Em id string
-
-where string is a revision control system tag.
-
-.Em prefix string
-
-where string is prepended to all error codes specified in the file.
-
-.Em error_table name
-
-which specifies the name of the error table.
-
-.Em index number
-
-sets the assigned error number for the next entry.
-
-.Em error_code name ,
-"
-.Em string
-"
-
-declares an error code called name with description name. Upto
-256 error codes are allowed.
-
-and a final
-
-.Em end
-
-to indicate the end of the table.
-
+.Bl -tag -width Ds
+.It Sy id Ar string
+Specify
+.Ar string
+as a revision control system tag.
+.It Sy prefix Ar string
+Prepends
+.Ar string
+to all error codes specified in the file.
+.It Sy error_table Ar name
+Specifies the name of the error table.
+.It Sy index Ar number
+Sets the assigned error number for the next entry.
+.It Xo Sy error_code
+.Ar name ,
+.Qq Ar string
+.Xc
+Declares an error code called
+.Ar name
+with description
+.Ar string ;
+up to 256 error codes are allowed.
+.It Sy end
+Indicates the end of the table.
+.El
 .Pp
 The name of the table is used to construct the name of a subroutine
 .Em initialize_XXXX_error_table
@@ -77,10 +73,17 @@ A C source file is also generated which should be compiled and linked
 with the object files which reference these error codes; it contains
 the text of the messages and the initialization subroutine.  Both C
 files have names derived from that of the original source file, with
-the ``.et'' suffix replaced by ``.c'' and ``.h''.
+the
+.Dq .et
+suffix replaced by
+.Dq \&.c
+and
+.Dq \&.h .
 .Pp
-A ``#'' in the source file is treated as a comment character, and all
-remaining text to the end of the source line will be ignored.
+A hash mark
+.Pq Ql #
+in the source file is treated as a comment character; subsequent
+characters to the end of the source line will be ignored.
 .Sh BUGS
 Since
 .Nm
@@ -90,6 +93,8 @@ its error recovery leaves much to be desired.
 .Sh SEE ALSO
 .Xr yacc 1 ,
 .Xr com_err 3
+.\" XXX - use .br here to work-around apparent bug in mdoc
+.br
 .Pp
 .Rs
 .%A Ken Raeburn
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index fe9e813897c..a23b1c28483 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compress.1,v 1.9 1999/10/05 17:09:11 aaron Exp $
+.\"	$OpenBSD: compress.1,v 1.10 2000/03/05 20:09:21 aaron Exp $
 .\"	$NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
 .\"
 .\" Copyright (c) 1986, 1990, 1993
@@ -130,6 +130,8 @@ limit specified by the
 flag is reached.
 .Ar bits
 must be between 9 and 16 (the default is 16).
+.\" XXX - use .br here to work-around an apparent bug in mdoc
+.br
 .Pp
 After the
 .Ar bits
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index 85650564f8e..7a2d5e03958 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zopen.3,v 1.4 1997/01/19 17:25:12 millert Exp $
+.\"	$OpenBSD: zopen.3,v 1.5 2000/03/05 20:09:21 aaron Exp $
 .\"	$NetBSD: zopen.3,v 1.3 1995/03/26 09:44:49 glass Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -104,7 +104,7 @@ for more information.
 Upon successful completion
 .Fn zopen
 returns a
-.Tn FILE
+.Dv FILE
 pointer.
 Otherwise,
 .Dv NULL
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 3bcfb41ac69..e1986a19184 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctags.1,v 1.8 2000/03/04 22:19:22 aaron Exp $
+.\"	$OpenBSD: ctags.1,v 1.9 2000/03/05 20:09:21 aaron Exp $
 .\"	$NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -57,6 +57,7 @@ A tags file gives the locations of specified objects in a group of files.
 Each line of the tags file contains the object name, the file in which it
 is defined, and a search pattern for the object definition, separated by
 whitespace.
+.Pp
 Using the
 .Ar tags
 file,
@@ -66,6 +67,8 @@ Depending upon the options provided to
 .Nm ctags ,
 objects will consist of subroutines, typedefs, defines, structs,
 enums, and unions.
+.Pp
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl B
 Use backward searching patterns
@@ -96,16 +99,18 @@ Update the specified files in the
 .Ar tags
 file, that is, all
 references to them are deleted, and the new values are appended to the
-file.  (Beware: this option is implemented in a way which is rather
+file.
+(Beware: this option is implemented in a way which is rather
 slow; it is usually faster to simply rebuild the
 .Ar tags
 file.)
 .It Fl v
 An index of the form expected by
 .Xr vgrind 1
-is produced on the standard output.  This listing
-contains the object name, file name, and page number (assuming 64
-line pages).  Since the output will be sorted into lexicographic order,
+is produced on the standard output.
+This listing contains the object name, file name, and page number (assuming
+64 line pages).
+Since the output will be sorted into lexicographic order,
 it may be desired to run the output through
 .Xr sort 1 .
 Sample use:
@@ -119,44 +124,48 @@ Suppress warning diagnostics.
 .Nm
 produces a list of object
 names, the line number and file name on which each is defined, as well
-as the text of that line and prints this on the standard output.  This
-is a simple index which can be printed out as an off-line readable
+as the text of that line and prints this on the standard output.
+This is a simple index which can be printed out as an off-line readable
 function index.
 .El
 .Pp
 Files whose names end in
-.Nm \&.c
+.Dq \&.c
 or
-.Nm \&.h
+.Dq \&.h
 are assumed to be C
 source files and are searched for C style routine and macro definitions.
 Files whose names end in
-.Nm \&.y
+.Dq \&.y
 are assumed to be
 .Tn YACC
 source files.
 Files whose names end in
-.Nm \&.l
+.Dq \&.l
 are assumed to be lisp files if their
-first non-blank character is `;', `(', or `[',
+first non-blank character is
+.Ql \&; ,
+.Ql ( ,
+or
+.Ql [ ,
 otherwise, they are
-treated as lex files.  Other files are first examined to see if they
+treated as lex files.
+Other files are first examined to see if they
 contain any Pascal or Fortran routine definitions, and, if not, are
 searched for C style definitions.
 .Pp
 The tag
 .Li main
-is treated specially in C programs.  The tag formed
-is created by prepending
-.Ar M
+is treated specially in C programs.
+The tag formed is created by prepending
+.Sq M
 to the name of the file, with the
 trailing
-.Nm \&.c
-and any leading pathname components removed.  This
-makes use of
+.Dq \&.c
+and any leading pathname components removed.
+This makes use of
 .Nm
-practical in directories with more than one
-program.
+practical in directories with more than one program.
 .Pp
 Yacc and lex files each have a special tag.
 .Ar Yyparse
@@ -185,7 +194,8 @@ and
 .Nm procedures
 for
 .Tn FORTRAN
-and Pascal is done in a very simple-minded way.  No attempt
+and Pascal is done in a very simple-minded way.
+No attempt
 is made to deal with block structure; if you have two Pascal procedures
 in different blocks with the same name you lose.
 .Nm
@@ -198,8 +208,9 @@ functions is a hack.
 .Pp
 .Nm
 relies on the input being well formed, and any syntactical
-errors will completely confuse it.  It also finds some legal syntax
-confusing; for example, since it doesn't understand
+errors will completely confuse it.
+It also finds some legal syntax confusing; for example,
+since it doesn't understand
 .Li #ifdef Ns 's
 (incidentally, that's a feature, not a bug), any code with unbalanced
 braces inside
@@ -207,7 +218,8 @@ braces inside
 will cause it to become somewhat disoriented.
 In a similar fashion, multiple line changes within a definition will
 cause it to enter the last line of the object, rather than the first, as
-the searching pattern.  The last line of multiple line
+the searching pattern.
+The last line of multiple line
 .Li typedef Ns 's
 will similarly be noted.
 .Sh HISTORY
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index ff5ec4f12b7..1c2c2457f6d 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cut.1,v 1.5 1999/07/04 11:53:52 aaron Exp $
+.\"	$OpenBSD: cut.1,v 1.6 2000/03/05 20:09:21 aaron Exp $
 .\"	$NetBSD: cut.1,v 1.6 1995/10/02 20:19:26 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -60,7 +60,7 @@
 The
 .Nm
 utility selects portions of each line (as specified by
-.Ar list  )
+.Ar list )
 from each
 .Ar file
 (or the standard input by default), and writes them to the
@@ -68,7 +68,8 @@ standard output.
 The items specified by
 .Ar list
 can be in terms of column position or in terms of fields delimited
-by a special character. Column numbering starts from 1.
+by a special character.
+Column numbering starts from 1.
 .Pp
 .Ar list
 is a comma or whitespace separated set of increasing numbers and/or
@@ -76,7 +77,7 @@ number ranges.
 Number ranges consist of a number, a dash
 .Pq Sq \- ,
 and a second number
-and select the fields or columns from the first number to the second,
+which select the fields or columns from the first number to the second,
 inclusive.
 Numbers or number ranges may be preceded by a dash, which selects all
 fields or columns from 1 to the first number.
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 325e9ac87b9..773e5e047d0 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: du.1,v 1.10 1999/07/04 11:53:53 aaron Exp $
+.\"	$OpenBSD: du.1,v 1.11 2000/03/05 20:09:22 aaron Exp $
 .\"	$NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -90,7 +90,7 @@ that cannot be opened, and so on.  This is the default case.
 This option exists solely for conformance with
 .St -xpg4 .
 .It Fl x
-Filesystem mount points are not traversed.
+File system mount points are not traversed.
 .El
 .Pp
 .Nm
@@ -120,13 +120,13 @@ time per
 execution.
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
+The following environment variables affect the execution of
+.Nm du :
+.Pp
 .It Ev BLOCKSIZE
-If the environment variable
-.Ev BLOCKSIZE
-is set, and the
+Block counts will be displayed in units of this size block, unless the
 .Fl k
-option is not specified, the block counts will be displayed in units of that
-size block.
+option is also specified.
 .El
 .Sh SEE ALSO
 .Xr df 1 ,
diff --git a/usr.bin/encrypt/encrypt.1 b/usr.bin/encrypt/encrypt.1
index 69767f1dbf9..35924edf331 100644
--- a/usr.bin/encrypt/encrypt.1
+++ b/usr.bin/encrypt/encrypt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: encrypt.1,v 1.13 2000/03/05 00:28:52 aaron Exp $
+.\"	$OpenBSD: encrypt.1,v 1.14 2000/03/05 20:09:22 aaron Exp $
 .\"
 .\" Copyright (c) 1996, Jason Downs.  All rights reserved.
 .\"
@@ -69,7 +69,8 @@ If no
 is specified,
 .Nm
 reads one string per line from standard input, encrypting each one
-with the chosen algorithm from above. In case that no specific algorithm
+with the chosen algorithm from above.
+In case that no specific algorithm
 was given as a command line option, the default will be looked up from
 .Pa /etc/passwd.conf .
 .Pp
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 66c1e0752e8..2e24aaf0a31 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: env.1,v 1.5 1999/06/05 01:21:23 aaron Exp $
+.\"	$OpenBSD: env.1,v 1.6 2000/03/05 20:09:22 aaron Exp $
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -55,20 +55,22 @@
 executes
 .Ar utility
 after modifying the environment as
-specified on the command line.  The option
+specified on the command line.
+The option
 .Ar name Ns No = Ns Ar value
 specifies
 an environment variable,
-.Ar name  ,
+.Ar name ,
 with a value of
-.Ar value  .
-The
-.Fl i
-option
-causes
+.Ar value .
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl i
+Causes
 .Nm
-to completely ignore the environment
-it inherits.
+to completely ignore the environment it inherits.
+.El
 .Pp
 If no
 .Ar utility