- section reorder

- COMPATIBILITY merge
- macro cleanup
- kill whitespace at EOL
- new sentence, new line

ssh pages ok markus@

104 files changed, 816 insertions, 768 deletions

diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 54f72d08d49..935333e3121 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: apply.1,v 1.19 2003/06/03 02:56:05 millert Exp $
+.\"	$OpenBSD: apply.1,v 1.20 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: apply.1,v 1.4 1996/03/18 23:16:57 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -93,6 +93,17 @@ as the magic character instead of the default
 Debug mode.
 Print commands to the standard output but do not actually execute them.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width SHELL
+.It Ev SHELL
+Pathname of shell to use.
+If this variable is not defined, the Bourne shell is used.
+.El
+.Sh FILES
+.Bl -tag -width /bin/sh -compact
+.It Pa /bin/sh
+default shell
+.El
 .Sh EXAMPLES
 .Li "$ apply echo a*"
 .Pp
@@ -117,26 +128,15 @@ Runs
 .Pp
 Links all files in the current directory to the directory
 .Pa /usr/joe .
-.Sh ENVIRONMENT
-.Bl -tag -width SHELL
-.It Ev SHELL
-Pathname of shell to use.
-If this variable is not defined, the Bourne shell is used.
-.El
-.Sh FILES
-.Bl -tag -width /bin/sh -compact
-.It Pa /bin/sh
-default shell
-.El
 .Sh SEE ALSO
 .Xr xargs 1
-.Sh AUTHORS
-Rob Pike
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.2 .
+.Sh AUTHORS
+Rob Pike
 .Sh BUGS
 Shell metacharacters in
 .Ar command
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 3d6c5779f34..2bdd9b7d16d 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ar.1,v 1.12 2003/06/03 02:56:05 millert Exp $
+.\"	$OpenBSD: ar.1,v 1.13 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -317,7 +317,7 @@ temporary file names
 .Xr ranlib 1 ,
 .Xr strmode 3 ,
 .Xr ar 5
-.Sh COMPATIBILITY
+.Sh STANDARDS
 By default,
 .Nm
 writes archives that may be incompatible with historic archives, as
@@ -337,7 +337,7 @@ in a future release.
 See
 .Xr ar 5
 for more information.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility is expected to offer a superset of the
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index 14d9ba34d82..a8e3b7cfb45 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ar.5,v 1.6 2003/06/03 02:56:05 millert Exp $
+.\"	$OpenBSD: ar.5,v 1.7 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: ar.5,v 1.2 1995/03/25 06:39:38 glass Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -104,6 +104,11 @@ character, although the size in the header does not reflect this.
 .Sh SEE ALSO
 .Xr ar 1 ,
 .Xr stat 2
+.Sh STANDARDS
+No archive format is currently specified by any standard.
+.At V
+has historically distributed archives in a different format from
+all of the above.
 .Sh HISTORY
 There have been at least four
 .Nm ar
@@ -138,8 +143,3 @@ It has been extended for these reasons,
 as described above.
 This format first appeared in
 .Bx 4.4 .
-.Sh COMPATIBILITY
-No archive format is currently specified by any standard.
-.At V
-has historically distributed archives in a different format from
-all of the above.
diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index 6d15965096d..02883cb6e65 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: asa.1,v 1.10 2002/11/14 02:57:27 deraadt Exp $
+.\"	$OpenBSD: asa.1,v 1.11 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: asa.1,v 1.4 1995/03/26 02:25:05 glass Exp $
 .\"
 .\" Copyright (c) 1993 Winning Strategies, Inc.
@@ -53,14 +53,16 @@ The first character of each line is interpreted as a carriage-control
 character.
 Additionally, the following characters are interpreted as shown:
 .Bl -tag -width indent
-.It <space>
+.It Aq space
 Output the rest of the line without change.
 .It 0
 Output a newline
 .Pq Sq \en
 character before printing the rest of the line.
 .It 1
-Output a <formfeed> character before printing the rest of the line.
+Output a
+.Aq formfeed
+character before printing the rest of the line.
 .It +
 The trailing newline
 .Pq Sq \en
@@ -78,7 +80,8 @@ The
 utility exits 0 on success or >0 if an error occurred.
 .Sh EXAMPLES
 To view a file containing the output of a
-.Tn FORTRAN program:
+.Tn FORTRAN
+program:
 .Pp
 .Dl $ asa file
 .Pp
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 6e3efed1e10..04a1009be0b 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: at.1,v 1.30 2003/02/19 22:11:42 millert Exp $
+.\" $OpenBSD: at.1,v 1.31 2003/06/10 09:12:09 jmc Exp $
 .\"
 .\" Copyright (C) 1993, 1994  Thomas Koenig
 .\" Copyright (C) 1993  David Parsons
@@ -59,7 +59,7 @@ specified by the
 .Ev SHELL
 environment variable.
 If
-.Ev SHELL   
+.Ev SHELL
 is not set, the shell in the user's password database entry is used
 instead.
 If all else fails,
@@ -318,8 +318,10 @@ deny permission control
 .Xr sendmail 8
 .Sh AUTHORS
 .Nm at
-was mostly written by Thomas Koenig <ig25@rz.uni-karlsruhe.de>.
-The time parsing routines are by David Parsons <orc@pell.chi.il.us>.
+was mostly written by
+.An Thomas Koenig Aq ig25@rz.uni-karlsruhe.de .
+The time parsing routines are by
+.An David Parsons Aq orc@pell.chi.il.us .
 .Sh BUGS
 .Nm at
 and
diff --git a/usr.bin/at/atq.1 b/usr.bin/at/atq.1
index a1ca05d1a76..ad95e959c28 100644
--- a/usr.bin/at/atq.1
+++ b/usr.bin/at/atq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atq.1,v 1.3 2003/06/03 02:56:05 millert Exp $
+.\"	$OpenBSD: atq.1,v 1.4 2003/06/10 09:12:09 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -99,5 +99,5 @@ directory containing job files
 .Sh HISTORY
 The
 .Nm
-command appeared in 
+command appeared in
 .Bx 4.3 .
diff --git a/usr.bin/at/atrm.1 b/usr.bin/at/atrm.1
index babca516d46..507fb9581ac 100644
--- a/usr.bin/at/atrm.1
+++ b/usr.bin/at/atrm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: atrm.1,v 1.4 2003/06/03 02:56:05 millert Exp $
+.\"	$OpenBSD: atrm.1,v 1.5 2003/06/10 09:12:09 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -70,7 +70,7 @@ ids are specified,
 attempts to remove only those
 .Ar job Ns s.
 .Pp
-If one or more user names are specified, all jobs belonging to those users 
+If one or more user names are specified, all jobs belonging to those users
 are removed.
 Only the superuser may remove other users' jobs.
 .Sh FILES
@@ -85,5 +85,5 @@ directory containing job files
 .Sh HISTORY
 The
 .Nm
-command appeared in 
+command appeared in
 .Bx 4.3 .
diff --git a/usr.bin/audioctl/audioctl.1 b/usr.bin/audioctl/audioctl.1
index 26b47cd0262..1db3df4debf 100644
--- a/usr.bin/audioctl/audioctl.1
+++ b/usr.bin/audioctl/audioctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: audioctl.1,v 1.14 2002/12/10 09:01:24 pvalchev Exp $
+.\" $OpenBSD: audioctl.1,v 1.15 2003/06/10 09:12:09 jmc Exp $
 .\" $NetBSD: audioctl.1,v 1.7 1998/04/27 16:55:23 augustss Exp $
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -82,6 +82,16 @@ Specify an alternative audio control device.
 .It Fl n
 Suppress printing of the variable name.
 .El
+.Sh ENVIRONMENT
+.Bl -tag -width AUDIOCTLDEVICE
+.It Ev AUDIOCTLDEVICE
+Audio control device to use.
+.El
+.Sh FILES
+.Bl -tag -width /dev/audioctl
+.It Pa /dev/audioctl
+default audio control device
+.El
 .Sh EXAMPLES
 To set the playing sampling rate to 11025 you can enter
 .Pp
@@ -96,16 +106,6 @@ This can be circumvented like so:
 or
 .Pp
 .Dl $ (audioctl -f /dev/stdout -w blocksize=1024; cat file.au) > /dev/audio
-.Sh ENVIRONMENT
-.Bl -tag -width AUDIOCTLDEVICE
-.It Ev AUDIOCTLDEVICE
-Audio control device to use.
-.El
-.Sh FILES
-.Bl -tag -width /dev/audioctl
-.It Pa /dev/audioctl
-default audio control device
-.El
 .Sh SEE ALSO
 .Xr mixerctl 1 ,
 .Xr audio 4 ,
diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index b3d3bf7152b..45b2cecf56e 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: awk.1,v 1.11 2003/02/18 07:51:08 jmc Exp $
+.\"	$OpenBSD: awk.1,v 1.12 2003/06/10 09:12:09 jmc Exp $
 .\" EX/EE is a Bd
 .\"
 .\" Copyright (C) Lucent Technologies 1997
 .\" All Rights Reserved
-.\" 
+.\"
 .\" Permission to use, copy, modify, and distribute this software and
 .\" its documentation for any purpose and without fee is hereby
 .\" granted, provided that the above copyright notice appear in all
@@ -13,7 +13,7 @@
 .\" its entities not be used in advertising or publicity pertaining
 .\" to distribution of the software without specific, written prior
 .\" permission.
-.\" 
+.\"
 .\" LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 .\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
 .\" IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
@@ -389,7 +389,7 @@ Patterns are arbitrary Boolean combinations
 of regular expressions and
 relational expressions.
 Regular expressions are as in
-.Xr egrep  1 .
+.Xr egrep 1 .
 Isolated regular expressions
 in a pattern apply to the entire line.
 Regular expressions may also occur in
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 31c4b2e03d5..0dec3728473 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: calendar.1,v 1.22 2003/06/03 02:56:06 millert Exp $
+.\"	$OpenBSD: calendar.1,v 1.23 2003/06/10 09:12:09 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -222,7 +222,7 @@ Russian calendar
 .Xr cpp 1 ,
 .Xr mail 1 ,
 .Xr cron 8
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The
 .Nm
 program previously selected lines which had the correct date anywhere
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index f6cd540c897..fe2e3d18468 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.26 2003/02/18 09:42:33 jmc Exp $
+.\" $OpenBSD: cdio.1,v 1.27 2003/06/10 09:12:09 jmc Exp $
 .\"
 .\" Copyright (c) 1995 Serge V. Vakulenko
 .\" All rights reserved.
@@ -199,11 +199,6 @@ Quit the program.
 .It Pa /dev/rcd0c
 .It Pa /dev/rmcd0c
 .El
-.Sh AUTHORS
-Jean-Marc Zucconi,
-Andrey A.\ Chernov,
-Serge V.\ Vakulenko,
-Marc Espie
 .Sh HISTORY
 The
 .Nm
@@ -211,3 +206,8 @@ command is based on
 .Nm cdcontrol ,
 which first appeared in
 .Fx 2.1 .
+.Sh AUTHORS
+Jean-Marc Zucconi,
+Andrey A. Chernov,
+Serge V. Vakulenko,
+Marc Espie
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index dc73001ecc8..a375d661c8e 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chpass.1,v 1.28 2003/06/03 02:56:06 millert Exp $
+.\"	$OpenBSD: chpass.1,v 1.29 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
 .\"
 .\" Copyright (c) 1988, 1990, 1993
@@ -177,7 +177,7 @@ field specifies a key in the
 database of login class attributes.
 If empty, the
 .Dq default
-record is used. 
+record is used.
 .Pp
 The user's
 .Ar home directory
@@ -211,6 +211,30 @@ Once the information has been verified,
 uses
 .Xr pwd_mkdb 8
 to update the user database.
+.Sh ENVIRONMENT
+The
+.Xr vi 1
+editor will be used unless the environment variable
+.Ev EDITOR
+is set to
+an alternate editor.
+When the editor terminates, the information is re-read and used to
+update the user database itself.
+Only the user, or the superuser, may edit the information associated
+with the user.
+.Sh FILES
+.Bl -tag -width /var/tmp/pw.XXXXXXXX -compact
+.It Pa /etc/master.passwd
+user database
+.It Pa /etc/passwd
+a Version 7 format password file
+.It Pa /etc/ptmp
+lock file for the passwd database
+.It Pa /etc/shells
+list of approved shells
+.It Pa /var/tmp/pw.XXXXXXXX
+temporary copy of the user passwd information
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "Attempting lock password file, please wait or press ^C to abort"
@@ -237,30 +261,6 @@ If no process is listed, it is safe to remove the
 .Pa /etc/ptmp
 file to clear the error.
 .El
-.Sh ENVIRONMENT
-The
-.Xr vi 1
-editor will be used unless the environment variable
-.Ev EDITOR
-is set to
-an alternate editor.
-When the editor terminates, the information is re-read and used to
-update the user database itself.
-Only the user, or the superuser, may edit the information associated
-with the user.
-.Sh FILES
-.Bl -tag -width /var/tmp/pw.XXXXXXXX -compact
-.It Pa /etc/master.passwd
-user database
-.It Pa /etc/passwd
-a Version 7 format password file
-.It Pa /etc/ptmp
-lock file for the passwd database
-.It Pa /etc/shells
-list of approved shells
-.It Pa /var/tmp/pw.XXXXXXXX
-temporary copy of the user passwd information
-.El
 .Sh SEE ALSO
 .Xr finger 1 ,
 .Xr login 1 ,
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index e751b75051a..4ba290dd7de 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cksum.1,v 1.15 2003/06/03 02:56:06 millert Exp $
+.\"	$OpenBSD: cksum.1,v 1.16 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: cksum.1,v 1.8 1995/09/02 05:45:15 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -73,11 +73,11 @@ Use historic algorithms instead of the (superior) default one.
 Algorithm 1 is the algorithm used by historic
 .Bx
 systems as the
-.Xr sum 1
+.Nm sum
 algorithm and by historic
 .At V
 systems as the
-.Xr sum
+.Nm sum
 algorithm when using the
 .Fl r
 option.
@@ -88,7 +88,7 @@ Algorithm 2 is the algorithm used by historic
 .At V
 systems as the
 default
-.Xr sum
+.Nm sum
 algorithm.
 This is a 32-bit checksum, and is defined as follows:
 .Bd -unfilled -offset indent
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 1643a6ef270..7f503a2b006 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: column.1,v 1.9 2003/06/03 02:56:07 millert Exp $
+.\"	$OpenBSD: column.1,v 1.10 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: column.1,v 1.3 1995/03/26 09:08:28 glass Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -76,8 +76,6 @@ Fill columns before filling rows.
 The
 .Nm
 utility exits 0 on success or >0 if an error occurred.
-.Sh EXAMPLES
-.Dl (printf \&"PERM\ LINKS\ OWNER\ GROUP\ SIZE\ MONTH\ DAY\ HH:MM/YEAR\ NAME\en\&"\ \&; ls -l\ \&| sed 1d) \&| column -t
 .Sh ENVIRONMENT
 .Bl -tag -width COLUMNS
 .It Ev COLUMNS
@@ -86,6 +84,8 @@ The environment variable
 is used to determine the size of
 the screen if no other information is available.
 .El
+.Sh EXAMPLES
+.Dl (printf \&"PERM\ LINKS\ OWNER\ GROUP\ SIZE\ MONTH\ DAY\ HH:MM/YEAR\ NAME\en\&"\ \&; ls -l\ \&| sed 1d) \&| column -t
 .Sh SEE ALSO
 .Xr colrm 1 ,
 .Xr ls 1 ,
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 09f55e175be..285ff8f78c0 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: compress.1,v 1.16 2003/06/03 02:56:07 millert Exp $
+.\"	$OpenBSD: compress.1,v 1.17 2003/06/10 09:12:09 jmc Exp $
 .\"	$NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
 .\"
 .\" Copyright (c) 1986, 1990, 1993
@@ -64,16 +64,16 @@ reduces the size of the named files using adaptive Lempel-Ziv coding.
 Each
 .Ar file
 is renamed to the same name plus the extension
-.Dq .Z , 
+.Dq .Z ,
 or
-.Dq .gz 
+.Dq .gz
 (in deflate mode).
 As many of the modification time, access time, file flags, file mode,
 user ID, and group ID as allowed by permissions are retained in the
 new file.
 If compression would not reduce the size of a
 .Ar file ,
-the file is ignored (unless 
+the file is ignored (unless
 .Fl f
 is used).
 .Pp
@@ -116,7 +116,7 @@ Specify the
 code limit (see below).
 .It Fl c
 Compressed or uncompressed output is written to the standard output.
-No files are modified (force 
+No files are modified (force
 .Nm zcat
 mode).
 .It Fl d
@@ -130,7 +130,7 @@ even if it is not actually reduced in size.
 Additionally, files are overwritten without prompting for confirmation.
 .It Fl g
 Use deflate scheme which reportedly provides better compression rates (force
-.Nm gzip 
+.Nm gzip
 mode).
 .It Fl 1...9
 Use deflate scheme with compression factor of one to nine.
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 8057e5d4d75..6396c469b55 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctags.1,v 1.12 2003/06/03 02:56:07 millert Exp $
+.\"	$OpenBSD: ctags.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -170,15 +170,15 @@ of the second section of the yacc file, and
 .Ar yylex
 is the start of
 the second section of the lex file.
-.Sh DIAGNOSTICS
-.Nm
-exits with a value of 1 if an error occurred, 0 otherwise.
-Duplicate objects are not considered errors.
 .Sh FILES
 .Bl -tag -width tags -compact
 .It Pa tags
 default output tags file
 .El
+.Sh DIAGNOSTICS
+.Nm
+exits with a value of 1 if an error occurred, 0 otherwise.
+Duplicate objects are not considered errors.
 .Sh SEE ALSO
 .Xr ex 1 ,
 .Xr vi 1
diff --git a/usr.bin/deroff/deroff.1 b/usr.bin/deroff/deroff.1
index 24cf62e6efe..22fa83118c3 100644
--- a/usr.bin/deroff/deroff.1
+++ b/usr.bin/deroff/deroff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: deroff.1,v 1.4 2003/06/03 02:56:07 millert Exp $
+.\" $OpenBSD: deroff.1,v 1.5 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -111,23 +111,23 @@ The
 option takes the following arguments:
 .Bl -tag -width Ds
 .It a
-recognize 
+recognize
 .Xr man 7
 macros.
 .It e
-recognize 
+recognize
 .Xr me 7
 macros.
 .It m
-recognize 
+recognize
 .Xr me 7
 macros.
 .It s
-recognize 
+recognize
 .Xr me 7
 macros.
 .It l
-recognize 
+recognize
 .Xr mm 7
 macros and delete
 .Xr mm 7
@@ -148,12 +148,13 @@ Normally, the output follows the original, with the deletions mentioned above.
 .Sh SEE ALSO
 .Xr eqn 1 ,
 .Xr nroff 1 ,
-.Xr troff 1 ,
 .Xr pic 1 ,
-.Xr tbl 1
+.Xr tbl 1 ,
+.Xr troff 1
 .Sh HISTORY
 .Nm
-appeared in Version 7 AT&T Unix.
+appeared in
+.At v7 .
 .Sh BUGS
 .Nm
 is not a complete
diff --git a/usr.bin/elf2olf/elf2olf.1 b/usr.bin/elf2olf/elf2olf.1
index 8626a8000ec..eb8d65e87a5 100644
--- a/usr.bin/elf2olf/elf2olf.1
+++ b/usr.bin/elf2olf/elf2olf.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: elf2olf.1,v 1.12 2003/04/01 10:28:01 jmc Exp $
+.\"	$OpenBSD: elf2olf.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1996, 1997 Erik Theisen.
 .\"	All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"     @(#)$Id: elf2olf.1,v 1.12 2003/04/01 10:28:01 jmc Exp $
+.\"     @(#)$Id: elf2olf.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
 .\"
 .Dd May 5, 1997
 .Dt ELF2OLF 1
@@ -90,8 +90,6 @@ The
 and
 .Nm olf2elf
 utilities exit 0 on success or >0 if an error occurred.
-.Sh AUTHORS
-Erik Theisen
 .Sh HISTORY
 The
 .Nm elf2olf
@@ -99,6 +97,8 @@ and
 .Nm olf2elf
 utilities first appeared in
 .Ox 2.1 .
+.Sh AUTHORS
+Erik Theisen
 .Sh BUGS
 The
 .Em ELF
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 8eb1262301d..e8403ddd167 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: env.1,v 1.9 2003/06/03 02:56:07 millert Exp $
+.\"	$OpenBSD: env.1,v 1.10 2003/06/10 09:12:10 jmc Exp $
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -93,7 +93,7 @@ The
 utility completed successfully.
 .It 1-125
 The exit code returned from the
-.Ar utility.
+.Ar utility .
 .It 126
 The utility specified by
 .Ar utility
@@ -106,11 +106,11 @@ could not be found.
 .Sh SEE ALSO
 .Xr execvp 3 ,
 .Xr environ 7
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The historic
 .Fl
 option has been deprecated but is still supported in this implementation.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility conforms to
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index a07518dad40..e1bd63645f5 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: error.1,v 1.17 2003/06/03 02:56:07 millert Exp $
+.\"	$OpenBSD: error.1,v 1.18 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: error.1,v 1.3 1995/09/02 06:15:20 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -279,13 +279,13 @@ error messages
 .It Pa /dev/tty
 user's teletype
 .El
-.Sh AUTHORS
-Robert Henry
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.0 .
+.Sh AUTHORS
+Robert Henry
 .Sh BUGS
 Opens the teletype directly to do user querying.
 .Pp
diff --git a/usr.bin/fgen/fgen.1 b/usr.bin/fgen/fgen.1
index 3c8d8a44a9d..1d3540bdafb 100644
--- a/usr.bin/fgen/fgen.1
+++ b/usr.bin/fgen/fgen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fgen.1,v 1.1 2001/08/17 21:31:02 jason Exp $
+.\"	$OpenBSD: fgen.1,v 1.2 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: fgen.1,v 1.6 2001/06/13 10:46:05 wiz Exp $
 .\"
 .\" Copyright (c) 1998 Eduardo Horvath, All Rights Reserved.
@@ -56,9 +56,10 @@ Reads Forth source and generates tokenized FCode object file.
 .\" .Sh STANDARDS
 .\" .Sh HISTORY
 .Sh AUTHORS
-Written by Eduardo E. Horvath <eeh@one-o.com>
+Written by
+.An Eduardo E. Horvath Aq eeh@one-o.com
 .Sh BUGS
-String escape sequences are not recognized so things such as 
+String escape sequences are not recognized so things such as
 .Pp
 .Li \&" foo \&"\&(01 02\&) \&"n \&"
 .Pp
@@ -66,8 +67,8 @@ will result in the string
 .Pp
 .Dq  foo \&"\&(01 02\&) \&"n .
 .Pp
-Hexadecimal numbers with dots in them such as 
-.Li 100.0000 
+Hexadecimal numbers with dots in them such as
+.Li 100.0000
 are not parsed.
 .Pp
 Permissions on the output file are often incorrect.
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 6c86aeda1c3..1e90d5fae04 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,10 +1,10 @@
-.\" $OpenBSD: file.1,v 1.19 2003/03/11 21:26:26 ian Exp $
+.\" $OpenBSD: file.1,v 1.20 2003/06/10 09:12:10 jmc Exp $
 .\" $FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp $
 .\"
 .\" Copyright (c) Ian F. Darwin 1986-1995.
 .\" Software written by Ian F. Darwin and others;
 .\" maintained 1995-present by Christos Zoulas and others.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -19,7 +19,7 @@
 .\"    This product includes software developed by Ian F. Darwin and others.
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission.
-.\"  
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -227,7 +227,7 @@ in an existing magic file would have to be changed to
 0       string          \e\ebegindata   Andrew Toolkit document
 .Pp
 SunOS releases 3.2 and later from Sun Microsystems include a
-.Xr file 1
+.Nm file
 command derived from the System V one, but with some extensions.
 My version differs from Sun's only in minor ways.
 It includes the extension of the
@@ -401,7 +401,7 @@ of
 .Dq how good
 a guess is.
 We end up removing guesses (e.g.,
-.Dq From\ 
+.Dq From\ \&
 as first 5 chars of file) because
 they are not as good as other guesses (e.g.,
 .Dq Newsgroups:
@@ -420,4 +420,4 @@ You can obtain the original author's latest version by anonymous FTP
 on
 .Em ftp.astron.com
 in the directory
-.Pa /pub/file/file-X.YY.tar.gz
+.Pa /pub/file/file-X.YY.tar.gz .
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index b8d410a003c..40e9dfb6de1 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: magic.5,v 1.8 2003/03/11 21:26:26 ian Exp $
+.\" $OpenBSD: magic.5,v 1.9 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" @(#)$FreeBSD: src/usr.bin/file/magic.5,v 1.11 2000/03/01 12:19:39 sheldonh Exp $
 .\"
@@ -7,7 +7,7 @@
 .\" Copyright (c) Ian F. Darwin 1986-1995.
 .\" Software written by Ian F. Darwin and others;
 .\" maintained 1995-present by Christos Zoulas and others.
-.\" 
+.\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
@@ -22,7 +22,7 @@
 .\"    This product includes software developed by Ian F. Darwin and others.
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission.
-.\"  
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -240,6 +240,12 @@ test beginning with
 Such a relative offset is specified using
 .Ql &
 as a prefix to the offset.
+.Sh FILES
+.Bl -tag -width /etc/magic
+.It Pa /etc/magic
+.El
+.Sh SEE ALSO
+.Xr file 1
 .Sh BUGS
 The formats
 .Li long ,
@@ -259,12 +265,6 @@ a system on which the lengths are invariant.
 .Pp
 There is (currently) no support for specified-endian data to be used in
 indirect offsets.
-.Sh FILES
-.Bl -tag -width /etc/magic
-.It Pa /etc/magic
-.El
-.Sh SEE ALSO
-.Xr file 1
 .\"
 .\" From: guy@sun.uucp (Guy Harris)
 .\" Newsgroups: net.bugs.usg
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index 213be3f8bb0..a3e3566cf2a 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.16 2003/06/03 02:56:08 millert Exp $
+.\" $OpenBSD: fmt.1,v 1.17 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -97,7 +97,7 @@ Normally,
 .Nm
 does not fill these lines, for compatibility with
 .Xr troff 1
-and 
+and
 .Xr nroff 1 .
 .It Fl p
 Allow indented paragraphs.
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index e4ce47c398c..b229ca32009 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fsplit.1,v 1.11 2003/06/03 02:56:08 millert Exp $
+.\"	$OpenBSD: fsplit.1,v 1.12 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: fsplit.1,v 1.3 1995/09/28 05:15:06 perry Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -89,13 +89,13 @@ If names specified via the
 .Fl e
 option are not found, a diagnostic is written to
 standard error.
-.Sh AUTHORS
-Asa Romberger and Jerry Berkman
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 4.2 .
+.Sh AUTHORS
+Asa Romberger and Jerry Berkman
 .Sh BUGS
 .Nm
 assumes the subprogram name is on the first noncomment line of the subprogram
diff --git a/usr.bin/grep/grep.1 b/usr.bin/grep/grep.1
index 3e8af4e6410..6713a560f12 100644
--- a/usr.bin/grep/grep.1
+++ b/usr.bin/grep/grep.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: grep.1,v 1.4 2003/04/25 14:53:03 jmc Exp $
+.\"	$OpenBSD: grep.1,v 1.5 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Carson Harding. All rights reserved.
 .\" This code was written and contributed to OpenBSD by Carson Harding.
@@ -11,7 +11,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. Neither the name of the author, or the names of contributors may be 
+.\" 3. Neither the name of the author, or the names of contributors may be
 .\"    used to endorse or promote products derived from this software without
 .\"    specific prior written permission.
 .\"
@@ -35,6 +35,7 @@
 .Nd print lines matching a pattern
 .Sh SYNOPSIS
 .Nm grep
+.Bk -words
 .Op Fl E | Fl F
 .Op Fl bchilnqsvwxz
 .Oo
@@ -46,14 +47,16 @@
 .Op Ar pattern
 .Op Ar file
 .Ar ...
+.Ek
 .Sh DESCRIPTION
 The
 .Nm
-utility searches for lines that contain the specified pattern 
-or patterns. By default
+utility searches for lines that contain the specified pattern
+or patterns.
+By default
 .Nm
-prints lines containing matches to the standard output. If no input files
-are specified,
+prints lines containing matches to the standard output.
+If no input files are specified,
 .Nm
 expects to read its input from the standard input.
 .Pp
@@ -68,39 +71,40 @@ is equivalent to
 .Pp
 The patterns are regular expressions, or in the case of
 .Nm fgrep ,
-fixed strings. More than one pattern may be specified on the 
-command-line, either by repeated use of the
+fixed strings.
+More than one pattern may be specified on the command-line,
+either by repeated use of the
 .Fl e
 flag, or by separating patterns with newlines:
-
-.Nm grep 
-\'Ishmael
- Ahab' mobydick.txt
-
+.Pp
+.Bd -literal -offset indent
+grep \'Ishmael
+Ahab' mobydick.txt
+.Ed
+.Pp
 is the same as:
-
-.Nm
--e Ishmael -e Ahab mobydick.txt
-
+.Pp
+.Dl grep -e Ishmael -e Ahab mobydick.txt
+.Pp
 Note that many regular expression special characters also have special
-meaning to the shell. It is best to enclose the regular expression 
-in quotation marks. Note also that a null pattern ("" or a newline alone)
-matches all input.
+meaning to the shell.
+It is best to enclose the regular expression in quotation marks.
+Note also that a null pattern ("" or a newline alone) matches all input.
 .Sh OPTIONS
-.Pp
 The options available are:
 .Bl -tag -width file Ds
 .It Fl E
 Use extended regular expressions, as if the program was invoked as
-.Nm egrep.
+.Nm egrep .
 .It Fl F
 Patterns are fixed strings, not regular expressions, as if the
 program was invoked as
-.Nm fgrep.
+.Nm fgrep .
 .It Fl a
-Does nothing. In other greps this flag tells grep to treat the input
-as ASCII and turns off attempts to determine whether the input file is a 
-binary file. This
+Does nothing.
+In other greps this flag tells grep to treat the input as ASCII and turns off
+attempts to determine whether the input file is a binary file.
+This
 .Nm grep
 does not (yet) do that check, so behaves as if
 .Fl a
@@ -110,9 +114,9 @@ Prepend the byte-offset of the beginning of the line containing the match.
 .It Fl c
 Print only a count of the matches found.
 .It Fl e Ar pattern_list
-The argument to 
+The argument to
 .Fl e
-is a list of patterns to search for. 
+is a list of patterns to search for.
 .Fl e
 may be used multiple times, each instance of which may have
 one or more patterns separated by new-lines.
@@ -133,46 +137,52 @@ If the input is the standard input,
 .Nm
 prints "(standard input)".
 .It Fl n
-Prefix matching lines with their line number in the file in which 
+Prefix matching lines with their line number in the file in which
 they occur.
 .It Fl q
 Be quiet about errors accessing files, only return program status.
 The status returned is 0 if there was a match, 1 if there were no
-matches, even if there were errors accessing files. (Without the
+matches, even if there were errors accessing files.
+(Without the
 .Fl q
-flag, if there was an error 
-accessing a file 
+flag, if there was an error
+accessing a file
 .Nm
 would return a status of 2 even
 if it found matches.)
 .It Fl s
-Suppress errors about accessing files. Note that unlike
+Suppress errors about accessing files.
+Note that unlike
 .Fl q
 the program is not quiet: matches are still output.
 .It Fl v
 Invert the sense of the match: return all lines that do not
 contain the pattern.
 .It Fl w
-The pattern is considered a word. A matching pattern in a line must not
-be immediately bordered by a letter, a number, or an underscore ('_').
+The pattern is considered a word.
+A matching pattern in a line must not be immediately bordered by a letter,
+a number, or an underscore ('_').
 .It Fl x
-Match the line exactly. If a regular expression (invoked as
+Match the line exactly.
+If a regular expression (invoked as
 .Nm grep ,
 or
 .Nm egrep )
 the pattern must match the whole line (as if
-the pattern was enclosed in ^ and $). If invoked as
-.Nm fgrep,
+the pattern was enclosed in ^ and $).
+If invoked as
+.Nm fgrep ,
 the string must match the entire line.
 .It Fl z
 When the
 .Fl l
 flag is also specified, print an ASCII NUL character (0) following
-the file name, rather than a newline. Like the 
+the file name, rather than a newline.
+Like the
 .Fl print0
 option to
 .Nm find ,
-this may be used to pass file names containing unusual characters 
+this may be used to pass file names containing unusual characters
 to programs such as
 .Nm xargs
 with the
@@ -180,40 +190,38 @@ with the
 flag.
 .El
 .Sh FILESYSTEM TRAVERSAL OPTIONS
-.Pp
 The following options control recursive searchs:
 .Bl -tag -width file Ds
 .It Fl R
 Recursively descend through any specified directory arguments.
 .It Fl H
-If the 
-.Fl R 
+If the
+.Fl R
 option is also specified, symbolic links on the command
-line are followed.  (Symbolic links encountered in the tree
-traversal are not followed.)
+line are followed.
+(Symbolic links encountered in the tree traversal are not followed.)
 .It Fl L
 If the
 .Fl R
 option is also specified, all symbolic links are followed.
 .It Fl P
-If the 
+If the
 .Fl R
 option is also specified, no symbolic links are followed.
 .It Fl X
-If the 
-.Fl R 
+If the
+.Fl R
 option is also specified, searches are confined to the device on
 which the search started (file system mount points are not crossed).
 .El
 .Sh EXAMPLES
-.Pp
 To print all occurrences of the word Ishmael in mobydick.txt:
 .Dl grep Ishmael mobydick.txt
 .Pp
 To merely count all the lines in which the word Ishmael occurs:
 .Dl grep -c Ishmael mobydick.txt
 .Pp
-To print all occurrences of either of the words Ishmael or Ahab in 
+To print all occurrences of either of the words Ishmael or Ahab in
 mobydick.txt:
 .Dl grep 'Ishmael|Ahab' mobydick.txt
 .Pp
@@ -225,7 +233,6 @@ of a compound:
 To find all the empty lines and print the line numbers for where they occur:
 .Dl grep -nv \&. mobydick.txt
 .Sh DIAGNOSTICS
-.Pp
 The
 .Nm
 utility exits with one of the following values:
@@ -240,11 +247,12 @@ An error occurred (whether or not matches were found).
 .El
 .Pp
 Note that when the
-.Fl q 
-flag is used, file access errors do not cause an exit value of 2, 
+.Fl q
+flag is used, file access errors do not cause an exit value of 2,
 and in the absence of other errors (a bad regular expression)
 the exit value is determined only by whether or not matches
-were found. (XX Should -s do the same??)
+were found.
+(XX Should -s do the same??)
 .Sh SEE ALSO
 .Xr regex 3 ,
 .Xr re_format 7
@@ -253,8 +261,8 @@ A
 .Nm grep
 command appeared in
 .At v6 .
-This version is a re-implementation from the POSIX specification and 
-inspection of the operation of several implementations of 
+This version is a re-implementation from the POSIX specification and
+inspection of the operation of several implementations of
 .Nm grep .
 .Sh NOTES
 .Nm grep
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 0611fe58753..3215e2bb05f 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: head.1,v 1.11 2003/06/03 02:56:09 millert Exp $
+.\"	$OpenBSD: head.1,v 1.12 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -93,9 +93,9 @@ in the following way to, for example, display only line 500 from the file
 .Xr less 1 ,
 .Xr more 1 ,
 .Xr tail 1
-.Sh COMPATIBILITY
-The historic command line syntax is supported by this implementation.
 .Sh STANDARDS
+The historic command line syntax is supported by this implementation.
+.Pp
 The
 .Nm
 utility conforms to
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 990000bbcf6..ec63c123005 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -1,4 +1,4 @@
-.\"  $OpenBSD: od.1,v 1.11 2003/01/06 09:04:30 deraadt Exp $
+.\"  $OpenBSD: od.1,v 1.12 2003/06/10 09:12:10 jmc Exp $
 .\"  $NetBSD: od.1,v 1.16 2001/12/07 01:23:42 bjh21 Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -89,8 +89,8 @@ The options are as follows:
 .Em One-byte character display .
 Display the input offset in octal, followed by sixteen
 space-separated, three column, space-filled, characters of input data
-per line.  Control characters are printed as their names instead of as
-C-style escapes.
+per line.
+Control characters are printed as their names instead of as C-style escapes.
 .It Fl B
 Same as
 .Fl o .
@@ -98,14 +98,15 @@ Same as
 .Em One-byte octal display .
 Display the input offset in octal, followed by sixteen
 space-separated, three column, zero-filled, bytes of input data, in
-octal, per line.  This is the default output style if no other is
-selected.
+octal, per line.
+This is the default output style if no other is selected.
 .It Fl c
 .Em One-byte character display .
 Display the input offset in octal, followed by sixteen
 space-separated, three column, space-filled, characters of input data
-per line.  Control characters are printed as c style escapes, or as
-three octal digits, if no c escape exists for the character.
+per line.
+Control characters are printed as c style escapes, or as three octal digits,
+if no c escape exists for the character.
 .It Fl d
 .Em Two-byte decimal display .
 Display the input offset in octal, followed by eight
@@ -195,26 +196,31 @@ Display the input offset in octal, followed by eight
 space-separated, six column, zero-filled, two-byte units
 of input data, in octal, per line.
 .It Fl t Ar type_string
-Specify one or more output types.  The
+Specify one or more output types.
+The
 .Em type_string
 option-argument must be a string specifying the types to be used when
-writing the input data.  The string must consist of the type
-specification characters:
+writing the input data.
+The string must consist of the type specification characters:
 .Pp
 .Cm a
 selects US-ASCII output, with control characters replaced with their
-names instead of as c escape sequences.  See also the
+names instead of as c escape sequences.
+See also the
 .Cm _u
-conversion provided by hexdump(1).
+conversion provided by
+.Xr hexdump 1 .
 .Pp
 .Cm c
-selects a standard character based conversion.  See also the
+selects a standard character based conversion.
+See also the
 .Cm _c
-conversion provided by hexdump(1).
+conversion provided by
+.Xr hexdump 1 .
 .Pp
 .Cm f
-selects the floating point output format.  This type character can be
-optionally followed by the characters
+selects the floating point output format.
+This type character can be optionally followed by the characters
 .Cm 4
 or
 .Cm F
@@ -222,10 +228,12 @@ to specify four byte floating point output, or
 .Cm 8
 or
 .Cm L
-to specify eight byte floating point output.  The default output
-format is eight byte floats.  See also the
+to specify eight byte floating point output.
+The default output format is eight byte floats.
+See also the
 .Cm e
-conversion provided by hexdump(1).
+conversion provided by
+.Xr hexdump 1 .
 .Pp
 .Cm d ,
 .Cm o ,
@@ -257,14 +265,16 @@ to specify two-byte output,
 .Cm 4
 to specify four-byte output, or
 .Cm 8
-to specify eight-byte output.  The default output format is in
-four-byte quantities.  See also the
+to specify eight-byte output.
+The default output format is in four-byte quantities.
+See also the
 .Cm d ,
 .Cm o ,
 .Cm u ,
 and
 .Cm x
-conversions provided by hexdump(1).
+conversions provided by
+.Xr hexdump 1 .
 .\"(a|c|f[FLD]?|[doux][C1S2I4L8]?)*
 .It Fl v
 The
@@ -289,8 +299,9 @@ Same as
 For each input file,
 .Nm
 sequentially copies the input to standard output, transforming the
-data according to the options given.  If no options are specified, the
-default display is equivalent to specifying the
+data according to the options given.
+If no options are specified, the default display is equivalent to
+specifying the
 .Fl o
 option.
 .Pp
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index d8ec47189a3..384f127a6a9 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: indent.1,v 1.11 2001/05/01 17:58:03 aaron Exp $
+.\"	$OpenBSD: indent.1,v 1.12 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.
@@ -420,7 +420,6 @@ defaults.
 Switches on the command line, though, always override profile
 switches.
 The switches should be separated by spaces, tabs or newlines.
-.Pp
 .Ss Comments
 .Sq Em Box
 .Em comments .
@@ -444,7 +443,6 @@ All other comments are treated as straight text.
 fits as many words (separated by blanks, tabs, or newlines) on a
 line as possible.
 Blank lines break paragraphs.
-.Pp
 .Ss Comment indentation
 If a comment is on a line with code it is started in the
 .Dq comment column ,
@@ -461,7 +459,6 @@ command line parameter.
 If the code on a line extends past the comment
 column, the comment starts further to the right, and the right margin may be
 automatically extended in extreme cases.
-.Pp
 .Ss Preprocessor lines
 In general,
 .Nm
@@ -475,7 +472,6 @@ is recognized and
 .Nm
 attempts to correctly
 compensate for the syntactic peculiarities introduced.
-.Pp
 .Ss C syntax
 .Nm
 understands a substantial amount about the syntax of C, but it
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 686364c4e0a..69e96e358af 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipcs.1,v 1.15 2003/06/04 16:24:45 deraadt Exp $
+.\"	$OpenBSD: ipcs.1,v 1.16 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1994 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -129,7 +129,7 @@ is not guaranteed to be consistent.
 .Sh SEE ALSO
 .Xr ipcrm 1
 .Sh AUTHORS
-Thorsten Lockert <tholo@sigmasoft.com>
+.An Thorsten Lockert Aq tholo@sigmasoft.com
 .Sh BUGS
 This manual page is woefully incomplete, because it does not
 at all attempt to explain the information printed by
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 9f8db78f5d3..6bcde745dae 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: join.1,v 1.12 2003/06/03 02:56:09 millert Exp $
+.\"	$OpenBSD: join.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -92,7 +92,7 @@ line in file
 (The argument to
 .Fl a
 must not be preceded by a space; see the
-.Sx COMPATIBILITY
+.Sx STANDARDS
 section.)
 .It Fl e Ar string
 Replace empty output fields with
@@ -153,7 +153,7 @@ may not report all field matches.
 When the field delimiter characters are specified by the
 .Fl t
 option, the collating sequence should be the same as
-.Xr sort
+.Xr sort 1
 without the
 .Fl b
 option.
@@ -177,7 +177,7 @@ utility exits 0 on success or >0 if an error occurred.
 .Xr paste 1 ,
 .Xr sort 1 ,
 .Xr uniq 1
-.Sh COMPATIBILITY
+.Sh STANDARDS
 For compatibility with historic versions of
 .Nm join ,
 the following options are available:
@@ -218,7 +218,7 @@ This has obvious difficulties in the presence of files named
 .Pp
 These options are available only so historic shell scripts don't require
 modification and should not be used.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 command is expected to be
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 730d0411d7e..1c710e139c5 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: jot.1,v 1.9 2003/06/03 02:56:09 millert Exp $
+.\"	$OpenBSD: jot.1,v 1.10 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: jot.1,v 1.2 1994/11/14 20:27:36 jtc Exp $
 .\"
 .\" Copyright (c) 1993
@@ -192,4 +192,4 @@ and to print all lines 80 characters or longer,
 .Xr rs 1 ,
 .Xr yes 1 ,
 .Xr printf 3 ,
-.Xr random 3 ,
+.Xr random 3
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 66c6bbaf1de..0b426d7f4b8 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kdump.1,v 1.10 2003/06/03 02:56:09 millert Exp $
+.\"	$OpenBSD: kdump.1,v 1.11 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -102,7 +102,7 @@ Selects which tracepoints to display. See the
 .Fl t
 option of
 .Xr ktrace 1
-for the definitions of the flags. 
+for the definitions of the flags.
 .El
 .Sh FILES
 .Bl -tag -width ktrace.out -compact
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 34418b5c41e..ecaa40b5ed9 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ktrace.1,v 1.12 2003/06/03 02:56:09 millert Exp $
+.\"	$OpenBSD: ktrace.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -104,12 +104,12 @@ flag is permitted).
 .It Fl t Ar trstr
 The string argument represents the kernel trace points, one per letter.
 The default flags are
-.Cm c Ns ,
-.Cm e Ns ,
-.Cm i Ns ,
-.Cm n Ns ,
+.Cm c ,
+.Cm e ,
+.Cm i ,
+.Cm n ,
 and
-.Cm s Ns .
+.Cm s .
 The following table equates the letters with the tracepoints:
 .Pp
 .Bl -tag -width flag -compact
@@ -124,7 +124,7 @@ trace
 trace namei translations
 .It Cm s
 trace signal processing
-.It Cm w 
+.It Cm w
 trace context switch points
 .El
 .It Ar command
@@ -139,6 +139,11 @@ The
 and
 .Ar command
 options are mutually exclusive.
+.Sh FILES
+.Bl -tag -width ktrace.out -compact
+.It Pa ktrace.out
+default ktrace dump file
+.El
 .Sh EXAMPLES
 # trace all kernel operations of process id 34
 .Dl $ ktrace -p 34
@@ -168,11 +173,6 @@ on process 67
 .Pp
 # disable tracing of all processes owned by the user
 .Dl $ ktrace -C
-.Sh FILES
-.Bl -tag -width ktrace.out -compact
-.It Pa ktrace.out
-default ktrace dump file
-.El
 .Sh SEE ALSO
 .Xr kdump 1
 .Sh HISTORY
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 8b18c2b29c3..5f94ed3e7d0 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lastcomm.1,v 1.14 2003/06/03 02:56:09 millert Exp $
+.\"	$OpenBSD: lastcomm.1,v 1.15 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: lastcomm.1,v 1.5 1995/10/22 01:43:41 ghudson Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -105,7 +105,7 @@ executed by the superuser,
 .Sq F
 indicates the command ran after
 a fork, but without a following
-.Xr exec ,
+.Xr exec 3 ,
 .Sq C
 indicates the command was run in PDP-11 compatibility mode
 (VAX only),
diff --git a/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index cf2749e95e8..34f0db9fce7 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: leave.1,v 1.11 2003/06/03 02:56:09 millert Exp $
+.\"	$OpenBSD: leave.1,v 1.12 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: leave.1,v 1.5 1995/08/31 22:32:10 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -66,7 +66,7 @@ is a time in
 hours (on a 12 or 24 hour clock), and
 .Ar mm
 in minutes.
-In ambiguous cases, times are converted to a 12 hour clock, 
+In ambiguous cases, times are converted to a 12 hour clock,
 and assumed to be in the next 12 hours.
 .It Cm \&+
 If the time is preceded by
diff --git a/usr.bin/less/less.1 b/usr.bin/less/less.1
index 9c788333113..3afbff3a524 100644
--- a/usr.bin/less/less.1
+++ b/usr.bin/less/less.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: less.1,v 1.2 2003/05/08 09:17:56 jmc Exp $
+.\"	$OpenBSD: less.1,v 1.3 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (C) 2002  Mark Nudelman
 .\"
@@ -1562,7 +1562,7 @@ Filename completion (TAB, ^L).
 .El
 .Pp
 Less can also be compiled to be permanently in "secure" mode.
-.Sh ENVIRONMENT VARIABLES
+.Sh ENVIRONMENT
 Environment variables may be specified either in the system environment
 as usual, or in a
 .Xr lesskey 1
@@ -1722,8 +1722,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU General Public License for more details.
 .Sh AUTHORS
-.Pp
-Mark Nudelman <markn@greenwoodsoftware.com>
+.An Mark Nudelman Aq markn@greenwoodsoftware.com
 .br
 Send bug reports or comments to the above address or to bug-less@gnu.org.
 .br
diff --git a/usr.bin/less/lesskey.1 b/usr.bin/less/lesskey.1
index d3c78da9fd8..4ff23bf23a2 100644
--- a/usr.bin/less/lesskey.1
+++ b/usr.bin/less/lesskey.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lesskey.1,v 1.2 2003/05/08 09:17:56 jmc Exp $
+.\"	$OpenBSD: lesskey.1,v 1.3 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (C) 2000  Mark Nudelman
 .\"
@@ -395,8 +395,7 @@ along with lesskey; see the file COPYING.
 If not, write to the Free Software Foundation, 59 Temple Place,
 Suite 330, Boston, MA  02111-1307, USA.
 .Sh AUTHORS
+.An Mark Nudelman Aq markn@greenwoodsoftware.com
 .Pp
-Mark Nudelman <markn@greenwoodsoftware.com>
-.br
-Send bug reports or comments to the above address or to bug-less@gnu.org.
-
+Send bug reports or comments to the above address or to
+.Aq bug-less@gnu.org .
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 99193d701ea..89c06846d5c 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lock.1,v 1.12 2003/06/03 02:56:10 millert Exp $
+.\"	$OpenBSD: lock.1,v 1.13 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -72,7 +72,8 @@ The specified BSD Authentication login
 .Ar style
 (as specified in
 .Pa /etc/login.conf )
-will be used to authenticate the user.  If the particular
+will be used to authenticate the user.
+If the particular
 .Ar style
 requires a challenge/response handshake or a special prompt, the
 user may enter the name of the
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 01fc5fe1192..eebdeeed92b 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: login.1,v 1.21 2003/06/03 02:56:10 millert Exp $
+.\"	$OpenBSD: login.1,v 1.22 2003/06/10 09:12:10 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -60,7 +60,7 @@ To specify the alternate authentication mechanism
 the string
 .Li : Ns Va style
 is appended to the user name (i.e.,
-.Ar user Ns Li : Ns Va style Ns ).
+.Ar user Ns Li : Ns Va style ) .
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index d61a25a7d03..769bd1505db 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: look.1,v 1.9 2003/06/03 02:56:10 millert Exp $
+.\"	$OpenBSD: look.1,v 1.10 2003/06/10 09:12:10 jmc Exp $
 .\"	$NetBSD: look.1,v 1.3 1994/12/23 01:10:59 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -92,7 +92,7 @@ the dictionary
 .Sh SEE ALSO
 .Xr grep 1 ,
 .Xr sort 1
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The original manual page stated that tabs and blank characters participated
 in comparisons when the
 .Fl d
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index a654535f2ce..578f3fc7ae1 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
-.\"	@(#) $OpenBSD: m4.1,v 1.31 2003/06/03 02:56:10 millert Exp $
-.\" 
+.\"	@(#) $OpenBSD: m4.1,v 1.32 2003/06/10 09:12:10 jmc Exp $
+.\"
 .\" Copyright (c) 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -29,7 +29,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.\" 
+.\"
 .Dd January 26, 1993
 .Dt M4 1
 .Os
@@ -101,7 +101,7 @@ Add directory
 to the include path.
 .It Fl d Ar "flags"
 Set trace flags.
-.Ar flags 
+.Ar flags
 may hold the following:
 .Bl -tag -width Ds
 .It Ar a
@@ -124,13 +124,13 @@ number macro expansions.
 turn on all options.
 .El
 .Pp
-By default, trace is set to 
+By default, trace is set to
 .Qq eq .
 .It Fl o Ar filename
 Send trace output to
 .Ar filename .
 .It Fl t Ar macro
-Turn tracing on for 
+Turn tracing on for
 .Ar macro .
 .It Fl g
 Activate GNU-m4 compatibility mode.
@@ -364,10 +364,10 @@ Returns the current file's line number.
 .It Ic __file__
 Returns the current file's name.
 .El
-.Sh COMPATIBILITY
+.Sh STANDARDS
 .Nm
 follows the Single Unix 2 specification, along with a few extensions taken
-from 
+from
 .Nm gnu-m4 .
 .Pp
 The
@@ -384,14 +384,14 @@ Flags
 .Fl t
 are non-standard.
 .Pp
-The output format of tracing and of 
-.Ic dumpdef 
-are not specified in any standard, 
+The output format of tracing and of
+.Ic dumpdef
+are not specified in any standard,
 are likely to change and should not be relied upon.
-The current format of tracing is closely modelled on 
-.Nm gnu-m4 , 
+The current format of tracing is closely modelled on
+.Nm gnu-m4 ,
 to allow
-.Nm autoconf 
+.Nm autoconf
 to work.
 .Pp
 For portability, one should not use the macros
@@ -407,12 +407,16 @@ For portability, one should not use the macros
 .Ic __line__ ,
 .Ic __file__ .
 .Pp
-All built-ins do expand without arguments in many other 
+All built-ins do expand without arguments in many other
 .Nm m4 .
 .Pp
 Many other
 .Nm
 have dire size limitations with respect to buffer sizes.
 .Sh AUTHORS
-Ozan Yigit <oz@sis.yorku.ca> and Richard A. O'Keefe (ok@goanna.cs.rmit.OZ.AU).
-GNU-m4 compatibility extensions by Marc Espie <espie@cvs.openbsd.org>.
+.An Ozan Yigit Aq oz@sis.yorku.ca
+and
+.An Richard A. O'Keefe Aq ok@goanna.cs.rmit.OZ.AU .
+.Pp
+GNU-m4 compatibility extensions by
+.An Marc Espie Aq espie@cvs.openbsd.org .
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 723e7584c91..4088abbdfef 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail.1,v 1.37 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail.1,v 1.38 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -147,7 +147,6 @@ The section below,
 describes some features of
 .Nm mail
 available to help you compose your letter.
-.Pp
 .Ss Reading mail
 In normal usage,
 .Nm mail
@@ -167,7 +166,6 @@ and
 .Ic \&-
 to shift forwards and backwards, or simply enter a message number to move
 directly.
-.Pp
 .Ss Disposing of mail
 After examining a message you can
 .Ic delete
@@ -189,7 +187,6 @@ session can be aborted by giving the
 .Pq Ic x
 command.
 Deleted messages, however, will usually disappear, never to be seen again.
-.Pp
 .Ss Specifying messages
 Commands such as
 .Ic print
@@ -212,7 +209,6 @@ the last message; thus the command
 which prints the first few lines of a message could be used in
 .Ic top \&*
 to print the first few lines of all messages.
-.Pp
 .Ss Replying to or originating mail
 You can use the
 .Ic reply
@@ -238,7 +234,6 @@ to the message and allow you to escape to an editor to revise the
 message or to a shell to run some commands.
 (These options
 are given in the summary below.)
-.Pp
 .Ss Ending a mail processing session
 You can end a
 .Nm mail
@@ -252,7 +247,6 @@ file unless they have been deleted in which case they are discarded.
 Unexamined messages go back to the post office (see the
 .Fl f
 option above).
-.Pp
 .Ss Personal and system wide distribution lists
 It is also possible to create personal distribution lists so that,
 for instance, you can send mail to
@@ -286,7 +280,6 @@ are not expanded when the mail is sent,
 but any reply returned to the machine will have the system wide
 alias expanded as all mail goes through
 .Xr sendmail .
-.Pp
 .Ss Network mail (ARPA, UUCP, Berknet)
 See
 .Xr mailaddr 7
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 43b05d139f5..93457d89f7f 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.51 2003/06/03 02:56:12 millert Exp $
+.\"	$OpenBSD: make.1,v 1.52 2003/06/10 09:12:11 jmc Exp $
 .\"	$OpenPackages$
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
@@ -470,7 +470,6 @@ building
 .Pa file.o
 will execute
 .Qq cmd1 file.c .
-
 .Pp
 As an extension,
 .Nm
@@ -1265,13 +1264,16 @@ system makefile
 system makefile directory
 .IT Pa /usr/obj
 default
-.Ev MAKEOBJDIRPREFIX directory.
+.Ev MAKEOBJDIRPREFIX
+directory.
 .El
 .Sh SEE ALSO
 .Xr mkdep 1
 .Pp
-.%T "Make \- A Tutorial" .
-.Sh COMPATIBILITY
+.Rs
+.%T Make \- A Tutorial
+.Re
+.Sh STANDARDS
 .Nm
 mostly conforms to the Single Unix Specification, Version 2,
 with some noted extensions and a few problems.
diff --git a/usr.bin/man/help.1 b/usr.bin/man/help.1
index 10e39ed7309..a2470a6d4bf 100644
--- a/usr.bin/man/help.1
+++ b/usr.bin/man/help.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: help.1,v 1.5 2003/06/04 19:36:33 deraadt Exp $
+.\"	$OpenBSD: help.1,v 1.6 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1999 Aaron Campbell
 .\" All rights reserved.
@@ -171,6 +171,7 @@ the command line.
 .Xr whereis 1 ,
 .Xr afterboot 8
 .Sh HISTORY
-This manual page was written by Aaron Campbell <aaron@openbsd.org> and first
-appeared in
+This manual page was written by
+.An Aaron Campbell Aq aaron@openbsd.org
+and first appeared in
 .Ox 2.6 .
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index 8014040a11a..c2cbb2712c3 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.9 2003/06/03 02:56:12 millert Exp $
+.\"	$OpenBSD: man.conf.5,v 1.10 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -135,6 +135,11 @@ be listed per line, as well.
 .Pp
 Empty lines or lines whose first non-whitespace character is a hash
 mark (``#'') are ignored.
+.Sh FILES
+.Bl -tag -width /etc/man.conf -compact
+.It Pa /etc/man.conf
+standard manual directory search path
+.El
 .Sh EXAMPLES
 Given the following
 .Nm man.conf
@@ -179,11 +184,6 @@ 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
-.El
 .Sh SEE ALSO
 .Xr apropos 1 ,
 .Xr machine 1 ,
diff --git a/usr.bin/mg/mg.1 b/usr.bin/mg/mg.1
index e50bd622783..bcf07122785 100644
--- a/usr.bin/mg/mg.1
+++ b/usr.bin/mg/mg.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mg.1,v 1.17 2003/05/05 22:05:57 vincent Exp $
+.\"	$OpenBSD: mg.1,v 1.18 2003/06/10 09:12:11 jmc Exp $
 .\"
 .Dd February 25, 2000
 .Dt MG 1
@@ -152,9 +152,9 @@ set-default-mode blink
 .Ed
 .Pp
 More complicated key mappings are also possible, though there are some
-internal limitations compared to regular emacs.  An example of how to map
-control characters and sequences follows, illustrating the Gosling-like
-line scrolling characters.
+internal limitations compared to regular emacs.
+An example of how to map control characters and sequences follows,
+illustrating the Gosling-like line scrolling characters.
 .Bd -literal -offset indent
 global-set-key "\\^Z" scroll-one-line-up
 global-set-key "\\ez" scroll-one-line-down
@@ -181,7 +181,7 @@ In
 you must use "^X-1" to get rid of it.
 .Pp
 The undo feature has a minor difference compared to the same feature in
-Gnu Emacs.  When the end of the undo records list is reached,
+Gnu Emacs.
+When the end of the undo records list is reached,
 .Nm mg
 will not stop and inform the user for one undo keystroke before continuing.
-
diff --git a/usr.bin/mixerctl/mixerctl.1 b/usr.bin/mixerctl/mixerctl.1
index 85141c734db..d65737a28bd 100644
--- a/usr.bin/mixerctl/mixerctl.1
+++ b/usr.bin/mixerctl/mixerctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mixerctl.1,v 1.17 2003/05/15 00:57:50 jfb Exp $
+.\" $OpenBSD: mixerctl.1,v 1.18 2003/06/10 09:12:11 jmc Exp $
 .\" $NetBSD: mixerctl.1,v 1.8 1998/05/09 12:41:16 augustss Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -125,6 +125,16 @@ Discrete mixer values, e.g.,
 the recording source, have symbolic names.
 Depending on the mixer it
 may either be an enumeration or a set.
+.Sh ENVIRONMENT
+.Bl -tag -width MIXERDEVICE
+.It Ev MIXERDEVICE
+The audio mixer device to use.
+.El
+.Sh FILES
+.Bl -tag -width /dev/mixer
+.It Pa /dev/mixer
+default mixer audio device
+.El
 .Sh EXAMPLES
 The command
 .Pp
@@ -142,16 +152,6 @@ record.record=220,220 volume
 record.record.source=mic  [ mic cd dac ]
 monitor.monitor=0 volume
 .Ed
-.Sh ENVIRONMENT
-.Bl -tag -width MIXERDEVICE
-.It Ev MIXERDEVICE
-The audio mixer device to use.
-.El
-.Sh FILES
-.Bl -tag -width /dev/mixer
-.It Pa /dev/mixer
-default mixer audio device
-.El
 .Sh SEE ALSO
 .Xr audioctl 1 ,
 .Xr audio 4 ,
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index a01954590af..21224e80c74 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mktemp.1,v 1.21 2003/06/03 01:52:41 millert Exp $
+.\"	$OpenBSD: mktemp.1,v 1.22 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1996, 2000, 2001 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -147,6 +147,13 @@ The
 .Nm
 utility
 exits with a value of 0 on success or 1 on failure.
+.Sh ENVIRONMENT
+.Bl -tag -width TMPDIR
+.It Ev TMPDIR
+directory in which to place the temporary file when in
+.Fl t
+mode
+.El
 .Sh EXAMPLES
 The following
 .Xr sh 1
@@ -168,7 +175,8 @@ echo "program output" >> $TMPFILE
 .Ed
 .Pp
 This can be further simplified if we don't care about the actual name of
-the temporary file.  In this case the
+the temporary file.
+In this case the
 .Fl t
 flag is implied.
 .Bd -literal -offset indent
@@ -213,13 +221,6 @@ TMPFILE=`mktemp -q -t example.XXXXXXXXXX` && {
 	rm -f $TMPFILE
 }
 .Ed
-.Sh ENVIRONMENT
-.Bl -tag -width TMPDIR
-.It Ev TMPDIR
-directory in which to place the temporary file when in
-.Fl t
-mode
-.El
 .Sh SEE ALSO
 .Xr mkdtemp 3 ,
 .Xr mkstemp 3 ,
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index c51e50e1fe8..459b2b65191 100644
--- a/usr.bin/modstat/modstat.8
+++ b/usr.bin/modstat/modstat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modstat.8,v 1.10 2001/09/19 20:11:26 miod Exp $
+.\"	$OpenBSD: modstat.8,v 1.11 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -58,11 +58,11 @@ or with a nonzero status if an error occurred.
 .Xr lkm 4 ,
 .Xr modload 8 ,
 .Xr modunload 8
-.Sh AUTHORS
-Terrence R. Lambert <terry@cs.weber.edu>
 .Sh HISTORY
 The
 .Nm
 command was designed to be similar in functionality
 to the corresponding command in
 .Tn "SunOS 4.1.3" .
+.Sh AUTHORS
+.An Terrence R. Lambert Aq terry@cs.weber.edu
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index d1c74e14e9a..20f066516e0 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newsyslog.8,v 1.35 2003/06/03 21:09:02 deraadt Exp $
+.\"	$OpenBSD: newsyslog.8,v 1.36 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -89,7 +89,7 @@ flags to aid in debugging problems with
 Monitoring mode; only entries marked with an
 .Sq M
 in flags are processed.
-For each log file being monitored, any log output since the last time 
+For each log file being monitored, any log output since the last time
 .Nm
 was run with the
 .Fl m
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 42dd8886750..2732fe7ea94 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nice.1,v 1.11 2003/06/03 02:56:13 millert Exp $
+.\"	$OpenBSD: nice.1,v 1.12 2003/06/10 09:12:11 jmc Exp $
 .\"	$NetBSD: nice.1,v 1.6 1995/08/31 23:30:57 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -90,11 +90,11 @@ shall be that of
 .Xr getpriority 2 ,
 .Xr setpriority 2 ,
 .Xr renice 8
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The historic
 .Fl Ns Ar increment
 option has been deprecated but is still supported in this implementation.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility conforms to
diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index 922a18885a5..1278a6cf058 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: oldrdist.1,v 1.10 2003/06/03 02:56:14 millert Exp $
+.\"	$OpenBSD: oldrdist.1,v 1.11 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -423,11 +423,6 @@ imagen:
 ${FILES} :: stamp.cory
 \tnotify root@cory ;
 .Ed
-.Sh DIAGNOSTICS
-A complaint about mismatch of
-.Nm
-version numbers may really stem
-from some problem with starting your shell, e.g., you are in too many groups.
 .Sh FILES
 .Bl -tag -width /tmp/rdist* -compact
 .It Pa distfile
@@ -435,6 +430,11 @@ input command file
 .It Pa /tmp/rdist*
 temporary file for update lists
 .El
+.Sh DIAGNOSTICS
+A complaint about mismatch of
+.Nm
+version numbers may really stem
+from some problem with starting your shell, e.g., you are in too many groups.
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr sh 1 ,
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 460c24eaf91..a4731599d1f 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: passwd.1,v 1.24 2003/06/03 02:56:14 millert Exp $
+.\"	$OpenBSD: passwd.1,v 1.25 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -37,6 +37,7 @@
 .Nd modify a user's password
 .Sh SYNOPSIS
 .Nm passwd
+.Bk -words
 .Op Fl l
 .Op Fl y
 .Op Fl k
@@ -46,6 +47,7 @@
 .Op Fl r Ar realm
 .Op Fl u Ar username[.instance][@realm]
 .Op Ar user
+.Ek
 .\" This should really be: passwd [-l] [-y] [-k [-n name] [-i instance] [-r realm] [-u username[.instance][@realm]]] [user]
 .Sh DESCRIPTION
 .Nm
@@ -126,7 +128,7 @@ an attempt is made to use the YP database.
 To change another user's KerberosIV password, one must first run
 .Xr kinit 1
 followed by
-.Xr passwd 1 .
+.Nm passwd .
 The superuser is not required to provide a user's current password
 if only the local password is modified.
 .Pp
@@ -138,6 +140,19 @@ It can be different for local
 and YP
 .Po Do ypcipher Dc Pc
 passwords.
+.Sh FILES
+.Bl -tag -width /etc/master.passwd -compact
+.It /etc/login.conf
+configuration options
+.It Pa /etc/master.passwd
+user database
+.It Pa /etc/passwd
+a Version 7 format password file
+.It Pa /etc/passwd.XXXXXX
+temporary copy of the password file
+.It /etc/ptmp
+lock file for the passwd database
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "Attempting lock password file, please wait or press ^C to abort"
@@ -165,19 +180,6 @@ If no process is listed, it is safe to remove the
 .Pa /etc/ptmp
 file to clear the error.
 .El
-.Sh FILES
-.Bl -tag -width /etc/master.passwd -compact
-.It /etc/login.conf
-configuration options
-.It Pa /etc/master.passwd
-user database
-.It Pa /etc/passwd
-a Version 7 format password file
-.It Pa /etc/passwd.XXXXXX
-temporary copy of the password file
-.It /etc/ptmp
-lock file for the passwd database
-.El
 .Sh SEE ALSO
 .Xr chpass 1 ,
 .Xr kerberos 1 ,
diff --git a/usr.bin/pmdb/pmdb.1 b/usr.bin/pmdb/pmdb.1
index fff40a3afab..f14206fedcd 100644
--- a/usr.bin/pmdb/pmdb.1
+++ b/usr.bin/pmdb/pmdb.1
@@ -1,16 +1,16 @@
-.\"	$OpenBSD: pmdb.1,v 1.12 2003/03/22 08:07:12 david Exp $
+.\"	$OpenBSD: pmdb.1,v 1.13 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Artur Grabowski <art@openbsd.org>
-.\" All rights reserved. 
+.\" All rights reserved.
 .\"
-.\" Redistribution and use in source and binary forms, with or without 
-.\" modification, are permitted provided that the following conditions 
-.\" are met: 
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
 .\"
-.\" 1. Redistributions of source code must retain the above copyright 
-.\"    notice, this list of conditions and the following disclaimer. 
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
 .\" 2. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission. 
+.\"    derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
 .\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -21,7 +21,7 @@
 .\" OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 .\" WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd February 20, 2002
 .Dt PMDB 1
@@ -43,13 +43,14 @@ The only way to start
 .Nm
 at this moment is to specify the name of the program to be debugged and all
 its arguments on the command line.
-Optionally, 
+Optionally,
 .Fl c
 can be used to specify a core file to examine.
 It is also possible to debug a process that is already running by specifying
 the process's PID to the
 .Fl p
-flag.  This causes the process to be put in STOPPED state until execution
+flag.
+This causes the process to be put in STOPPED state until execution
 is resumed either by an explicit command to pmdb or by exiting pmdb.
 The program is controlled from a command line which usually gives the
 prompt "pmdb>".
@@ -70,7 +71,7 @@ the only way to affect it is through signals sent to it.
 Unless a signal is ignored with the
 .Ic signal ignore
 command, it will be caught by
-.Nm 
+.Nm
 and the process will go into the
 .Ic STOPPED
 state.
diff --git a/usr.bin/radioctl/radioctl.1 b/usr.bin/radioctl/radioctl.1
index d58cc35d939..2366a18141d 100644
--- a/usr.bin/radioctl/radioctl.1
+++ b/usr.bin/radioctl/radioctl.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: radioctl.1,v 1.6 2003/01/15 15:05:36 deraadt Exp $
+.\"	$OpenBSD: radioctl.1,v 1.7 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Vladimir Popov
 .\" All rights reserved.
@@ -125,6 +125,18 @@ cards allow the station locking sensitivity to be changed.
 All the remaining controls (signal, stereo and card capabilities) are read-only
 and can be viewed using option
 .Fl a .
+.Sh ENVIRONMENT
+The following environment variable affects the execution of
+.Nm radioctl :
+.Bl -tag -width RADIODEVICE
+.It Ev RADIODEVICE
+The radio tuner device to use.
+.El
+.Sh FILES
+.Bl -tag -width /dev/radio
+.It Pa /dev/radio
+radio tuner device
+.El
 .Sh EXAMPLES
 The command
 .Pp
@@ -141,18 +153,6 @@ stereo=on
 card capabilities:
         manageable mono/stereo
 .Ed
-.Sh ENVIRONMENT
-The following environment variable affects the execution of
-.Nm radioctl :
-.Bl -tag -width RADIODEVICE
-.It Ev RADIODEVICE
-The radio tuner device to use.
-.El
-.Sh FILES
-.Bl -tag -width /dev/radio
-.It Pa /dev/radio
-radio tuner device
-.El
 .Sh SEE ALSO
 .Xr radio 4
 .Sh HISTORY
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 09248d59acf..dc76deb9d57 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdist.1,v 1.18 2003/06/03 02:56:14 millert Exp $
+.\"	$OpenBSD: rdist.1,v 1.19 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 1983 Regents of the University of California.
 .\" All rights reserved.
@@ -245,7 +245,8 @@ processes to
 .Ar num .
 The default is 4.
 .It Fl m Ar machine
-Limit which machines are to be updated. Multiple
+Limit which machines are to be updated.
+Multiple
 .Fl m
 arguments can be given to limit updates to a subset of the hosts listed in the
 .Pa distfile .
@@ -493,7 +494,7 @@ This is unlike the
 .Xr syslog 3
 system facility which uses an ascending order scheme.
 The following are the valid
-.Em types:
+.Em types :
 .Bl -tag -width Ds
 .It Sy change
 Things that change.
@@ -504,7 +505,7 @@ General information.
 General info about things that change.
 This includes things like making directories which are needed in order
 to install a specific target, but which are not explicitly specified in the
-.Pa distfile.
+.Pa distfile .
 .It Sy nerror
 Normal errors that are not fatal.
 .It Sy ferror
@@ -535,7 +536,8 @@ The
 .Pa distfile
 contains a sequence of entries that specify the files
 to be copied, the destination hosts, and what operations to perform
-to do the updating. Each entry has one of the following formats.
+to do the updating.
+Each entry has one of the following formats.
 .Bd -literal -offset indent
 <variable name> `=' <name list>
 [ label: ] <source list> `\->' <destination list> <command list>
@@ -699,7 +701,7 @@ is omitted then the shell commands will be executed for every file
 updated or installed.
 .Em string
 starts and ends with `"' and can cross multiple lines in
-.Pa distfile.
+.Pa distfile .
 Multiple commands to the shell should be separated by `;'.
 Commands are executed in the user's home directory on the host
 being updated.
@@ -774,11 +776,11 @@ ${FILES} :: stamp.cory
 .It TMPDIR
 Name of temporary directory to use.
 Default is
-.Pa /tmp.
+.Pa /tmp .
 .It RSH
 Name of the default remote shell program to use.
 Default is
-.Pa ssh .
+.Xr ssh 1 .
 .El
 .Sh FILES
 .Bl -tag -width "$TMPDIR/rdist*" -compact
@@ -788,9 +790,9 @@ input command file
 temporary file for update lists
 .El
 .Sh SEE ALSO
-.Xr sh 1 ,
 .Xr csh 1 ,
 .Xr rsh 1 ,
+.Xr sh 1 ,
 .Xr ssh 1 ,
 .Xr stat 2 ,
 .Xr rcmdsh 3
@@ -836,9 +838,9 @@ then
 will report missing links.
 Only one instance of a link should be listed in each target.
 .Pp
-The 
-.Sy defowner,
-.Sy defgroup,
+The
+.Sy defowner ,
+.Sy defgroup ,
 and
 .Sy updateperm
 options are extensions to the 6.1.0 protocol and will not work with earlier
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 2ee42edcb03..3601d1f3f94 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rpcgen.1,v 1.10 2003/03/11 08:11:08 jmc Exp $
+.\" $OpenBSD: rpcgen.1,v 1.11 2003/06/10 09:12:11 jmc Exp $
 .\" $NetBSD: rpcgen.1,v 1.5.2.1 1995/12/05 02:51:02 jtc Exp $
 .\" from: @(#)rpcgen.new.1	1.1 90/11/09 TIRPC 1.0; from 40.10 of 10/10/89
 .\" Copyright (c) 1988,1990 Sun Microsystems, Inc. - All Rights Reserved.
@@ -80,7 +80,7 @@ This code would be created in
 .Pp
 The server created can be started both by the port monitors
 (for example,
-.Xr inetd 8 Ns )
+.Xr inetd 8 )
 or by itself.
 When it is started by a port monitor,
 it creates servers only for the transport for which
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 4f6eddc08c7..4d2cbb98624 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,8 +1,8 @@
-.\"	$OpenBSD: rpcinfo.8,v 1.10 2003/02/18 07:47:00 jmc Exp $
+.\"	$OpenBSD: rpcinfo.8,v 1.11 2003/06/10 09:12:11 jmc Exp $
 .\"	from: @(#)rpcinfo.8c	2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
 .\"
 .\" Copyright (C) 1986, Sun Microsystems, Inc.
-.\" 
+.\"
 .\"
 .\" Sun RPC is a product of Sun Microsystems, Inc. and is provided for
 .\" unrestricted use provided that this legend is included on all tape
@@ -10,27 +10,27 @@
 .\" may copy or modify Sun RPC without charge, but are not authorized
 .\" to license or distribute it to anyone else except as part of a product or
 .\" program developed by the user.
-.\" 
+.\"
 .\" SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
 .\" WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
 .\" PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-.\" 
+.\"
 .\" Sun RPC is provided with no support and without any obligation on the
 .\" part of Sun Microsystems, Inc. to assist in its use, correction,
 .\" modification or enhancement.
-.\" 
+.\"
 .\" SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
 .\" INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
 .\" OR ANY PART THEREOF.
-.\" 
+.\"
 .\" In no event will Sun Microsystems, Inc. be liable for any lost revenue
 .\" or profits or other special, indirect and consequential damages, even if
 .\" Sun has been advised of the possibility of such damages.
-.\" 
+.\"
 .\" Sun Microsystems, Inc.
 .\" 2550 Garcia Avenue
 .\" Mountain View, California  94043
-.\" 
+.\"
 .Dd December 17, 1987
 .Dt RPCINFO 8
 .Os
diff --git a/usr.bin/sectok/sectok.1 b/usr.bin/sectok/sectok.1
index 499ac6de66a..992045d89c6 100644
--- a/usr.bin/sectok/sectok.1
+++ b/usr.bin/sectok/sectok.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sectok.1,v 1.10 2003/03/31 19:40:44 jmc Exp $
+.\"	$OpenBSD: sectok.1,v 1.11 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (C) 2001, Jakob Schlyter. All rights reserved.
 .\"
@@ -60,7 +60,6 @@ Set sleep (in milliseconds) between commands in the script.
 .El
 .Sh COMMANDS
 .Ss Non-card commands
-.Pp
 .Bl -tag -width Ds
 .It Xo
 .Cm help
@@ -109,7 +108,6 @@ Quit
 .Nm Li .
 .El
 .Ss ISO 7816-4 commands
-.Pp
 .Bl -tag -width Ds
 .It Xo
 .Cm apdu
@@ -168,7 +166,6 @@ Verify CHV (PIN).
 Change CHV (PIN).
 .El
 .Ss Cyberflex commands
-.Pp
 .Bl -tag -width Ds
 .It Xo
 .Cm ls
@@ -266,12 +263,12 @@ use manufacturer's default AUT0 key
 .El
 .El
 .\"
+.Sh HISTORY
+.Nm
+first appeared in
+.Ox 3.0 .
 .Sh AUTHORS
 .Nm
 was written by Jim Rees and others at University of Michigan
 Center for Information Technology Integration (CITI).
 .\"
-.Sh HISTORY
-.Nm
-first appeared in
-.Ox 3.0 .
diff --git a/usr.bin/skey/skeyprune.8 b/usr.bin/skey/skeyprune.8
index ddc9fb889c5..6f534f825ff 100644
--- a/usr.bin/skey/skeyprune.8
+++ b/usr.bin/skey/skeyprune.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: skeyprune.8,v 1.7 2002/05/16 18:27:34 millert Exp $
+.\" $OpenBSD: skeyprune.8,v 1.8 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\"
 .Dd May 16, 2002
@@ -25,6 +25,11 @@ is not specified, only invalid entries are pruned.
 .Pp
 If a malformed entry is encountered, or if the file mode/type is incorrect,
 an error is printed to the standard error.
+.Sh FILES
+.Bl -tag -width /etc/skey
+.It Pa /etc/skey
+directory containing S/Key user entries
+.El
 .Sh ERRORS
 The following errors are cause for concern.
 .Bl -tag -width Ds
@@ -48,11 +53,6 @@ The user's entry had a bad link count (should be 1).
 The user's entry was not of the correct format, as specified by
 .Xr skey 5 .
 .El
-.Sh FILES
-.Bl -tag -width /etc/skey
-.It Pa /etc/skey
-directory containing S/Key user entries
-.El
 .Sh SEE ALSO
 .Xr skey 1 ,
 .Xr skeyinit 1 ,
diff --git a/usr.bin/skeyinfo/skeyinfo.1 b/usr.bin/skeyinfo/skeyinfo.1
index ee0164e79ba..e60544b3114 100644
--- a/usr.bin/skeyinfo/skeyinfo.1
+++ b/usr.bin/skeyinfo/skeyinfo.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: skeyinfo.1,v 1.6 2002/05/16 17:26:58 millert Exp $
+.\" $OpenBSD: skeyinfo.1,v 1.7 2003/06/10 09:12:11 jmc Exp $
 .\"
 .Dd May 16, 2002
 .Dt SKEYINFO 1
@@ -20,6 +20,11 @@ The options are as follows:
 .It Fl v
 Print the hash algorithm as well.
 .El
+.Sh FILES
+.Bl -tag -width /etc/skey
+.It Pa /etc/skey
+directory containing user entries for S/Key
+.El
 .Sh EXAMPLES
 % skey -n <number of passwords to print> `skeyinfo` | lpr
 .Pp
@@ -40,11 +45,6 @@ The
 .Xr skeyinit 1
 program can be used to create an entry for the user.
 .El
-.Sh FILES
-.Bl -tag -width /etc/skey
-.It Pa /etc/skey
-directory containing user entries for S/Key
-.El
 .Sh SEE ALSO
 .Xr skey 1 ,
 .Xr skeyinit 1
diff --git a/usr.bin/skeyinit/skeyinit.1 b/usr.bin/skeyinit/skeyinit.1
index 738a870815f..6ebe845f013 100644
--- a/usr.bin/skeyinit/skeyinit.1
+++ b/usr.bin/skeyinit/skeyinit.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: skeyinit.1,v 1.25 2002/12/09 21:41:38 cloder Exp $
+.\"	$OpenBSD: skeyinit.1,v 1.26 2003/06/10 09:12:11 jmc Exp $
 .\"	$NetBSD: skeyinit.1,v 1.4 1995/07/07 22:24:09 jtc Exp $
 .\"	@(#)skeyinit.1	1.1 	10/28/93
 .\"
@@ -139,6 +139,13 @@ Selects RMD-160 (160 bit Ripe Message Digest) as the hash algorithm.
 The username to be changed/added.
 By default the current user is operated on.
 .El
+.Sh FILES
+.Bl -tag -width /etc/login.conf -compact
+.It Pa /etc/login.conf
+file containing authentication types
+.It Pa /etc/skey
+directory containing user entries for S/Key
+.El
 .Sh ERRORS
 .Bl -tag -compact -width "skey disabled"
 .It "skey disabled"
@@ -150,13 +157,6 @@ via the
 .Fl E
 flag.
 .El
-.Sh FILES
-.Bl -tag -width /etc/login.conf -compact
-.It Pa /etc/login.conf
-file containing authentication types
-.It Pa /etc/skey
-directory containing user entries for S/Key
-.El
 .Sh SEE ALSO
 .Xr skey 1 ,
 .Xr skeyinfo 1
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index 3b6d5117e44..f9fb232599e 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: soelim.1,v 1.6 2003/06/03 02:56:16 millert Exp $
+.\"	$OpenBSD: soelim.1,v 1.7 2003/06/10 09:12:11 jmc Exp $
 .\"	$NetBSD: soelim.1,v 1.3 1994/12/21 08:11:24 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -77,11 +77,11 @@ soelim exum?.n \&| tbl \&| nroff \-ms \&| col \&| lpr
 .Sh SEE ALSO
 .Xr colcrt 1 ,
 .Xr more 1
-.Sh BUGS
-The format of the source commands must involve no strangeness;
-exactly one blank must precede and no blanks follow the file name.
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Bx 3.0 .
+.Sh BUGS
+The format of the source commands must involve no strangeness;
+exactly one blank must precede and no blanks follow the file name.
diff --git a/usr.bin/spell/spell.1 b/usr.bin/spell/spell.1
index 74fec9cbbe9..2c7f3b88237 100644
--- a/usr.bin/spell/spell.1
+++ b/usr.bin/spell/spell.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spell.1,v 1.5 2003/06/04 21:48:02 deraadt Exp $
+.\" $OpenBSD: spell.1,v 1.6 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (C) 1985, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -120,7 +120,7 @@ option is specified.
 .Pp
 Site administrators may add words to the local word list,
 .Pa /usr/local/share/dict/words
-or the local stop list, 
+or the local stop list,
 .Pa /usr/local/share/dict/stop .
 .Pp
 All word (and stop) lists must be sorted in lexigraphical order
@@ -182,23 +182,23 @@ The
 option takes the following arguments:
 .Bl -tag -width Ds
 .It a
-recognize 
+recognize
 .Xr man 7
 macros.
 .It e
-recognize 
+recognize
 .Xr me 7
 macros.
 .It m
-recognize 
+recognize
 .Xr me 7
 macros.
 .It s
-recognize 
+recognize
 .Xr me 7
 macros.
 .It l
-recognize 
+recognize
 .Xr mm 7
 macros and delete
 .Xr mm 7
@@ -211,7 +211,7 @@ The stop list must be sorted as specified above.
 Use
 .Ar extra_list
 in addition to the default word list.
-The extra word list must be sorted as specified above. 
+The extra word list must be sorted as specified above.
 .El
 .Sh FILES
 .Bl -tag -width /usr/local/share/dict/wordsxx -compact
@@ -238,16 +238,6 @@ Binary executed by the shell script
 .Xr sort 1 ,
 .Xr tee 1 ,
 .Xr troff 1
-.Sh BUGS
-The spelling list lacks many technical terms; new installations will
-probably wish to monitor the output for several months to gather local
-additions.
-.Pp
-British spelling was done by an American.
-.Pp
-In
-.Fl x
-mode it would be nicer if the stems were grouped with the appropriate word.
 .Sh HISTORY
 The
 .Nm spell
@@ -260,3 +250,13 @@ Unlike historic versions, the
 command does not use hashed word files.
 Instead, it uses lexigraphically sorted files and the same technique as
 .Xr look 1 .
+.Sh BUGS
+The spelling list lacks many technical terms; new installations will
+probably wish to monitor the output for several months to gather local
+additions.
+.Pp
+British spelling was done by an American.
+.Pp
+In
+.Fl x
+mode it would be nicer if the stems were grouped with the appropriate word.
diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1
index a3ec2e0c61e..a971500eebd 100644
--- a/usr.bin/ssh/scp.1
+++ b/usr.bin/ssh/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.27 2003/03/28 10:11:43 jmc Exp $
+.\" $OpenBSD: scp.1,v 1.28 2003/06/10 09:12:11 jmc Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -148,14 +148,6 @@ to use IPv6 addresses only.
 .Sh DIAGNOSTICS
 .Nm
 exits with 0 on success or >0 if an error occurred.
-.Sh AUTHORS
-Timo Rinne <tri@iki.fi> and Tatu Ylonen <ylo@cs.hut.fi>
-.Sh HISTORY
-.Nm
-is based on the
-.Xr rcp 1
-program in BSD source code from the Regents of the University of
-California.
 .Sh SEE ALSO
 .Xr rcp 1 ,
 .Xr sftp 1 ,
@@ -165,3 +157,13 @@ California.
 .Xr ssh-keygen 1 ,
 .Xr ssh_config 5 ,
 .Xr sshd 8
+.Sh HISTORY
+.Nm
+is based on the
+.Xr rcp 1
+program in BSD source code from the Regents of the University of
+California.
+.Sh AUTHORS
+.An Timo Rinne Aq tri@iki.fi
+and
+.An Tatu Ylonen Aq ylo@cs.hut.fi
diff --git a/usr.bin/ssh/sftp-server.8 b/usr.bin/ssh/sftp-server.8
index 70c951f42ac..43c7b697a11 100644
--- a/usr.bin/ssh/sftp-server.8
+++ b/usr.bin/ssh/sftp-server.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp-server.8,v 1.8 2001/06/23 05:57:08 deraadt Exp $
+.\" $OpenBSD: sftp-server.8,v 1.9 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 2000 Markus Friedl.  All rights reserved.
 .\"
@@ -55,9 +55,9 @@ for more information.
 .%D January 2001
 .%O work in progress material
 .Re
-.Sh AUTHORS
-Markus Friedl <markus@openbsd.org>
 .Sh HISTORY
 .Nm
 first appeared in
 .Ox 2.8 .
+.Sh AUTHORS
+.An Markus Friedl Aq markus@openbsd.org
diff --git a/usr.bin/ssh/ssh-add.1 b/usr.bin/ssh/ssh-add.1
index bcdb8e7f68f..fe0190859ef 100644
--- a/usr.bin/ssh/ssh-add.1
+++ b/usr.bin/ssh/ssh-add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-add.1,v 1.38 2003/03/28 10:11:43 jmc Exp $
+.\"	$OpenBSD: ssh-add.1,v 1.39 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -109,20 +109,6 @@ Add key in smartcard
 Remove key in smartcard
 .Ar reader .
 .El
-.Sh FILES
-.Bl -tag -width Ds
-.It Pa $HOME/.ssh/identity
-Contains the protocol version 1 RSA authentication identity of the user.
-.It Pa $HOME/.ssh/id_dsa
-Contains the protocol version 2 DSA authentication identity of the user.
-.It Pa $HOME/.ssh/id_rsa
-Contains the protocol version 2 RSA authentication identity of the user.
-.El
-.Pp
-Identity files should not be readable by anyone but the user.
-Note that
-.Nm
-ignores identity files if they are accessible by others.
 .Sh ENVIRONMENT
 .Bl -tag -width Ds
 .It Ev "DISPLAY" and "SSH_ASKPASS"
@@ -152,11 +138,30 @@ to make this work.)
 Identifies the path of a unix-domain socket used to communicate with the
 agent.
 .El
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa $HOME/.ssh/identity
+Contains the protocol version 1 RSA authentication identity of the user.
+.It Pa $HOME/.ssh/id_dsa
+Contains the protocol version 2 DSA authentication identity of the user.
+.It Pa $HOME/.ssh/id_rsa
+Contains the protocol version 2 RSA authentication identity of the user.
+.El
+.Pp
+Identity files should not be readable by anyone but the user.
+Note that
+.Nm
+ignores identity files if they are accessible by others.
 .Sh DIAGNOSTICS
 Exit status is 0 on success, 1 if the specified command fails,
 and 2 if
 .Nm
 is unable to contact the authentication agent.
+.Sh SEE ALSO
+.Xr ssh 1 ,
+.Xr ssh-agent 1 ,
+.Xr ssh-keygen 1 ,
+.Xr sshd 8
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
 ssh 1.2.12 release by Tatu Ylonen.
@@ -166,8 +171,3 @@ removed many bugs, re-added newer features and
 created OpenSSH.
 Markus Friedl contributed the support for SSH
 protocol versions 1.5 and 2.0.
-.Sh SEE ALSO
-.Xr ssh 1 ,
-.Xr ssh-agent 1 ,
-.Xr ssh-keygen 1 ,
-.Xr sshd 8
diff --git a/usr.bin/ssh/ssh-agent.1 b/usr.bin/ssh/ssh-agent.1
index eae6716b79c..aab15cc7fb8 100644
--- a/usr.bin/ssh/ssh-agent.1
+++ b/usr.bin/ssh/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.38 2003/05/14 13:11:56 jmc Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.39 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -179,6 +179,11 @@ authentication agent.
 These sockets should only be readable by the owner.
 The sockets should get automatically removed when the agent exits.
 .El
+.Sh SEE ALSO
+.Xr ssh 1 ,
+.Xr ssh-add 1 ,
+.Xr ssh-keygen 1 ,
+.Xr sshd 8
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
 ssh 1.2.12 release by Tatu Ylonen.
@@ -188,8 +193,3 @@ removed many bugs, re-added newer features and
 created OpenSSH.
 Markus Friedl contributed the support for SSH
 protocol versions 1.5 and 2.0.
-.Sh SEE ALSO
-.Xr ssh 1 ,
-.Xr ssh-add 1 ,
-.Xr ssh-keygen 1 ,
-.Xr sshd 8
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1
index 1583384af54..fc6b5a5e0a2 100644
--- a/usr.bin/ssh/ssh-keygen.1
+++ b/usr.bin/ssh/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keygen.1,v 1.58 2003/05/20 12:09:31 jmc Exp $
+.\"	$OpenBSD: ssh-keygen.1,v 1.59 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -285,15 +285,6 @@ on all machines
 where the user wishes to log in using public key authentication.
 There is no need to keep the contents of this file secret.
 .El
-.Sh AUTHORS
-OpenSSH is a derivative of the original and free
-ssh 1.2.12 release by Tatu Ylonen.
-Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
-Theo de Raadt and Dug Song
-removed many bugs, re-added newer features and
-created OpenSSH.
-Markus Friedl contributed the support for SSH
-protocol versions 1.5 and 2.0.
 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr ssh-add 1 ,
@@ -307,3 +298,12 @@ protocol versions 1.5 and 2.0.
 .%D March 2001
 .%O work in progress material
 .Re
+.Sh AUTHORS
+OpenSSH is a derivative of the original and free
+ssh 1.2.12 release by Tatu Ylonen.
+Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
+Theo de Raadt and Dug Song
+removed many bugs, re-added newer features and
+created OpenSSH.
+Markus Friedl contributed the support for SSH
+protocol versions 1.5 and 2.0.
diff --git a/usr.bin/ssh/ssh-keyscan.1 b/usr.bin/ssh/ssh-keyscan.1
index 6d27569eb43..572751f66a3 100644
--- a/usr.bin/ssh/ssh-keyscan.1
+++ b/usr.bin/ssh/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ssh-keyscan.1,v 1.16 2003/05/12 18:35:18 markus Exp $
+.\"	$OpenBSD: ssh-keyscan.1,v 1.17 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 .\"
@@ -103,24 +103,6 @@ On the other hand, if the security model allows such a risk,
 .Nm
 can help in the detection of tampered keyfiles or man in the middle
 attacks which have begun after the ssh_known_hosts file was created.
-.Sh EXAMPLES
-.Pp
-Print the
-.Pa rsa1
-host key for machine
-.Pa hostname :
-.Bd -literal
-$ ssh-keyscan hostname
-.Ed
-.Pp
-Find all hosts from the file
-.Pa ssh_hosts
-which have new or different keys from those in the sorted file
-.Pa ssh_known_hosts :
-.Bd -literal
-$ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e\ 
-	sort -u - ssh_known_hosts | diff ssh_known_hosts -
-.Ed
 .Sh FILES
 .Pa Input format:
 .Bd -literal
@@ -145,16 +127,33 @@ or
 .Dq ssh-dss .
 .Pp
 .Pa /etc/ssh/ssh_known_hosts
-.Sh BUGS
-It generates "Connection closed by remote host" messages on the consoles
-of all the machines it scans if the server is older than version 2.9.
-This is because it opens a connection to the ssh port, reads the public
-key, and drops the connection as soon as it gets the key.
+.Sh EXAMPLES
+Print the
+.Pa rsa1
+host key for machine
+.Pa hostname :
+.Bd -literal
+$ ssh-keyscan hostname
+.Ed
+.Pp
+Find all hosts from the file
+.Pa ssh_hosts
+which have new or different keys from those in the sorted file
+.Pa ssh_known_hosts :
+.Bd -literal
+$ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e
+	sort -u - ssh_known_hosts | diff ssh_known_hosts -
+.Ed
 .Sh SEE ALSO
 .Xr ssh 1 ,
 .Xr sshd 8
 .Sh AUTHORS
-David Mazieres <dm@lcs.mit.edu>
+.An David Mazieres Aq dm@lcs.mit.edu
 wrote the initial version, and
-Wayne Davison <wayned@users.sourceforge.net>
+.An Wayne Davison Aq wayned@users.sourceforge.net
 added support for protocol version 2.
+.Sh BUGS
+It generates "Connection closed by remote host" messages on the consoles
+of all the machines it scans if the server is older than version 2.9.
+This is because it opens a connection to the ssh port, reads the public
+key, and drops the connection as soon as it gets the key.
diff --git a/usr.bin/ssh/ssh-keysign.8 b/usr.bin/ssh/ssh-keysign.8
index 2e3f8ff3ef7..a17e8d5cf23 100644
--- a/usr.bin/ssh/ssh-keysign.8
+++ b/usr.bin/ssh/ssh-keysign.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keysign.8,v 1.6 2003/03/28 10:11:43 jmc Exp $
+.\" $OpenBSD: ssh-keysign.8,v 1.7 2003/06/10 09:12:11 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Markus Friedl.  All rights reserved.
 .\"
@@ -74,9 +74,9 @@ must be set-uid root if hostbased authentication is used.
 .Xr ssh-keygen 1 ,
 .Xr ssh_config 5 ,
 .Xr sshd 8
-.Sh AUTHORS
-Markus Friedl <markus@openbsd.org>
 .Sh HISTORY
 .Nm
 first appeared in
 .Ox 3.2 .
+.Sh AUTHORS
+.An Markus Friedl Aq markus@openbsd.org
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index d8af4de62e8..defc0e6409e 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.172 2003/05/20 12:09:31 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.173 2003/06/10 09:12:11 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -922,7 +922,8 @@ or
 .Xr rsh 1 .
 .It Pa /etc/hosts.equiv
 This file is used during
-.Pa \&.rhosts authentication.
+.Pa \&.rhosts
+authentication.
 It contains
 canonical hosts names, one per line (the full format is described on
 the
@@ -964,15 +965,6 @@ above.
 .Nm
 exits with the exit status of the remote command or with 255
 if an error occurred.
-.Sh AUTHORS
-OpenSSH is a derivative of the original and free
-ssh 1.2.12 release by Tatu Ylonen.
-Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
-Theo de Raadt and Dug Song
-removed many bugs, re-added newer features and
-created OpenSSH.
-Markus Friedl contributed the support for SSH
-protocol versions 1.5 and 2.0.
 .Sh SEE ALSO
 .Xr rsh 1 ,
 .Xr scp 1 ,
@@ -995,3 +987,12 @@ protocol versions 1.5 and 2.0.
 .%D January 2002
 .%O work in progress material
 .Re
+.Sh AUTHORS
+OpenSSH is a derivative of the original and free
+ssh 1.2.12 release by Tatu Ylonen.
+Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
+Theo de Raadt and Dug Song
+removed many bugs, re-added newer features and
+created OpenSSH.
+Markus Friedl contributed the support for SSH
+protocol versions 1.5 and 2.0.
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index aa86897a6be..85a686b08e2 100644
--- a/usr.bin/ssh/ssh_config.5
+++ b/usr.bin/ssh/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.12 2003/06/02 08:31:10 jakob Exp $
+.\" $OpenBSD: ssh_config.5,v 1.13 2003/06/10 09:12:12 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -664,6 +664,8 @@ values that are not specified in the user's configuration file, and
 for those users who do not have a configuration file.
 This file must be world-readable.
 .El
+.Sh SEE ALSO
+.Xr ssh 1
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
 ssh 1.2.12 release by Tatu Ylonen.
@@ -673,5 +675,3 @@ removed many bugs, re-added newer features and
 created OpenSSH.
 Markus Friedl contributed the support for SSH
 protocol versions 1.5 and 2.0.
-.Sh SEE ALSO
-.Xr ssh 1
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 827f4f77c70..1cad834f691 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.197 2003/05/20 12:09:32 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.198 2003/06/10 09:12:12 jmc Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -771,17 +771,6 @@ This can be used to specify
 machine-specific login-time initializations globally.
 This file should be writable only by root, and should be world-readable.
 .El
-.Sh AUTHORS
-OpenSSH is a derivative of the original and free
-ssh 1.2.12 release by Tatu Ylonen.
-Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
-Theo de Raadt and Dug Song
-removed many bugs, re-added newer features and
-created OpenSSH.
-Markus Friedl contributed the support for SSH
-protocol versions 1.5 and 2.0.
-Niels Provos and Markus Friedl contributed support
-for privilege separation.
 .Sh SEE ALSO
 .Xr scp 1 ,
 .Xr sftp 1 ,
@@ -813,3 +802,14 @@ for privilege separation.
 .%D January 2002
 .%O work in progress material
 .Re
+.Sh AUTHORS
+OpenSSH is a derivative of the original and free
+ssh 1.2.12 release by Tatu Ylonen.
+Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos,
+Theo de Raadt and Dug Song
+removed many bugs, re-added newer features and
+created OpenSSH.
+Markus Friedl contributed the support for SSH
+protocol versions 1.5 and 2.0.
+Niels Provos and Markus Friedl contributed support
+for privilege separation.
diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5
index 66d6a852476..c6c10c38c89 100644
--- a/usr.bin/ssh/sshd_config.5
+++ b/usr.bin/ssh/sshd_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.18 2003/06/02 09:17:34 markus Exp $
+.\" $OpenBSD: sshd_config.5,v 1.19 2003/06/10 09:12:12 jmc Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
@@ -653,7 +653,7 @@ display server may be exposed to attack when the ssh client requests
 forwarding (see the warnings for
 .Cm ForwardX11
 in
-.Xr ssh_config 5 ).
+.Xr ssh_config 5 ) .
 A system administrator may have a stance in which they want to
 protect clients that may expose themselves to attack by unwittingly
 requesting X11 forwarding, which can warrant a
@@ -699,7 +699,6 @@ The default is
 .Pa /usr/X11R6/bin/xauth .
 .El
 .Ss Time Formats
-.Pp
 .Nm sshd
 command-line arguments and configuration file options that specify time
 may be expressed using a sequence of the form:
@@ -748,6 +747,8 @@ Contains configuration data for
 This file should be writable by root only, but it is recommended
 (though not necessary) that it be world-readable.
 .El
+.Sh SEE ALSO
+.Xr sshd 8
 .Sh AUTHORS
 OpenSSH is a derivative of the original and free
 ssh 1.2.12 release by Tatu Ylonen.
@@ -759,5 +760,3 @@ Markus Friedl contributed the support for SSH
 protocol versions 1.5 and 2.0.
 Niels Provos and Markus Friedl contributed support
 for privilege separation.
-.Sh SEE ALSO
-.Xr sshd 8
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index 16b5b610a22..3a2d5411470 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strings.1,v 1.8 2003/06/03 02:56:16 millert Exp $
+.\"	$OpenBSD: strings.1,v 1.9 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: strings.1,v 1.4 1994/12/10 11:54:28 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -92,7 +92,7 @@ is useful for identifying random binaries, among other things.
 .Sh SEE ALSO
 .Xr hexdump 1 ,
 .Xr od 1
-.Sh COMPATIBILITY
+.Sh STANDARDS
 Historic implementations of
 .Nm
 only search the initialized data portion of the object file.
@@ -100,7 +100,7 @@ This was reasonable as strings were normally stored there.
 Given new compiler technology which installs strings in the
 text portion of the object file, the default behavior was
 changed.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility conforms to
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index c410ddecd07..2023a89b4f2 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: su.1,v 1.18 2003/06/03 02:56:17 millert Exp $
+.\"	$OpenBSD: su.1,v 1.19 2003/06/10 09:12:12 jmc Exp $
 .\"
 .\" Copyright (c) 1988, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -90,7 +90,7 @@ If not using
 and the target login has a user ID of 0 then the
 .Ev PATH
 variable and umask value
-(see 
+(see
 .Xr umask 2 )
 are always set according to the
 .Pa /etc/login.conf
@@ -212,6 +212,24 @@ By default (unless the prompt is reset by a startup file) the superuser
 prompt is set to
 .Dq Sy \&#
 to remind one of its awesome power.
+.Sh ENVIRONMENT
+.Bl -tag -width LOGNAME
+.It Ev HOME
+Default home directory of real user ID unless modified as
+specified above.
+.It Ev LOGNAME
+The user ID is always the effective ID (the target user ID) after an
+.Nm
+unless the user ID is 0 (root).
+.It Ev PATH
+Default search path of real user ID unless modified as specified above.
+.It Ev TERM
+Provides terminal type which may be retained for the substituted
+user ID.
+.It Ev USER
+Same as
+.Ev LOGNAME .
+.El
 .Sh EXAMPLES
 .Bl -tag -width 5n -compact
 .It Li "$ su bin -c makewhatis"
@@ -232,24 +250,6 @@ Pretend a login for user
 .It Li "$ su -a skey -l foo"
 Same as above, but use S/Key for authentication.
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width LOGNAME
-.It Ev HOME
-Default home directory of real user ID unless modified as
-specified above.
-.It Ev LOGNAME
-The user ID is always the effective ID (the target user ID) after an
-.Nm
-unless the user ID is 0 (root).
-.It Ev PATH
-Default search path of real user ID unless modified as specified above.
-.It Ev TERM
-Provides terminal type which may be retained for the substituted
-user ID.
-.It Ev USER
-Same as
-.Ev LOGNAME .
-.El
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr kerberos 1 ,
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 6280406dd68..4b5ea18c1a2 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: talk.1,v 1.17 2003/06/03 02:56:17 millert Exp $
+.\"	$OpenBSD: talk.1,v 1.18 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -50,7 +50,7 @@ The command arguments are as follows:
 .Bl -tag -width ttyname
 .It Fl H
 Don't escape characters with the high bit set.
-This may be useful for certain character sets, but could cause erratic 
+This may be useful for certain character sets, but could cause erratic
 behaviour on some terminals.
 .It Fl s
 Use smooth scrolling in the
@@ -137,7 +137,7 @@ command appeared in
 .Bx 4.2 .
 .Sh BUGS
 The version of
-.Xr talk 1
+.Nm talk
 released with
 .Bx 4.3
 uses a protocol that
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index d6d868315ec..5487db9560f 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnet.1,v 1.32 2003/06/03 02:56:18 millert Exp $
+.\"	$OpenBSD: telnet.1,v 1.33 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -135,7 +135,7 @@ toggle to
 Sets the initial
 .Nm
 escape character to
-.Ar escapechar Ns .
+.Ar escapechar .
 If
 .Ar escapechar
 is omitted, then
@@ -184,7 +184,8 @@ unless modified by the
 .Fl e
 option.
 .It Fl x
-Turn on encryption of the data stream.  When this option is turned on,
+Turn on encryption of the data stream.
+When this option is turned on,
 .Nm
 will exit with an error if authentication cannot be negotiated or if
 encryption cannot be turned on.
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index 25d6f695518..03d1b54e512 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tip.1,v 1.24 2003/06/03 02:56:18 millert Exp $
+.\"	$OpenBSD: tip.1,v 1.25 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -85,7 +85,8 @@ echo characters locally (half-duplex mode).
 .It Fl l Ar line
 For
 .Nm cu ,
-specify the line to use.  Either of the forms like
+specify the line to use.
+Either of the forms like
 .Pa tty00
 or
 .Pa /dev/tty00
@@ -99,7 +100,8 @@ use odd parity.
 .It Fl s Ar speed
 For
 .Nm cu ,
-set the speed of the connection.  Defaults to 9600.
+set the speed of the connection.
+Defaults to 9600.
 .It Fl t
 For
 .Nm cu ,
@@ -163,7 +165,7 @@ Change directory to
 (no argument implies change to your home directory).
 .It Ic \&~!
 Escape to a shell (exiting the shell will return you to
-.Nm tip Ns ).
+.Nm tip ) .
 .It Ic \&~>
 Copy file from local to remote.
 .Nm
@@ -287,7 +289,7 @@ begins with a
 it is assumed to be a path to a
 .Xr remote 5
 database, and the specified database is searched.
-.It 
+.It
 The default
 .Xr remote 5
 database,
@@ -364,7 +366,7 @@ Racal-Vadic 831 (vadic) units is enabled by default.
 Support for Bizcomp 1031[fw] (biz31[fw]), Bizcomp 1022[fw]
 (biz22[fw]), DEC DF0[23]-AC (df0[23]), DEC DN-11 (dn11) and
 Racal-Vadic 3451 (v3451) units can be added by recompiling
-.Xr tip 1
+.Nm tip
 with the appropriate defines.
 .Pp
 Note that if support for both the Racal-Vadic 831 and 3451 is enabled
diff --git a/usr.bin/tn3270/mset/mset.1 b/usr.bin/tn3270/mset/mset.1
index 396dca2f732..351d306a687 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mset.1,v 1.9 2003/06/03 02:56:19 millert Exp $
+.\"	$OpenBSD: mset.1,v 1.10 2003/06/10 09:12:12 jmc Exp $
 .\" Copyright (c) 1986, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -56,11 +56,11 @@ Normally, these mappings are found
 in
 .Pa /usr/share/misc/map3270
 (see
-.Xr map3270  5  ) .
+.Xr map3270 5 ) .
 This information is used by the
 .Xr tn3270
 command (see
-.Xr tn3270  1  ) .
+.Xr tn3270 1 ) .
 .Pp
 The default
 .Nm mset
@@ -108,7 +108,7 @@ of an alternate mapping file and that file is searched first.
 In any case, if the mapping for the keyboard is not found in
 the environment, nor in an alternate map file, nor in the standard map file,
 then the same search is performed for an entry for a keyboard with the name
-.Ar unknown  .
+.Ar unknown .
 If that search also fails,
 then a default mapping
 is used.
@@ -147,7 +147,7 @@ The
 argument causes
 .Nm mset
 to generate shell commands to set the environment variables
-.Ev MAP3270  ,
+.Ev MAP3270 ,
 .Ev MAP3270A ,
 and so on, breaking up the entry to fit within the shell environment
 variable length limit.
diff --git a/usr.bin/top/top.1 b/usr.bin/top/top.1
index b751a63e8d1..e0d0e3da3f5 100644
--- a/usr.bin/top/top.1
+++ b/usr.bin/top/top.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: top.1,v 1.20 2003/06/03 21:09:02 deraadt Exp $
+.\"	$OpenBSD: top.1,v 1.21 2003/06/10 09:12:12 jmc Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -252,7 +252,7 @@ Change the number of seconds to delay between displays
 (prompt for new number).
 .It k
 Send a signal
-.Ns ( Dv TERM
+.Pf ( Dv TERM
 by default) to a list of processes.
 This acts similarly to the command
 .Xr kill 1 .
@@ -333,7 +333,7 @@ COMMAND is the name of the command that the process is currently running
 The
 .Em ABANDONED
 state (known in the kernel as
-.Em SWAIT Ns )
+.Em SWAIT )
 was abandoned, thus the name.
 A process should never end up in this state.
 .Sh ENVIRONMENT
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index 0f8fd326fed..7c63bd5ddef 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: touch.1,v 1.8 2003/06/03 02:56:20 millert Exp $
+.\"	$OpenBSD: touch.1,v 1.9 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -127,7 +127,7 @@ The
 utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr utimes 2
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The obsolescent form of
 .Nm touch ,
 where a time format is specified as the first argument, is supported.
@@ -153,7 +153,7 @@ If the
 .Dq YY
 letter pair is in the range 69 to 99, the year is set from 1969 to 1999;
 otherwise, the year is set in the 21st century.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility is expected to be a superset of the
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index b2ecdaa0455..4265155047e 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tr.1,v 1.8 2003/06/03 02:56:20 millert Exp $
+.\"	$OpenBSD: tr.1,v 1.9 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -261,7 +261,7 @@ Strip out non-printable characters from file1.
 .D1 Li "$ tr -cd \*q[:print:]\*q < file1"
 .Sh SEE ALSO
 .Xr sed 1
-.Sh COMPATIBILITY
+.Sh STANDARDS
 System V has historically implemented character ranges using the syntax
 .Dq [c-c]
 instead of the
@@ -314,7 +314,7 @@ and
 .Fl s
 options were ignored unless two strings were specified.
 This implementation will not permit illegal syntax.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility is expected to be
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index 2b5d8456242..d7a9800239f 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tset.1,v 1.12 2003/06/03 02:56:20 millert Exp $
+.\"	$OpenBSD: tset.1,v 1.13 2003/06/10 09:12:12 jmc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -354,7 +354,7 @@ terminal capability database
 .Xr termcap 5 ,
 .Xr ttys 5 ,
 .Xr environ 7
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The
 .Nm tset
 command now uses the
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 5ade4b9db05..2ec6ac93395 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tsort.1,v 1.13 2003/06/03 02:56:20 millert Exp $
+.\"	$OpenBSD: tsort.1,v 1.14 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: tsort.1,v 1.6 1996/01/17 20:37:49 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -83,8 +83,8 @@ In case of duplicates, the first entry is chosen.
 Search for and display the longest cycle.
 Can take a very long time, as it may need to solve an NP-complete problem.
 .It Fl q
-Do not display informational messages about cycles.  
-This is primarily intended for building libraries, where optimal ordering 
+Do not display informational messages about cycles.
+This is primarily intended for building libraries, where optimal ordering
 is not critical, and cycles occur often.
 .It Fl r
 Reverse the ordering relation.
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 3540de230d5..4cd8c0d52bf 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unifdef.1,v 1.12 2003/06/03 02:56:20 millert Exp $
+.\"	$OpenBSD: unifdef.1,v 1.13 2003/06/10 09:12:12 jmc Exp $
 .\" Copyright (c) 1985, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -239,9 +239,6 @@ utility works nicely with the
 .Fl D Ns Ar sym
 option of
 .Xr diff 1 .
-.Sh SEE ALSO
-.Xr cpp 1 ,
-.Xr diff 1
 .Sh DIAGNOSTICS
 .Bl -item
 .It
@@ -268,6 +265,14 @@ The
 .Nm
 utility exits 0 if the output is an exact copy of the input,
 1 if not, and 2 if in trouble.
+.Sh SEE ALSO
+.Xr cpp 1 ,
+.Xr diff 1
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.3 .
 .Sh BUGS
 Expression evaluation is very limited.
 .Pp
@@ -283,8 +288,3 @@ different points in the source file.
 The text-mode and ignore functionality doesn't correspond to modern
 .Xr cpp 1
 behaviour.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 4.3 .
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 0785b86ee9f..0e88b87ea14 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: uniq.1,v 1.8 2003/06/03 02:56:21 millert Exp $
+.\"	$OpenBSD: uniq.1,v 1.9 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: uniq.1,v 1.5 1994/12/06 07:51:15 jtc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -119,13 +119,13 @@ The
 utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr sort 1
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The historic
 .Cm \&\(pl Ns Ar number
 and
 .Fl Ns Ar number
 options have been deprecated but are still supported in this implementation.
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility is expected to be
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 014c2ca5f55..fe574f35a24 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: units.1,v 1.14 2003/02/18 07:57:49 jmc Exp $
+.\" $OpenBSD: units.1,v 1.15 2003/06/10 09:12:12 jmc Exp $
 .\" converted to new format by deraadt@openbsd.org
 .\"
 .\" Copyright (c) 1993 by Adrian Mariano (adrian@cam.cornell.edu)
@@ -15,7 +15,7 @@
 .\"
 .\" I would appreciate (though I do not require) receiving a copy of any
 .\" improvements you might make to this program.
-.\" 
+.\"
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
@@ -42,33 +42,33 @@ to Fahrenheit, for example.
 It also does not handle logarithmic units such as bels.
 It works interactively by prompting the user for input:
 .Pp
-.nf
-    You have: meters
-    You want: feet
-            * 3.2808399
-            / 0.3048
+.Bd -literal -offset indent
+You have: meters
+You want: feet
+        * 3.2808399
+        / 0.3048
 
-    You have: cm^3
-    You want: gallons
-            * 0.00026417205
-            / 3785.4118
-.fi
+You have: cm^3
+You want: gallons
+        * 0.00026417205
+        / 3785.4118
+.Ed
 .Pp
 The
 .Nm
 program can handle numbers as well:
 .Pp
-.nf
-    You have: 60 miles/hr
-    You want: km/hr
-            * 96.56064
-            / 0.010356187
+.Bd -literal -offset indent
+You have: 60 miles/hr
+You want: km/hr
+        * 96.56064
+        / 0.010356187
 
-    You have: 5 austriaschilling
-    You want: 100 italylira
-            * 7.0357114
-            / 0.14213204
-.fi
+You have: 5 austriaschilling
+You want: 100 italylira
+        * 7.0357114
+        / 0.14213204
+.Ed
 .Pp
 In other words, 60 miles per hour is about 96.6 km/hr, and 5 Austrian
 Schillings will get you seven 100-Lira coins.
@@ -110,13 +110,13 @@ If the user enters incompatible unit types, the units program will
 print a message indicating that the units are not conformable and
 it will display the reduced form for each unit:
 .Pp
-.nf
-    You have: ergs/hour
-    You want: fathoms kg^2 / day
-    conformability error
-            2.7777778e-11 kg m^2 / sec^3
-            2.1166667e-05 kg^2 m / sec
-.fi
+.Bd -literal -offset indent
+You have: ergs/hour
+You want: fathoms kg^2 / day
+conformability error
+        2.7777778e-11 kg m^2 / sec^3
+        2.1166667e-05 kg^2 m / sec
+.Ed
 .Pp
 The conversion information is read from a units data file.
 The default file includes definitions for most familiar units,
diff --git a/usr.bin/usbhidaction/usbhidaction.1 b/usr.bin/usbhidaction/usbhidaction.1
index 447dd54284f..5bbca06ec34 100644
--- a/usr.bin/usbhidaction/usbhidaction.1
+++ b/usr.bin/usbhidaction/usbhidaction.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usbhidaction.1,v 1.3 2003/01/11 11:07:50 hugh Exp $
+.\" $OpenBSD: usbhidaction.1,v 1.4 2003/06/10 09:12:12 jmc Exp $
 .\" $NetBSD: usbhidaction.1,v 1.6 2002/01/18 14:38:59 augustss Exp $
 .\"
 .\" Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -66,10 +66,11 @@ Toggle the daemon flag.
 .It Fl i
 Ignore HID items in the config file that do not exist in the device.
 .It Fl f Ar device
-Specify a path name for the device to operate on.  If
+Specify a path name for the device to operate on.
+If
 .Ar device
-is numeric, it is taken to be the USB HID device number.  If it is a relative
-path, it is taken to be the name of the device under
+is numeric, it is taken to be the USB HID device number.
+If it is a relative path, it is taken to be the name of the device under
 .Pa /dev .
 An absolute path is taken to be the literal device pathname.
 .It Fl v
@@ -78,19 +79,21 @@ Be verbose, and do not become a daemon.
 .Pp
 The config file will be re-read if the process gets a HUP signal.
 .Sh CONFIGURATION
-The configuration file has a very simple format.  Each line describes an
-action; if a line begins with a whitespace it is considered a continuation
-of the previous line.  Lines beginning with `#' are considered as comments.
+The configuration file has a very simple format.
+Each line describes an action; if a line begins with a whitespace
+it is considered a continuation of the previous line.
+Lines beginning with `#' are considered as comments.
 .Pp
 Each line has three parts: a name of a USB HID item, a value for that item,
-and an action.  There must be whitespace between the parts.
+and an action.
+There must be whitespace between the parts.
 .Pp
 The item names are similar to those used by
 .Xr usbhidctl 1 ,
 but each part must be prefixed by its page name.
 .Pp
-The value is simply a numeric value.  When the item reports this value
-the action will be performed.
+The value is simply a numeric value.
+When the item reports this value the action will be performed.
 If the value is `*' it will match any value.
 .Pp
 The action is a normal command that is executed with
diff --git a/usr.bin/usbhidctl/usbhidctl.1 b/usr.bin/usbhidctl/usbhidctl.1
index 68ee62774f3..61626805e65 100644
--- a/usr.bin/usbhidctl/usbhidctl.1
+++ b/usr.bin/usbhidctl/usbhidctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: usbhidctl.1,v 1.5 2002/11/14 02:57:28 deraadt Exp $
+.\" $OpenBSD: usbhidctl.1,v 1.6 2003/06/10 09:12:12 jmc Exp $
 .\" $NetBSD: usbhidctl.1,v 1.14 2001/12/28 17:49:32 augustss Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -70,10 +70,11 @@
 .Op Ar item=value ...
 .Sh DESCRIPTION
 .Nm
-can be used to output or modify the state of a USB HID (Human Interface
-Device).  If a list of items is present on the command line, then
+can be used to output or modify the state of a USB HID (Human Interface Device).
+If a list of items is present on the command line, then
 .Nm
-prints the current value of those items for the specified device.  If the
+prints the current value of those items for the specified device.
+If the
 .Fl w
 flag is specified
 .Nm
@@ -85,27 +86,29 @@ The options are as follows:
 Show all items and their current values.
 This option fails if the device does not support the GET_REPORT command.
 .It Fl f Ar device
-Specify a path name for the device to operate on.  If
+Specify a path name for the device to operate on.
+If
 .Ar device
-is numeric, it is taken to be the USB HID device number.  If it is a relative
-path, it is taken to be the name of the device under
+is numeric, it is taken to be the USB HID device number.
+If it is a relative path, it is taken to be the name of the device under
 .Pa /dev .
 An absolute path is taken to be the literal device pathname.
 .It Fl l
-Loop and dump the device data every time it changes.  Only 'input' items are
-displayed in this mode.
+Loop and dump the device data every time it changes.
+Only 'input' items are displayed in this mode.
 .It Fl n
-Suppress printing of the item name when querying specific items.  Only output
-the current value.
+Suppress printing of the item name when querying specific items.
+Only output the current value.
 .It Fl r
 Dump the USB HID report descriptor.
 .It Fl t Ar table
 Specify a path name for the HID usage table file.
 .It Fl v
-Be verbose.  Repeating this option increases verbosity.
+Be verbose.
+Repeating this option increases verbosity.
 .It Fl w
-Change item values.  Only 'output' and 'feature' kinds can be set with this
-option.
+Change item values.
+Only 'output' and 'feature' kinds can be set with this option.
 .El
 .Sh FILES
 .Pa /usr/share/misc/usb_hid_usages
@@ -113,9 +116,10 @@ The default HID usage table.
 .Sh SYNTAX
 .Nm
 parses the names of items specified on the command line against the human
-interface items reported by the USB device.  Each human interface item is
-mapped from its native form to a human readable name, using the HID usage
-table file.  Command line items are compared with the generated item names,
+interface items reported by the USB device.
+Each human interface item is mapped from its native form to a human readable
+name, using the HID usage table file.
+Command line items are compared with the generated item names,
 and the USB HID device is operated on when a match is found.
 .Pp
 Each human interface item is named by the
@@ -124,7 +128,8 @@ it appears in, the
 .Qq usage
 within that page, and the list of
 .Qq collections
-containing the item.  Each collection in turn is also identified by page, and
+containing the item.
+Each collection in turn is also identified by page, and
 the usage within that page.
 .Pp
 On the
@@ -136,12 +141,13 @@ The collections are separated by the character
 .Pp
 As an alternative notation in items on the command line, the native numeric
 value for the page name or usage can be used instead of the full human
-readable page name or usage name.  Numeric values can be specified in decimal,
-octal or hexadecimal.
+readable page name or usage name.
+Numeric values can be specified in decimal, octal or hexadecimal.
 .Sh EXAMPLES
 On a standard USB mouse the item
 .Dl Generic_Desktop:Mouse.Generic_Desktop:Pointer.Button:Button_2
-reflects the current status of button 2.  The
+reflects the current status of button 2.
+The
 .Qq button 2
 item is encapsulated within two collections, the
 .Qq Mouse
@@ -151,22 +157,23 @@ page, and the
 .Qq Pointer
 collection in the
 .Qq Generic Desktop
-page.  The item itself is the usage
+page.
+The item itself is the usage
 .Qq Button_2
 in the
 .Qq Button
 page.
 .Pp
-An item can generally be named by omitting one or more of the page names.  For
-example the
+An item can generally be named by omitting one or more of the page names.
+For example the
 .Qq button 2
 item would usually just be referred to on the command line as:
 .Dl $ usbhidctl -f /dev/mouse Mouse.Pointer.Button_2
 .Pp
 Items can also be named by referring to parts of the item name with the
-numeric representation of the native HID usage identifiers.  This is most
-useful when items are missing from the HID usage table.  The page identifier
-for the
+numeric representation of the native HID usage identifiers.
+This is most useful when items are missing from the HID usage table.
+The page identifier for the
 .Qq Generic Desktop
 page is 1, and the usage identifier for the usage
 .Qq Button_2
@@ -177,10 +184,12 @@ item:
 .Pp
 Devices with human interface outputs can be manipulated with the
 .Fl w
-option.  For example, some USB mice have a Light Emitting Diode under software
+option.
+For example, some USB mice have a Light Emitting Diode under software
 control as usage 2 under page 0xffff, in the
 .Qq Mouse
-collection.  The following can be used to switch this LED off:
+collection.
+The following can be used to switch this LED off:
 .Dl $ usbhidctl -f /dev/mouse -w Mouse.0xffff:2=0
 .Sh SEE ALSO
 .Xr usbhidaction 1 ,
@@ -196,5 +205,6 @@ command first appeared in
 .An David Sainty Aq David.Sainty@dtsp.co.nz
 .Sh BUGS
 Some USB HID devices report multiple items with exactly the same usage
-identifiers.  The current naming scheme does not provide the means to specify
+identifiers.
+The current naming scheme does not provide the means to specify
 which of a set of identically named items you are referring to.
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 9b21d08c2f3..44bb7c6ec8d 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgrind.1,v 1.9 2003/06/03 02:56:21 millert Exp $
+.\"	$OpenBSD: vgrind.1,v 1.10 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -108,7 +108,7 @@ Varian.
 .It Fl d Ar file
 Specifies an alternate language definitions
 file (default is
-.Pa /usr/share/misc/vgrindefs Ns ).
+.Pa /usr/share/misc/vgrindefs ) .
 .It Fl f
 Forces filter mode.
 .It Fl h Ar header
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 51c4bdbc5ca..5fbe186ad55 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: w.1,v 1.14 2003/06/03 02:56:22 millert Exp $
+.\"	$OpenBSD: w.1,v 1.15 2003/06/10 09:12:12 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -88,7 +88,7 @@ list of users on the system
 .Xr ps 1 ,
 .Xr uptime 1 ,
 .Xr who 1
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The
 .Fl f ,
 .Fl l ,
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index a4362efb4a4..2801ca31dc6 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wc.1,v 1.12 2003/06/03 02:56:22 millert Exp $
+.\"	$OpenBSD: wc.1,v 1.13 2003/06/10 09:12:12 jmc Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -113,11 +113,16 @@ The
 utility exits 0 on success or >0 if an error occurred.
 .Sh SEE ALSO
 .Xr isspace 3
-.Sh COMPATIBILITY
+.Sh STANDARDS
 Historically, the
 .Nm
 utility was documented to define a word as a ``maximal string of
-characters delimited by <space>, <tab> or <newline> characters''.
+characters delimited by
+.Aq space ,
+.Aq tab
+or
+.Aq newline
+characters''.
 The implementation, however, didn't handle non-printing characters
 correctly so that ``  ^D^E  '' counted as 6 spaces, while ``foo^D^Ebar''
 counted as 8 characters.
@@ -129,7 +134,7 @@ in terms of the
 .Xr isspace 3
 function, as required by
 .St -p1003.2-92 .
-.Sh STANDARDS
+.Pp
 The
 .Nm
 utility conforms to
diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1
index 2576dae0449..63fc7839a11 100644
--- a/usr.bin/whatis/whatis.1
+++ b/usr.bin/whatis/whatis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whatis.1,v 1.10 2003/06/03 02:56:22 millert Exp $
+.\"	$OpenBSD: whatis.1,v 1.11 2003/06/10 09:12:12 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -55,7 +55,8 @@ The options are as follows:
 .It Fl C Ar file
 Specify an alternate configuration file in
 .Xr man.conf 5
-format.  The default is
+format.
+The default is
 .Pa /etc/man.conf .
 .It Fl M Ar path
 Override the list of standard directories
diff --git a/usr.bin/which/whereis.1 b/usr.bin/which/whereis.1
index 99237816db2..8cbe22b8f32 100644
--- a/usr.bin/which/whereis.1
+++ b/usr.bin/which/whereis.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whereis.1,v 1.8 2003/06/03 02:56:22 millert Exp $
+.\"	$OpenBSD: whereis.1,v 1.9 2003/06/10 09:12:12 jmc Exp $
 .\"	$NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $
 .\"
 .\" Copyright (c) 1993
@@ -72,7 +72,7 @@ A system error occurred.
 .Xr locate 1 ,
 .Xr which 1 ,
 .Xr sysctl 8
-.Sh COMPATIBILITY
+.Sh STANDARDS
 The historic flags and arguments for the
 .Nm
 utility are no longer available in this version.
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 2590a138e03..c9462ab8ddc 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: which.1,v 1.13 2003/06/03 02:56:22 millert Exp $
+.\"	$OpenBSD: which.1,v 1.14 2003/06/10 09:12:12 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -65,9 +65,6 @@ No names were resolved.
 .It \-1
 A system error occurred.
 .El
-.Sh DIAGNOSTICS
-A diagnostic is given if an executable file with the argument
-name was not found in the path.
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm which :
@@ -81,6 +78,9 @@ or relative pathname,
 .Nm
 will fail.
 .El
+.Sh DIAGNOSTICS
+A diagnostic is given if an executable file with the argument
+name was not found in the path.
 .Sh SEE ALSO
 .Xr csh 1 ,
 .Xr find 1 ,
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 2ffa5c46048..45c26ead2fb 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whois.1,v 1.20 2003/06/03 02:56:23 millert Exp $
+.\"	$OpenBSD: whois.1,v 1.21 2003/06/10 09:12:13 jmc Exp $
 .\"	$NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -49,7 +49,7 @@ The
 .Nm
 utility looks up records in the databases maintained by several
 Network Information Centers
-.Pq Tn NICs Ns .
+.Pq Tn NICs .
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -81,11 +81,11 @@ option with an argument of
 .It Fl d
 Use the US Department of Defense database.
 It contains points of contact for subdomains of
-.Tn \&.MIL Ns .
+.Tn \&.MIL .
 .It Fl g
 Use the US non-military federal government database, which contains points of
 contact for subdomains of
-.Tn \&.GOV Ns .
+.Tn \&.GOV .
 .It Fl h Ar host
 Use the specified host instead of the default NIC
 (whois.crsnic.net).
@@ -102,7 +102,7 @@ automatically for a large number of
 .Tn TLDs .
 .Pp
 In the event that an IP
-address is specified, the whois server will default to the American   
+address is specified, the whois server will default to the American
 Registry for Internet Numbers
 .Pq Tn ARIN .
 If a query to
@@ -139,7 +139,7 @@ Also, note that the
 database
 .Pq Pa whois.internic.net
 is no longer handled by Network Solutions, Inc.
-For details, see 
+For details, see
 .Pa http://www.internic.net/ .
 .Pp
 (Hint: Contact information, identified by the term
@@ -156,7 +156,7 @@ Use the Latin American and Caribbean IP address Regional Registry
 .Pq Tn LACNIC
 database.
 It contains network numbers used in much of Latin America and the
-Caribbean. 
+Caribbean.
 .It Fl m
 Use the Route Arbiter Database
 .Pq Tn RADB
@@ -192,9 +192,9 @@ Use the Russia Network Information Center
 database.
 It contains network numbers and domain contact information
 for subdomains of
-.Tn \&.RU Ns .
+.Tn \&.RU .
 This option is deprecated; use the
-.Fl c   
+.Fl c
 option with an argument of
 .Qq Li RU
 instead.
@@ -284,7 +284,7 @@ a whois server using a non-standard port, where
 .Dq Li query-data
 is the query to be sent to
 .Dq Li whois.example.com
-on port    
+on port
 .Dq Li rwhois
 (written numerically as 4321).
 .Pp
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index c10cab69337..9d2124f8e5d 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: window.1,v 1.15 2003/06/03 02:56:23 millert Exp $
+.\"	$OpenBSD: window.1,v 1.16 2003/06/10 09:12:13 jmc Exp $
 .\"	$NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -303,7 +303,7 @@ Close window
 The process in the window is sent
 the hangup signal (see
 .Xr kill 1 ) .
-.Xr Csh 1
+.Xr csh 1
 should
 handle this signal correctly and cause no problems.
 .It Ic m Ns Ar #
diff --git a/usr.bin/x99token/x99token.1 b/usr.bin/x99token/x99token.1
index b9c7fe8b093..c5b373ab872 100644
--- a/usr.bin/x99token/x99token.1
+++ b/usr.bin/x99token/x99token.1
@@ -1,9 +1,9 @@
-.\" $OpenBSD: x99token.1,v 1.6 2003/02/15 09:44:42 jmc Exp $
+.\" $OpenBSD: x99token.1,v 1.7 2003/06/10 09:12:13 jmc Exp $
 .\"
 .\" X9.9 calculator
 .\" This software is provided AS IS with no express or implied warranty
 .\" October 1995, Paul Borman <prb@krystal.com>
-.\" 
+.\"
 .\" Donated to the Public Domain by Paul Borman
 .\"
 .Dd August 1, 2001
@@ -77,7 +77,8 @@ ADD 0x30 (ASCII value of '0') to each byte
 .El
 .Pp
 The resulting 8 bytes are all ASCII decimal digits and are the
-predicted challenge.  This process may be repeated.
+predicted challenge.
+This process may be repeated.
 .Sh FILES
 .Bl -tag -width $HOME/.keyfile.des -compact
 .It Pa $HOME/.keyfile.des
@@ -87,12 +88,12 @@ default keyfile
 .Xr tokenadm 8 ,
 .Xr tokeninit 8
 .Sh AUTHORS
-Paul Borman <prb@krystal.com>
+.An Paul Borman Aq prb@krystal.com
 .Sh CAVEATS
-This is a very simple-minded program.  
+This is a very simple-minded program.
 The keyfile should be placed on a floppy disk which is kept physically secure.
 .Pp
 Having not read the X9.9 standard, this may not be a complete or accurate
-implementation of the standard.  
+implementation of the standard.
 This software is provided AS IS
 with no express or implied warranty.
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 0ae652d6d73..cc944db3471 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: install.1,v 1.18 2003/06/03 02:56:24 millert Exp $
+.\"	$OpenBSD: install.1,v 1.19 2003/06/10 09:12:13 jmc Exp $
 .\"	$NetBSD: install.1,v 1.4 1994/11/14 04:57:17 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -172,6 +172,15 @@ creates an empty file.
 .Pp
 Upon successful completion a value of 0 is returned.
 Otherwise, a value >0 is returned.
+.Sh ENVIRONMENT
+.Bl -tag -width "STRIP"
+.It Ev STRIP
+For an alternate
+.Xr strip 1
+program to run.
+Default is
+.Pa /usr/bin/strip .
+.El
 .Sh FILES
 .Bl -tag -width INS@XXXXXX -compact
 .It Pa INS@XXXXXX
@@ -188,15 +197,6 @@ where XXXXXX is decided by
 .Xr mkstemp 3 ,
 are created in the target directory.
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width "STRIP"
-.It Ev STRIP
-For an alternate
-.Xr strip 1
-program to run.
-Default is
-.Pa /usr/bin/strip .
-.El
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr chgrp 1 ,
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 32eef029383..fa7c066d75c 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lint.1,v 1.12 2001/02/09 14:37:34 aaron Exp $
+.\"	$OpenBSD: lint.1,v 1.13 2003/06/10 09:12:13 jmc Exp $
 .\"	$NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
@@ -240,12 +240,12 @@ traditional C.
 Warnings for constructs which behave differently in
 traditional C and ANSI C are suppressed.
 Preprocessor macros describing the machine type (e.g.,
-.Li sun3 Ns )
+.Li sun3 )
 and machine architecture (e.g.,
-.Li m68k Ns )
+.Li m68k )
 are defined without leading and trailing underscores.
 The keywords
-.Sy const Ns ,
+.Sy const ,
 .Sy volatile
 and
 .Sy signed
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 239c952dcb8..544922e9a28 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yacc.1,v 1.15 2003/06/03 02:56:24 millert Exp $
+.\"	$OpenBSD: yacc.1,v 1.16 2003/06/10 09:12:13 jmc Exp $
 .\"
 .\" Copyright (c) 1989, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -161,13 +161,6 @@ and
 are created if
 .Dv YYDEBUG
 is defined and non-zero.
-.Sh DIAGNOSTICS
-If there are rules that are never reduced, the number of such rules is
-written to the standard error.
-If there are any
-.Tn LALR(1)
-conflicts, the number of conflicts is also written
-to the standard error.
 .Sh FILES
 .Bl -tag -width /tmp/yacc.uXXXXXXXXXX -compact
 .It Pa y.code.c
@@ -178,6 +171,13 @@ to the standard error.
 .It Pa /tmp/yacc.tXXXXXXXXXX
 .It Pa /tmp/yacc.uXXXXXXXXXX
 .El
+.Sh DIAGNOSTICS
+If there are rules that are never reduced, the number of such rules is
+written to the standard error.
+If there are any
+.Tn LALR(1)
+conflicts, the number of conflicts is also written
+to the standard error.
 .Sh SEE ALSO
 .Xr yyfix 1
 .Sh STANDARDS