From: aaron <aaron@openbsd.org>
Date: Sat, 15 Apr 2000 02:15:09 +0000 (+0000)
Subject: Mostly punctuation fixes.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f885a5274d3b804af634a3a47ca4a09d1818545f;p=openbsd

Mostly punctuation fixes.
---

diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index 9f6f18509ec..bc500674202 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csh.1,v 1.33 2000/03/17 18:15:12 aaron Exp $
+.\"	$OpenBSD: csh.1,v 1.34 2000/04/15 02:15:09 aaron Exp $
 .\"	$NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -1329,7 +1329,7 @@ instead of just
 Several of the built-in commands (to be described later)
 take expressions, in which the operators are similar to those of C, with
 the same precedence, but with the
-.Em opposite grouping:
+.Em opposite grouping :
 right to left.
 These expressions appear in the
 .Ic @ ,
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 6b14f8d4a27..2423970118e 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ed.1,v 1.22 2000/03/21 14:40:14 aaron Exp $
+.\"	$OpenBSD: ed.1,v 1.23 2000/04/15 02:15:10 aaron Exp $
 .\"
 .Dd May 2, 1993
 .Dt ED 1
@@ -157,8 +157,7 @@ The offset may include any combination of digits, operators (i.e.,
 ,
 .Em -
 and
-.Em ^
-)
+.Em ^ )
 and whitespace.
 Addresses are read from left to right, and their values are computed
 relative to the current address.
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index fe88f2fcf30..473110b83d4 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.19 2000/03/23 21:10:23 aaron Exp $
+.\"	$OpenBSD: pax.1,v 1.20 2000/04/15 02:15:10 aaron Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -809,7 +809,7 @@ The default
 .Ar limit
 is a small positive number of retries.
 .Pp
-.Em Warning:
+.Em Warning :
 Using this option with
 .Li NONE
 should be used with extreme caution as
diff --git a/lib/libc/crypt/arc4random.3 b/lib/libc/crypt/arc4random.3
index 1c3ddcb1b11..f4116a1e826 100644
--- a/lib/libc/crypt/arc4random.3
+++ b/lib/libc/crypt/arc4random.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: arc4random.3,v 1.12 2000/04/02 17:59:04 millert Exp $
+.\" $OpenBSD: arc4random.3,v 1.13 2000/04/15 02:15:22 aaron Exp $
+.\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
@@ -33,8 +34,8 @@
 .Dt ARC4RANDOM 3
 .Os
 .Sh NAME
-.Nm arc4random,
-.Nm arc4random_stir,
+.Nm arc4random ,
+.Nm arc4random_stir ,
 .Nm arc4random_addrandom
 .Nd arc4 random number generator
 .Sh SYNOPSIS
diff --git a/lib/libc/crypt/blowfish.3 b/lib/libc/crypt/blowfish.3
index 41dfb59bc9b..b5fdae92b19 100644
--- a/lib/libc/crypt/blowfish.3
+++ b/lib/libc/crypt/blowfish.3
@@ -1,4 +1,5 @@
-.\" $OpenBSD: blowfish.3,v 1.7 2000/03/14 21:31:44 aaron Exp $
+.\" $OpenBSD: blowfish.3,v 1.8 2000/04/15 02:15:22 aaron Exp $
+.\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
@@ -33,8 +34,8 @@
 .Dt BLOWFISH 3
 .Os
 .Sh NAME
-.Nm blf_key,
-.Nm blf_enc,
+.Nm blf_key ,
+.Nm blf_enc ,
 .Nm blf_dec
 .Nd Blowfish encryption
 .Sh SYNOPSIS
diff --git a/lib/libc/crypt/crypt.3 b/lib/libc/crypt/crypt.3
index 11f465faa82..daa9c4d844a 100644
--- a/lib/libc/crypt/crypt.3
+++ b/lib/libc/crypt/crypt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: crypt.3,v 1.14 2000/01/22 02:17:55 aaron Exp $
+.\" $OpenBSD: crypt.3,v 1.15 2000/04/15 02:15:22 aaron Exp $
 .\"
 .\" FreeSec: libcrypt
 .\"
@@ -234,8 +234,7 @@ iterations of
 and stores the 64-bit result in the 8 characters at
 .Fa out
 (which may be the same as
-.Fa in
-).
+.Fa in ) .
 The
 .Fa salt
 specifies perturbations to the
diff --git a/lib/libc/gen/directory.3 b/lib/libc/gen/directory.3
index 0518a2d8732..a0b7e01b6af 100644
--- a/lib/libc/gen/directory.3
+++ b/lib/libc/gen/directory.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: directory.3,v 1.11 2000/03/23 22:09:39 d Exp $
+.\"	$OpenBSD: directory.3,v 1.12 2000/04/15 02:15:22 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -114,7 +114,7 @@ On successful return, the pointer returned at
 will have the same value as the argument
 .Fa entry .
 Upon reaching the end of the directory stream, this pointer shall have the value
-.Dv NULL.
+.Dv NULL .
 .Pp
 The
 .Fn telldir
diff --git a/lib/libc/gen/getpwent.3 b/lib/libc/gen/getpwent.3
index e001e020150..f736ae6b391 100644
--- a/lib/libc/gen/getpwent.3
+++ b/lib/libc/gen/getpwent.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpwent.3,v 1.9 1999/07/09 13:35:17 aaron Exp $
+.\"	$OpenBSD: getpwent.3,v 1.10 2000/04/15 02:15:22 aaron Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -168,7 +168,7 @@ The
 .Fn getpwent ,
 .Fn getpwnam ,
 .Fn getpwuid ,
-.Fn setpwent,
+.Fn setpwent ,
 and
 .Fn endpwent
 functions appeared in
diff --git a/lib/libc/gen/glob.3 b/lib/libc/gen/glob.3
index 57d77818611..e7a09744442 100644
--- a/lib/libc/gen/glob.3
+++ b/lib/libc/gen/glob.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: glob.3,v 1.13 1999/09/02 15:54:29 aaron Exp $
+.\"	$OpenBSD: glob.3,v 1.14 2000/04/15 02:15:22 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -81,7 +81,7 @@ and read permission on each directory of any filename component of
 .Fa pattern
 that contains any of the special characters
 .Ql * ,
-.Ql ?
+.Ql ? ,
 or
 .Ql [ .
 .Pp
@@ -420,13 +420,13 @@ function is expected to conform to
 and
 .St -xpg4.2 .
 Note, however, that the flags
-.Dv GLOB_ALTDIRFUNC,
-.Dv GLOB_BRACE,
-.Dv GLOB_MAGCHAR,
-.Dv GLOB_NOMAGIC,
-.Dv GLOB_QUOTE,
+.Dv GLOB_ALTDIRFUNC ,
+.Dv GLOB_BRACE ,
+.Dv GLOB_MAGCHAR ,
+.Dv GLOB_NOMAGIC ,
+.Dv GLOB_QUOTE ,
 and
-.Dv GLOB_TILDE,
+.Dv GLOB_TILDE ,
 and the fields
 .Fa gl_matchc
 and
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index a539a987c3f..aced5ba6167 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostbyname.3,v 1.13 2000/01/05 01:04:14 deraadt Exp $
+.\"	$OpenBSD: gethostbyname.3,v 1.14 2000/04/15 02:15:22 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -75,7 +75,7 @@ referenced by name or by address, respectively.
 This structure contains either information obtained from the name server (i.e.,
 .Xr resolver 3
 and
-.Xr named 8 ),
+.Xr named 8 ) ,
 broken-out fields from a line in
 .Pa /etc/hosts ,
 or database entries supplied by the
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 8943b9a3b14..8c2bb0caf69 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: inet6_option_space.3,v 1.4 2000/04/12 21:48:01 aaron Exp $
+.\"	$OpenBSD: inet6_option_space.3,v 1.5 2000/04/15 02:15:23 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1987, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -180,7 +180,8 @@ before calling this function.
 The option type must have a value from
 .Li 2
 to
-.Li 255 , inclusive.
+.Li 255 ,
+inclusive.
 .Po
 .Li 0
 and
@@ -406,7 +407,8 @@ on an error.
 .Pp
 .Fn inet6_option_alloc
 returns
-.Dv NULL on an error.
+.Dv NULL
+on an error.
 .Pp
 On errors,
 .Fn inet6_option_next
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index f4917464776..eb2e1d71aeb 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: regex.3,v 1.13 2000/03/14 21:31:45 aaron Exp $
+.\"	$OpenBSD: regex.3,v 1.14 2000/04/15 02:15:23 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -308,7 +308,7 @@ both of type
 (a signed arithmetic type at least as large as an
 .Li off_t
 and a
-.Li ssize_t ),
+.Li ssize_t ) ,
 containing respectively the offset of the first character of a substring
 and the offset of the first character after the end of the substring.
 Offsets are measured from the beginning of the
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 161faba393c..a37ee5231ad 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpc.3,v 1.19 1999/06/16 08:45:11 alex Exp $
+.\"	$OpenBSD: rpc.3,v 1.20 2000/04/15 02:15:23 aaron Exp $
 .\" Mostly converted to mandoc by Theo de Raadt, Tue Feb 24 04:04:46 MST 1998
 .\"
 .Dd February 16, 1988
@@ -888,8 +888,7 @@ is zero,
 .Tn IPPROTO_UDP
 or
 .B
-.Tn IPPROTO_TCP
-).
+.Tn IPPROTO_TCP ) .
 The procedure
 .Fa dispatch
 has the following form:
diff --git a/lib/libc/stdio/fseek.3 b/lib/libc/stdio/fseek.3
index a20f47d10c5..cb14e62a968 100644
--- a/lib/libc/stdio/fseek.3
+++ b/lib/libc/stdio/fseek.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fseek.3,v 1.5 2000/02/21 22:11:22 millert Exp $
+.\"	$OpenBSD: fseek.3,v 1.6 2000/04/15 02:15:23 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -137,8 +137,8 @@ are alternate interfaces equivalent to
 and
 .Fn fseek
 (with whence set to
-.Dv SEEK_SET
-), setting and storing the current value of
+.Dv SEEK_SET ) ,
+setting and storing the current value of
 the file offset into or from the object referenced by
 .Fa pos .
 On some
diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3
index 8cebcdd714e..d76e8327b37 100644
--- a/lib/libc/stdio/printf.3
+++ b/lib/libc/stdio/printf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printf.3,v 1.23 2000/04/12 08:00:17 hugh Exp $
+.\"	$OpenBSD: printf.3,v 1.24 2000/04/15 02:15:24 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -86,7 +86,7 @@ as described below.
 and
 .Fn vprintf
 write output to
-.Em stdout,
+.Em stdout ,
 the standard output stream;
 .Fn fprintf
 and
diff --git a/lib/libc/stdio/stdio.3 b/lib/libc/stdio/stdio.3
index 93886ed4b2e..b49d87d61e5 100644
--- a/lib/libc/stdio/stdio.3
+++ b/lib/libc/stdio/stdio.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stdio.3,v 1.10 1999/07/09 13:35:23 aaron Exp $
+.\"	$OpenBSD: stdio.3,v 1.11 2000/04/15 02:15:24 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -173,7 +173,7 @@ without first removing their current definitions with
 .Dv FOPEN_MAX ,
 .Dv L_cuserid ,
 .Dv L_ctermid ,
-.Dv L_tmpnam,
+.Dv L_tmpnam ,
 .Dv NULL ,
 .Dv SEEK_END ,
 .Dv SEEK_SET ,
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index 6967e52a960..c24a5940133 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: brk.2,v 1.10 2000/03/14 21:31:40 aaron Exp $
+.\"	$OpenBSD: brk.2,v 1.11 2000/04/15 02:15:24 aaron Exp $
 .\"	$NetBSD: brk.2,v 1.7 1995/02/27 12:31:57 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -103,7 +103,7 @@ beyond the
 value returned from a call to
 .Xr getrlimit ,
 e.g.,
-.Dq etext + rlp\(->rlim_max.
+.Dq etext + rlp\(->rlim_max .
 (see
 .Xr end 3
 for the definition of
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 3bb68d904b6..532ef11970b 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: clock_gettime.2,v 1.9 1999/10/05 17:12:26 aaron Exp $
+.\"	$OpenBSD: clock_gettime.2,v 1.10 2000/04/15 02:15:24 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -82,7 +82,7 @@ struct timespec {
 .Pp
 Only the super-user may set the time of day.
 If the system securelevel is greater than 1 (see
-.Xr init 8 ),
+.Xr init 8 ) ,
 the time may only be advanced.
 This limitation is imposed to prevent a malicious super-user
 from setting arbitrary time stamps on files.
diff --git a/lib/libc/sys/fhopen.2 b/lib/libc/sys/fhopen.2
index aac31faf04d..5d4702a04be 100644
--- a/lib/libc/sys/fhopen.2
+++ b/lib/libc/sys/fhopen.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fhopen.2,v 1.1 2000/02/07 05:01:13 assar Exp $
+.\"	$OpenBSD: fhopen.2,v 1.2 2000/04/15 02:15:24 aaron Exp $
 .\"	$NetBSD: fhopen.2,v 1.2 1999/12/02 21:42:36 kleink Exp $
 .\"
 .\" Copyright (c) 1999 National Aeronautics & Space Administration
@@ -53,7 +53,7 @@
 .Fn fhstatfs "const fhandle_t *fhp" "struct statfs *buf"
 .Sh DESCRIPTION
 These functions provide a means to access a file given the file handle
-.Fa fhp.
+.Fa fhp .
 As this method bypasses directory access restrictions, these calls are
 restricted to the superuser.
 .Pp
diff --git a/lib/libc/sys/getsockopt.2 b/lib/libc/sys/getsockopt.2
index 11834aa9304..3f04eca96f8 100644
--- a/lib/libc/sys/getsockopt.2
+++ b/lib/libc/sys/getsockopt.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getsockopt.2,v 1.14 1999/08/15 13:14:11 deraadt Exp $
+.\"	$OpenBSD: getsockopt.2,v 1.15 2000/04/15 02:15:24 aaron Exp $
 .\"	$NetBSD: getsockopt.2,v 1.7 1995/02/27 12:33:29 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -191,8 +191,8 @@ are queued on socket and a
 .Xr close 2
 is performed.
 If the socket promises reliable delivery of data and
-.Dv SO_LINGER is set,
-the system will block the process on the
+.Dv SO_LINGER
+is set, the system will block the process on the
 .Xr close 2
 attempt until it is able to transmit the data or until it decides it
 is unable to deliver the information (a timeout period measured in seconds,
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index 29c8fe20c43..9ba18540e34 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gettimeofday.2,v 1.8 1999/08/31 16:52:35 aaron Exp $
+.\"	$OpenBSD: gettimeofday.2,v 1.9 2000/04/15 02:15:24 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -99,7 +99,7 @@ the appropriate part of the year.
 .Pp
 Only the super-user may set the time of day or time zone.
 If the system securelevel is greater than 1 (see
-.Xr init 8 ),
+.Xr init 8 ) ,
 the time may only be advanced.
 This limitation is imposed to prevent a malicious super-user
 from setting arbitrary time stamps on files.
diff --git a/lib/libc/sys/recv.2 b/lib/libc/sys/recv.2
index b52b61a59e9..9630db8a2b7 100644
--- a/lib/libc/sys/recv.2
+++ b/lib/libc/sys/recv.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: recv.2,v 1.22 1999/09/26 14:16:31 espie Exp $
+.\"	$OpenBSD: recv.2,v 1.23 2000/04/15 02:15:24 aaron Exp $
 .\"	$NetBSD: recv.2,v 1.6 1995/02/27 12:36:08 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -252,7 +252,7 @@ The socket is associated with a connection-oriented protocol
 and has not been connected (see
 .Xr connect 2
 and
-.Xr accept 2 ).
+.Xr accept 2 ) .
 .It Bq Er ENOTSOCK
 The argument
 .Fa s
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index c807b5f0969..f3959a85b06 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: select.2,v 1.16 2000/01/22 02:17:55 aaron Exp $
+.\"	$OpenBSD: select.2,v 1.17 2000/04/15 02:15:24 aaron Exp $
 .\"	$NetBSD: select.2,v 1.5 1995/06/27 22:32:28 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -242,14 +242,14 @@ before and after the call to
 and using
 .Fn timersub
 (as described in
-.Xr getitimer 2 Ns ).
+.Xr getitimer 2 ) .
 .Pp
 Internally to the kernel,
 .Fn select
 works poorly if multiple processes wait on the same file descriptor.
 Given that, it is rather surprising to see that many daemons are
 written that way (i.e.,
-.Xr httpd 8 ).
+.Xr httpd 8 ) .
 .Sh HISTORY
 The
 .Fn select
diff --git a/lib/libc/sys/shmat.2 b/lib/libc/sys/shmat.2
index 51d020b5a36..8d93f37adfb 100644
--- a/lib/libc/sys/shmat.2
+++ b/lib/libc/sys/shmat.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shmat.2,v 1.9 1999/09/23 04:12:00 alex Exp $
+.\"	$OpenBSD: shmat.2,v 1.10 2000/04/15 02:15:25 aaron Exp $
 .\"	$NetBSD: shmat.2,v 1.2 1997/03/27 08:20:38 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -65,8 +65,7 @@ the system will round the address down to a multiple of
 bytes
 .Pf ( Dv SHMLBA
 is defined in
-.Aq Pa sys/shm.h
-).
+.Aq Pa sys/shm.h ) .
 .Pp
 A shared memory segment can be mapped read-only by specifying the
 .Dv SHM_RDONLY
diff --git a/lib/libc/termios/tcsendbreak.3 b/lib/libc/termios/tcsendbreak.3
index 9f59951d2b7..c20ea9f86b4 100644
--- a/lib/libc/termios/tcsendbreak.3
+++ b/lib/libc/termios/tcsendbreak.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcsendbreak.3,v 1.5 1999/07/05 13:09:08 aaron Exp $
+.\"	$OpenBSD: tcsendbreak.3,v 1.6 2000/04/15 02:15:25 aaron Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -80,7 +80,7 @@ transmitting data to the system.
 in the
 .Ql Input Modes
 section of
-.Xr termios 4 ).
+.Xr termios 4 ) .
 .It Dv TCION
 Transmit a START character, which is intended to cause the terminal to start
 transmitting data to the system.
@@ -88,7 +88,7 @@ transmitting data to the system.
 .Dv IXOFF in the
 .Ql Input Modes
 section of
-.Xr termios 4 ).
+.Xr termios 4 ) .
 .El
 .Pp
 The
diff --git a/lib/libc/termios/tcsetattr.3 b/lib/libc/termios/tcsetattr.3
index e1e305ba585..1c4fa677622 100644
--- a/lib/libc/termios/tcsetattr.3
+++ b/lib/libc/termios/tcsetattr.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcsetattr.3,v 1.9 1999/07/05 13:09:08 aaron Exp $
+.\"	$OpenBSD: tcsetattr.3,v 1.10 2000/04/15 02:15:25 aaron Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -206,7 +206,7 @@ function sets the flags stored in the
 .Li termios
 structure to a state disabling
 all input and output processing, giving a
-.Dq raw I/O path.
+.Dq raw I/O path .
 It should be noted that there is no function to reverse this effect.
 This is because there are a variety of processing options that could be
 re-enabled and the correct method is for an application to snapshot the
diff --git a/lib/libc/time/ctime.3 b/lib/libc/time/ctime.3
index 5dedb511376..77b76317040 100644
--- a/lib/libc/time/ctime.3
+++ b/lib/libc/time/ctime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctime.3,v 1.20 2000/03/31 00:10:14 millert Exp $
+.\"	$OpenBSD: ctime.3,v 1.21 2000/04/15 02:15:26 aaron Exp $
 .\"
 .\"
 .Dd February 16, 1999
@@ -266,8 +266,7 @@ field of a returned
 points to a static array of characters, which
 will also be overwritten at the next call
 (and by calls to
-.Fn tzset
-).
+.Fn tzset ) .
 .Pp
 The default system time zone may be set by running
 .Li Dq zic -l timezone
diff --git a/lib/libc_r/man/pread.3 b/lib/libc_r/man/pread.3
index c4f151650ab..4ac9889136e 100644
--- a/lib/libc_r/man/pread.3
+++ b/lib/libc_r/man/pread.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pread.3,v 1.7 1999/07/09 13:35:25 aaron Exp $
+.\" $OpenBSD: pread.3,v 1.8 2000/04/15 02:15:26 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1998. Public domain.
 .Dd September 7, 1998
 .Dt PREAD 3
@@ -18,7 +18,7 @@ function reads
 bytes from offset
 .Fa offset
 in the file opened on file descriptor
-.Fa filedes.
+.Fa filedes .
 .Pp
 This function is provided for use in a threaded, parallel I/O
 environment, where race conditions may exist between two threads
diff --git a/lib/libc_r/man/pthread_attr_setstackaddr.3 b/lib/libc_r/man/pthread_attr_setstackaddr.3
index 03bed1a9a89..dec5d0fc999 100644
--- a/lib/libc_r/man/pthread_attr_setstackaddr.3
+++ b/lib/libc_r/man/pthread_attr_setstackaddr.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_attr_setstackaddr.3,v 1.2 2000/04/12 21:48:02 aaron Exp $
+.\" $OpenBSD: pthread_attr_setstackaddr.3,v 1.3 2000/04/15 02:15:26 aaron Exp $
 .\" Manual page derived from TOG's UNIX98 documentation.
 .Dd January 6, 2000
 .Dt PTHREAD_ATTR_SETSTACKADDR 3
@@ -30,7 +30,7 @@ The
 attribute specifies the location of storage to be
 used for the created thread's stack. The size of the storage is at
 least
-.Dv PTHREAD_STACK_MIN.
+.Dv PTHREAD_STACK_MIN .
 .Sh RETURN VALUE
 Upon successful completion,
 .Fn pthread_attr_setstackaddr
diff --git a/lib/libc_r/man/pthread_set_name_np.3 b/lib/libc_r/man/pthread_set_name_np.3
index 8079a230c5c..2de216bb1cf 100644
--- a/lib/libc_r/man/pthread_set_name_np.3
+++ b/lib/libc_r/man/pthread_set_name_np.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_set_name_np.3,v 1.2 2000/04/12 21:48:03 aaron Exp $
+.\" $OpenBSD: pthread_set_name_np.3,v 1.3 2000/04/15 02:15:26 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1999. Public domain.
 .Dd December 19, 1999
 .Dt PTHREAD_SET_NAME_NP 3
@@ -17,7 +17,7 @@ The
 function associates
 .Fa name
 with
-.Fa thread.
+.Fa thread .
 This can be useful for debugging, as the name is displayed in
 the thread status as displayed when the process receives the
 .Dv SIGINFO
diff --git a/lib/libc_r/man/pwrite.3 b/lib/libc_r/man/pwrite.3
index 0de1b53e5ec..443d505072b 100644
--- a/lib/libc_r/man/pwrite.3
+++ b/lib/libc_r/man/pwrite.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pwrite.3,v 1.7 1999/07/09 13:35:25 aaron Exp $
+.\" $OpenBSD: pwrite.3,v 1.8 2000/04/15 02:15:26 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1998. Public domain.
 .Dd September 7, 1998
 .Dt PWRITE 3
@@ -18,7 +18,7 @@ function writes
 bytes from offset
 .Fa offset
 in the file opened on file descriptor
-.Fa filedes.
+.Fa filedes .
 .Pp
 This function is provided for use in a threaded, parallel I/O
 environment, where race conditions may exist between two threads
diff --git a/lib/libcompat/4.1/vlimit.3 b/lib/libcompat/4.1/vlimit.3
index 3c798ec1aff..9266d671b77 100644
--- a/lib/libcompat/4.1/vlimit.3
+++ b/lib/libcompat/4.1/vlimit.3
@@ -81,7 +81,7 @@ the size of the largest core dump that will be created.
 a soft limit for the amount of physical memory (in bytes) to be given
 to the program.  If memory is tight, the system will prefer to take memory
 from processes which are exceeding their declared
-.Dv LIM_MAXRSS.
+.Dv LIM_MAXRSS .
 .El
 .Pp
 Because this information is stored in the per-process information
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index e5ff2b031bd..682f6eb2cac 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: editline.3,v 1.9 1999/07/09 13:35:25 aaron Exp $
+.\"	$OpenBSD: editline.3,v 1.10 2000/04/15 02:15:27 aaron Exp $
 .\"	$NetBSD: editline.3,v 1.4 1997/01/14 04:17:23 lukem Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -339,7 +339,7 @@ Expecting further command input as arguments, do nothing visually.
 Refresh display.
 .It Dv CC_CURSOR
 Cursor moved, so update and perform
-.Dv CC_REFRESH.
+.Dv CC_REFRESH .
 .It Dv CC_REDISPLAY
 Redisplay entire input line.
 This is useful if a key binding outputs extra information.
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 940c5bd7e56..ab482ee1086 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: editrc.5,v 1.10 2000/03/14 21:31:46 aaron Exp $
+.\"	$OpenBSD: editrc.5,v 1.11 2000/04/15 02:15:27 aaron Exp $
 .\"	$NetBSD: editrc.5,v 1.4 1997/04/24 20:20:31 christos Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -222,7 +222,7 @@ causes messages to be verbose.
 List the history.
 .It Ic telltc
 List the values of all the terminal capabilities (see
-.Xr termcap 5 ).
+.Xr termcap 5 ) .
 .It Ic settc Ar cap Ar val
 Set the terminal capability
 .Ar cap
diff --git a/lib/libkeynote/keynote.3 b/lib/libkeynote/keynote.3
index 6d1587be44e..ba93eee1d71 100644
--- a/lib/libkeynote/keynote.3
+++ b/lib/libkeynote/keynote.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.3,v 1.21 2000/04/12 21:48:03 aaron Exp $
+.\" $OpenBSD: keynote.3,v 1.22 2000/04/15 02:15:27 aaron Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -63,7 +63,7 @@ struct keynote_keylist
 };
 .Ed
 .Ft int
-.Fd keynote_errno;
+.Fd keynote_errno ;
 .Ft int
 .Fn kn_init "void"
 .Ft int
@@ -792,7 +792,7 @@ and sets
 to
 .Er ERROR_NOTFOUND
 if one of the arguments was
-.Dv NULL,
+.Dv NULL ,
 .Er ERROR_MEMORY
 if necessary memory could not be allocated, or
 .Er ERROR_SYNTAX
diff --git a/lib/libkeynote/keynote.5 b/lib/libkeynote/keynote.5
index ad9bfa8605b..b6a0031eb2e 100644
--- a/lib/libkeynote/keynote.5
+++ b/lib/libkeynote/keynote.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: keynote.5,v 1.3 2000/04/12 21:48:04 aaron Exp $
+.\" $OpenBSD: keynote.5,v 1.4 2000/04/15 02:15:27 aaron Exp $
 .\"
 .\" The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
 .\"
@@ -443,7 +443,7 @@ assertions difficult to understand and is discouraged).
 .Pp
 <RegExpr> is a standard regular expression, conforming to the POSIX
 1003.2 regular expression syntax and semantics (see
-.Xr regex 3 ).
+.Xr regex 3 ) .
 .Pp
 Any string expression (or attribute) containing the ASCII
 representation of a numeric value can be converted to an integer or
diff --git a/lib/libkvm.old/kvm_getfiles.3 b/lib/libkvm.old/kvm_getfiles.3
index c2bd9df3525..e8ed4c3d912 100644
--- a/lib/libkvm.old/kvm_getfiles.3
+++ b/lib/libkvm.old/kvm_getfiles.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_getfiles.3,v 1.5 2000/01/05 20:35:51 deraadt Exp $
+.\"	$OpenBSD: kvm_getfiles.3,v 1.6 2000/04/15 02:15:28 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,7 +56,7 @@
 .Sh DESCRIPTION
 .Fn kvm_getfiles
 returns a (sub-)set of the open files in the kernel indicated by
-.Fa kd.
+.Fa kd .
 The
 .Fa op
 and
diff --git a/lib/libkvm.old/kvm_getprocs.3 b/lib/libkvm.old/kvm_getprocs.3
index 887f36c3df6..02f59a2c289 100644
--- a/lib/libkvm.old/kvm_getprocs.3
+++ b/lib/libkvm.old/kvm_getprocs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_getprocs.3,v 1.4 1999/07/09 13:35:26 aaron Exp $
+.\"	$OpenBSD: kvm_getprocs.3,v 1.5 2000/04/15 02:15:28 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -59,7 +59,7 @@
 .Sh DESCRIPTION
 .Fn kvm_getprocs
 returns a (sub-)set of active processes in the kernel indicated by
-.Fa kd.
+.Fa kd .
 The
 .Fa op
 and
diff --git a/lib/libkvm.old/kvm_open.3 b/lib/libkvm.old/kvm_open.3
index e297dd20052..14325d69d38 100644
--- a/lib/libkvm.old/kvm_open.3
+++ b/lib/libkvm.old/kvm_open.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_open.3,v 1.3 1999/07/09 13:35:26 aaron Exp $
+.\"	$OpenBSD: kvm_open.3,v 1.4 2000/04/15 02:15:28 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -141,7 +141,7 @@ Instead, the application obtains the error message
 corresponding to the most recent kvm library call using
 .Fn kvm_geterr
 (see
-.Xr kvm_geterr 3 ).
+.Xr kvm_geterr 3 ) .
 The results are undefined if the most recent kvm call did not produce
 an error.
 Since
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index 3c94fdf8ceb..24480e64795 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_getfiles.3,v 1.7 2000/03/04 15:29:56 aaron Exp $
+.\"	$OpenBSD: kvm_getfiles.3,v 1.8 2000/04/15 02:15:28 aaron Exp $
 .\"	$NetBSD: kvm_getfiles.3,v 1.3 1996/03/18 22:33:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -56,7 +56,7 @@
 .Sh DESCRIPTION
 .Fn kvm_getfiles
 returns a (sub-)set of the open files in the kernel indicated by
-.Fa kd.
+.Fa kd .
 The
 .Fa op
 and
diff --git a/lib/libm/man/exp.3 b/lib/libm/man/exp.3
index 517a61bb8b9..7276c371bb0 100644
--- a/lib/libm/man/exp.3
+++ b/lib/libm/man/exp.3
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: exp.3,v 1.9 2000/03/14 21:31:46 aaron Exp $
+.\"	$OpenBSD: exp.3,v 1.10 2000/04/15 02:15:28 aaron Exp $
+.\"
 .\" Copyright (c) 1985, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -89,7 +90,7 @@ function computes the value exp(x)\-1 accurately even for tiny argument
 The
 .Fn log
 function computes the value of the natural logarithm of argument
-.Fa x.
+.Fa x .
 .Pp
 The
 .Fn log10
diff --git a/lib/libm/man/lgamma.3 b/lib/libm/man/lgamma.3
index 1a69d0fce2f..b4761e77942 100644
--- a/lib/libm/man/lgamma.3
+++ b/lib/libm/man/lgamma.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lgamma.3,v 1.9 2000/03/02 00:29:50 todd Exp $
+.\"	$OpenBSD: lgamma.3,v 1.10 2000/04/15 02:15:28 aaron Exp $
 .\" Copyright (c) 1985, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -82,7 +82,7 @@ returns appropriate values unless an argument is out of range.
 Overflow will occur for sufficiently large positive values, and
 non-positive integers.
 On the
-.Tn VAX,
+.Tn VAX ,
 the reserved operator is returned,
 and
 .Va errno
diff --git a/lib/libpthread/man/pread.3 b/lib/libpthread/man/pread.3
index c4f151650ab..4ac9889136e 100644
--- a/lib/libpthread/man/pread.3
+++ b/lib/libpthread/man/pread.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pread.3,v 1.7 1999/07/09 13:35:25 aaron Exp $
+.\" $OpenBSD: pread.3,v 1.8 2000/04/15 02:15:26 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1998. Public domain.
 .Dd September 7, 1998
 .Dt PREAD 3
@@ -18,7 +18,7 @@ function reads
 bytes from offset
 .Fa offset
 in the file opened on file descriptor
-.Fa filedes.
+.Fa filedes .
 .Pp
 This function is provided for use in a threaded, parallel I/O
 environment, where race conditions may exist between two threads
diff --git a/lib/libpthread/man/pthread_attr_setstackaddr.3 b/lib/libpthread/man/pthread_attr_setstackaddr.3
index 03bed1a9a89..dec5d0fc999 100644
--- a/lib/libpthread/man/pthread_attr_setstackaddr.3
+++ b/lib/libpthread/man/pthread_attr_setstackaddr.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_attr_setstackaddr.3,v 1.2 2000/04/12 21:48:02 aaron Exp $
+.\" $OpenBSD: pthread_attr_setstackaddr.3,v 1.3 2000/04/15 02:15:26 aaron Exp $
 .\" Manual page derived from TOG's UNIX98 documentation.
 .Dd January 6, 2000
 .Dt PTHREAD_ATTR_SETSTACKADDR 3
@@ -30,7 +30,7 @@ The
 attribute specifies the location of storage to be
 used for the created thread's stack. The size of the storage is at
 least
-.Dv PTHREAD_STACK_MIN.
+.Dv PTHREAD_STACK_MIN .
 .Sh RETURN VALUE
 Upon successful completion,
 .Fn pthread_attr_setstackaddr
diff --git a/lib/libpthread/man/pthread_set_name_np.3 b/lib/libpthread/man/pthread_set_name_np.3
index 8079a230c5c..2de216bb1cf 100644
--- a/lib/libpthread/man/pthread_set_name_np.3
+++ b/lib/libpthread/man/pthread_set_name_np.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_set_name_np.3,v 1.2 2000/04/12 21:48:03 aaron Exp $
+.\" $OpenBSD: pthread_set_name_np.3,v 1.3 2000/04/15 02:15:26 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1999. Public domain.
 .Dd December 19, 1999
 .Dt PTHREAD_SET_NAME_NP 3
@@ -17,7 +17,7 @@ The
 function associates
 .Fa name
 with
-.Fa thread.
+.Fa thread .
 This can be useful for debugging, as the name is displayed in
 the thread status as displayed when the process receives the
 .Dv SIGINFO
diff --git a/lib/libpthread/man/pwrite.3 b/lib/libpthread/man/pwrite.3
index 0de1b53e5ec..443d505072b 100644
--- a/lib/libpthread/man/pwrite.3
+++ b/lib/libpthread/man/pwrite.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pwrite.3,v 1.7 1999/07/09 13:35:25 aaron Exp $
+.\" $OpenBSD: pwrite.3,v 1.8 2000/04/15 02:15:26 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1998. Public domain.
 .Dd September 7, 1998
 .Dt PWRITE 3
@@ -18,7 +18,7 @@ function writes
 bytes from offset
 .Fa offset
 in the file opened on file descriptor
-.Fa filedes.
+.Fa filedes .
 .Pp
 This function is provided for use in a threaded, parallel I/O
 environment, where race conditions may exist between two threads
diff --git a/lib/libutil/login_fbtab.3 b/lib/libutil/login_fbtab.3
index 5d234a4c721..fb16ce5acca 100644
--- a/lib/libutil/login_fbtab.3
+++ b/lib/libutil/login_fbtab.3
@@ -23,7 +23,7 @@ If errors occur a null string is returned.
 Problems are reported via the
 .Xr syslogd 8
 daemon with the severity of
-.Dv LOG_ERR.
+.Dv LOG_ERR .
 .Sh FILES
 .Bl -tag -width /etc/fbtab -compact
 .It Pa /etc/fbtab
diff --git a/lib/libutil/scsi.3 b/lib/libutil/scsi.3
index 8fe440497f7..01707ca9cf8 100644
--- a/lib/libutil/scsi.3
+++ b/lib/libutil/scsi.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.3,v 1.4 2000/03/04 22:19:32 aaron Exp $
+.\"	$OpenBSD: scsi.3,v 1.5 2000/04/15 02:15:28 aaron Exp $
 .\" Copyright (c) 1994 HD Associates (hd@world.std.com)
 .\" All rights reserved.
 .\"
@@ -164,8 +164,8 @@ are the flags defined in
 Only two of these flags are supported in this release of the software:
 .Fr SCCMD_READ
 indicates a data in phase (a transfer into the user buffer at
-.Ar scsireg->databuf
-), and
+.Ar scsireg->databuf ) ,
+and
 .Fr SCCMD_WRITE
 indicates a data out phase (a transfer out of the user buffer).
 .Pp
@@ -244,7 +244,7 @@ The decoding is similar to
 the command specifier processing of
 .Fn scsireq_build
 except that the data is extracted from the data pointed to by
-.Fr scsireq->databuf.
+.Fr scsireq->databuf .
 The stdarg list should be pointers to integers instead of integer
 values.
 A seek field type and a suppression modifier are added.
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index 7b3cd3d3e1f..71854254dc8 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uucplock.3,v 1.8 2000/03/28 22:41:42 deraadt Exp $
+.\" $OpenBSD: uucplock.3,v 1.9 2000/04/15 02:15:29 aaron Exp $
 .\"
 .\" All rights reserved.
 .\"
@@ -85,33 +85,33 @@ returns 0 on success and \-1 on failure.
 .Fn uu_lock
 may return any of the following values:
 .Pp
-.Dv UU_LOCK_INUSE:
+.Dv UU_LOCK_INUSE :
 The lock is in use by another process.
 .Pp
-.Dv UU_LOCK_OK:
+.Dv UU_LOCK_OK :
 The lock was successfully created.
 .Pp
-.Dv UU_LOCK_OPEN_ERR:
+.Dv UU_LOCK_OPEN_ERR :
 The lock file could not be opened via
 .Xr open 2 .
 .Pp
-.Dv UU_LOCK_READ_ERR:
+.Dv UU_LOCK_READ_ERR :
 The lock file could not be read via
 .Xr read 2 .
 .Pp
-.Dv UU_LOCK_CREAT_ERR:
+.Dv UU_LOCK_CREAT_ERR :
 Can't create temporary lock file via
 .Xr creat 2 .
 .Pp
-.Dv UU_LOCK_WRITE_ERR:
+.Dv UU_LOCK_WRITE_ERR :
 The current process ID could not be written to the lock file via a call to
 .Xr write 2 .
 .Pp
-.Dv UU_LOCK_LINK_ERR:
+.Dv UU_LOCK_LINK_ERR :
 Can't link temporary lock file via
 .Xr link 2 .
 .Pp
-.Dv UU_LOCK_TRY_ERR:
+.Dv UU_LOCK_TRY_ERR :
 Locking attempts are failed after 5 tries.
 .Pp
 If a value of
@@ -134,14 +134,14 @@ and
 .Fn uu_lock_txfr
 may return any of the following values:
 .Pp
-.Dv UU_LOCK_OK:
+.Dv UU_LOCK_OK :
 The transfer was successful.  The specified process now holds the device
 lock.
 .Pp
-.Dv UU_LOCK_OWNER_ERR:
+.Dv UU_LOCK_OWNER_ERR :
 The current process does not already own a lock on the specified device.
 .Pp
-.Dv UU_LOCK_WRITE_ERR:
+.Dv UU_LOCK_WRITE_ERR :
 The new process ID could not be written to the lock file via a call to
 .Xr write 2 .
 .Sh ERRORS
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 3fc447b0b78..b33799e84c7 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftpd.8,v 1.27 2000/03/14 21:31:46 aaron Exp $
+.\"	$OpenBSD: ftpd.8,v 1.28 2000/04/15 02:15:29 aaron Exp $
 .\"	$NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -63,7 +63,7 @@ Available options:
 .Bl -tag -width Ds
 .It Fl A
 Permit only anonymous ftp connections or accounts listed in
-.Pa /etc/ftpchroot.
+.Pa /etc/ftpchroot .
 Other connection attempts are refused.
 .It Fl d
 Debugging information is written to the syslog using LOG_FTP.
diff --git a/libexec/identd/identd.8 b/libexec/identd/identd.8
index a480f95cf98..b256772d51c 100644
--- a/libexec/identd/identd.8
+++ b/libexec/identd/identd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: identd.8,v 1.13 1999/07/09 13:35:50 aaron Exp $
+.\"	$OpenBSD: identd.8,v 1.14 2000/04/15 02:15:29 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -187,7 +187,7 @@ uses the
 facility to log messages.
 .Pp
 Unlike previous versions of
-.Nm identd,
+.Nm identd ,
 this version uses
 .Xr sysctl 3
 to obtain information from the kernel instead of parsing kmem. This
diff --git a/libexec/rshd/rshd.8 b/libexec/rshd/rshd.8
index 4a11c7eb435..d62d7ad1aab 100644
--- a/libexec/rshd/rshd.8
+++ b/libexec/rshd/rshd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)rshd.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: rshd.8,v 1.7 2000/04/12 21:48:04 aaron Exp $
+.\"	$Id: rshd.8,v 1.8 2000/04/15 02:15:29 aaron Exp $
 .\"
 .Dd June 4, 1993
 .Dt RSHD 8
@@ -222,5 +222,5 @@ A facility to allow all data exchanges to be encrypted should be
 present.
 .Pp
 A more extensible protocol (such as
-.Xr ssh 1
-) should be used.
+.Xr ssh 1 )
+should be used.
diff --git a/libexec/smtpd/smtpd/smtpd.8 b/libexec/smtpd/smtpd/smtpd.8
index 701d5f3966c..44b2b8ed3e1 100644
--- a/libexec/smtpd/smtpd/smtpd.8
+++ b/libexec/smtpd/smtpd/smtpd.8
@@ -1,4 +1,4 @@
-.\"	$Id: smtpd.8,v 1.14 1999/07/02 20:11:49 aaron Exp $
+.\"	$Id: smtpd.8,v 1.15 2000/04/15 02:15:30 aaron Exp $
 .Dd December 10, 1997
 .Dt SMTPD 8
 .Os
@@ -35,7 +35,7 @@ is normally invoked from a super-server such as
 Specify a different
 .Ar chrootdir
 directory to chroot into on startup. The default is
-.Pa /var/spool/smtpd.
+.Pa /var/spool/smtpd .
 This directory should be readable and writable only to the user that
 .Nm smtpd
 runs as.
diff --git a/libexec/tcpd/tcpd/tcpd.8 b/libexec/tcpd/tcpd/tcpd.8
index 3446534d4a5..db55c34fc91 100644
--- a/libexec/tcpd/tcpd/tcpd.8
+++ b/libexec/tcpd/tcpd/tcpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpd.8,v 1.6 2000/04/12 00:13:45 deraadt Exp $
+.\"	$OpenBSD: tcpd.8,v 1.7 2000/04/15 02:15:30 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -168,7 +168,8 @@ are left in their original place, as it is configured within
 In order to monitor access to the
 .Xr finger 1
 service, perform the following edits on the
-.Xr inetd 8 configuration file,
+.Xr inetd 8
+configuration file,
 .Pa /etc/inetd.conf :
 .Pp
 .Bd -unfilled -offset indent
diff --git a/libexec/telnetd/telnetd.8 b/libexec/telnetd/telnetd.8
index 077605172d7..83e0bef1df5 100644
--- a/libexec/telnetd/telnetd.8
+++ b/libexec/telnetd/telnetd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnetd.8,v 1.11 1999/07/09 13:35:51 aaron Exp $
+.\"	$OpenBSD: telnetd.8,v 1.12 2000/04/15 02:15:30 aaron Exp $
 .\"	$NetBSD: telnetd.8,v 1.8 1996/03/20 04:25:55 tls Exp $
 .\"
 .\" Copyright (c) 1983, 1993
@@ -96,10 +96,10 @@ be used for authentication.
 Note that this option is only useful if
 .Nm
 has been compiled with support for the
-.Dv AUTHENTICATION
+.Cm AUTHENTICATION
 option.
 There are several valid values for
-.Ar authmode:
+.Ar authmode :
 .Bl -tag -width debug
 .It debug
 Turns on authentication debugging code.
@@ -148,7 +148,7 @@ to the connection, allowing the user to see what
 .Nm
 is doing.
 There are several possible values for
-.Ar debugmode:
+.Ar debugmode :
 .Bl -tag -width exercise
 .It Cm options
 Prints information about the negotiation of
@@ -185,7 +185,7 @@ Specifies which entry from
 .Pa /etc/gettytab
 should be used to get banner strings, login program and
 other information.  The default entry is
-.Dv default.
+.Dq default.
 .It Fl h
 Disables the printing of host-specific information before
 login has been completed.
@@ -194,13 +194,11 @@ This option is only applicable to
 .Tn UNICOS
 systems prior to 7.0.
 It specifies the
-.Dv ID
+.Em ID
 from
 .Pa /etc/inittab
-to use when init starts login sessions.  The default
-.Dv ID
-is
-.Dv fe.
+to use when init starts login sessions.  The default ID is
+.Dq fe .
 .It Fl k
 This option is only useful if
 .Nm
@@ -209,7 +207,7 @@ support.  If the
 .Fl k
 option is specified, then if the remote client does not
 support the
-.Dv LINEMODE
+.Cm LINEMODE
 option, then
 .Nm
 will operate in character at a time mode.
@@ -217,28 +215,28 @@ It will still support kludge linemode, but will only
 go into kludge linemode if the remote client requests
 it.
 (This is done by the client sending
-.Dv DONT SUPPRESS-GO-AHEAD
+.Tn DONT SUPPRESS-GO-AHEAD
 and
-.Dv DONT ECHO . )
+.Tn DONT ECHO . )
 The
 .Fl k
 option is most useful when there are remote clients
 that do not support kludge linemode, but pass the heuristic
 (if they respond with
-.Dv WILL TIMING-MARK
+.Tn WILL TIMING-MARK
 in response to a
-.Dv DO TIMING-MARK)
+.Tn DO TIMING-MARK)
 for kludge linemode support.
 .It Fl l
 Specifies line mode.  Tries to force clients to use line-
 at-a-time mode.
 If the
-.Dv LINEMODE
+.Tn LINEMODE
 option is not supported, it will go
 into kludge linemode.
 .It Fl n
 Disable
-.Dv TCP
+.Tn TCP
 keep-alives.  Normally
 .Nm
 enables the
@@ -252,7 +250,7 @@ be reached may be cleaned up.
 This option is only enabled when
 .Nm
 is compiled for
-.Dv UNICOS.
+.Tn UNICOS .
 It specifies an inclusive range of pseudo-terminal devices to
 use.  If the system has sysconf variable
 .Dv _SC_CRAY_NPTY
@@ -275,7 +273,7 @@ from
 .It Fl u Ar len
 This option is used to specify the size of the field
 in the
-.Dv utmp
+.Li utmp
 structure that holds the remote host name.
 If the resolved host name is longer than
 .Ar len ,
@@ -313,10 +311,10 @@ operates by allocating a pseudo-terminal device (see
 .Xr pty 4 )
 for a client, then creating a login process which has
 the slave side of the pseudo-terminal as
-.Dv stdin ,
-.Dv stdout
+.Li stdin ,
+.Li stdout ,
 and
-.Dv stderr .
+.Li stderr .
 .Nm
 manipulates the master side of the pseudo-terminal,
 implementing the
@@ -366,21 +364,21 @@ options:
 .Bl -tag -width "DO AUTHENTICATION"
 .It "WILL ECHO"
 When the
-.Dv LINEMODE
+.Cm LINEMODE
 option is enabled, a
-.Dv WILL ECHO
+.Tn WILL ECHO
 or
-.Dv WONT ECHO
+.Tn WONT ECHO
 will be sent to the client to indicate the
 current state of terminal echoing.
 When terminal echo is not desired, a
-.Dv WILL ECHO
+.Tn WILL ECHO
 is sent to indicate that
 .Tn telnetd
 will take care of echoing any data that needs to be
 echoed to the terminal, and then nothing is echoed.
 When terminal echo is desired, a
-.Dv WONT ECHO
+.Tn WONT ECHO
 is sent to indicate that
 .Tn telnetd
 will not be doing any terminal echoing, so the
@@ -391,7 +389,7 @@ Indicates that the client is willing to send a
 of the Network Virtual Terminal.
 .It "WILL SGA"
 Indicates that it will not be sending
-.Dv IAC GA,
+.Tn IAC GA ,
 go ahead, commands.
 .It "WILL STATUS"
 Indicates a willingness to send the client, upon
@@ -400,15 +398,15 @@ request, of the current status of all
 options.
 .It "WILL TIMING-MARK"
 Whenever a
-.Dv DO TIMING-MARK
+.Tn DO TIMING-MARK
 command is received, it is always responded
 to with a
-.Dv WILL TIMING-MARK
+.Tn WILL TIMING-MARK
 .It "WILL LOGOUT"
 When a
-.Dv DO LOGOUT
+.Tn DO LOGOUT
 is received, a
-.Dv WILL LOGOUT
+.Tn WILL LOGOUT
 is sent in response, and the
 .Tn TELNET
 session is shut down.
@@ -437,11 +435,11 @@ This is not really supported, but is sent to identify a
 .Bx 4.2
 .Xr telnet 1
 client, which will improperly respond with
-.Dv WILL ECHO.
+.Tn WILL ECHO .
 If a
-.Dv WILL ECHO
+.Tn WILL ECHO
 is received, a
-.Dv DONT ECHO
+.Tn DONT ECHO
 will be sent in response.
 .It "DO TERMINAL-TYPE"
 Indicates a desire to be able to request the
@@ -449,7 +447,7 @@ name of the type of terminal that is attached
 to the client side of the connection.
 .It "DO SGA"
 Indicates that it does not need to receive
-.Dv IAC GA,
+.Tn IAC GA ,
 the go ahead command.
 .It "DO NAWS"
 Requests that the client inform the server when
@@ -478,9 +476,9 @@ Only sent if
 .Nm
 is compiled with support for both linemode and
 kludge linemode, and the client responded with
-.Dv WONT LINEMODE.
+.Tn WONT LINEMODE .
 If the client responds with
-.Dv WILL TM,
+.Tn WILL TM ,
 the it is assumed that the client supports
 kludge linemode.
 Note that the
@@ -579,5 +577,5 @@ lower case.
 .Nm
 never sends
 .Tn TELNET
-.Dv IAC GA
+.Tn IAC GA
 (go ahead) commands.
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index a0ce0991603..7d02d6440ab 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: fsirand.8,v 1.19 2000/03/18 22:55:57 aaron Exp $
+.\"	$OpenBSD: fsirand.8,v 1.20 2000/04/15 02:15:14 aaron Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
@@ -49,7 +49,7 @@ it difficult to
 .Dq guess
 filehandles.
 .Pp
-.Em Note:
+.Em Note :
 .Xr newfs 8
 now does the equivalent of
 .Nm
diff --git a/sbin/ipsecadm/ipsecadm.8 b/sbin/ipsecadm/ipsecadm.8
index 932fab45280..280e0542338 100644
--- a/sbin/ipsecadm/ipsecadm.8
+++ b/sbin/ipsecadm/ipsecadm.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsecadm.8,v 1.22 2000/04/12 21:47:59 aaron Exp $
+.\" $OpenBSD: ipsecadm.8,v 1.23 2000/04/15 02:15:14 aaron Exp $
 .\"
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
@@ -136,7 +136,7 @@ Allowed modifiers are:
 .Fl dst ,
 .Fl src ,
 and
-.Fl spi.
+.Fl spi .
 .It delspi
 The specified SA will be deleted.
 Allowed modifiers are:
@@ -368,7 +368,7 @@ to uniquely specify the SA.
 The default value is 50 which means
 .Nm IPPROTO_ESP .
 Other accepted values are 51
-.Nm ( IPPROTO_AH ),
+.Nm ( IPPROTO_AH ) ,
 and 4
 .Nm ( IPPROTO_IP ) .
 One can also specify the symbolic names "esp", "ah", and "ip4",
@@ -387,7 +387,7 @@ The second security protocol used by
 It defaults to
 .Nm IPPROTO_AH .
 Other accepted values are 50
-.Nm ( IPPROTO_ESP ),
+.Nm ( IPPROTO_ESP ) ,
 and 4
 .Nm ( IPPROTO_IP ) .
 One can also specify the symbolic names "esp", "ah", and "ip4",
diff --git a/sbin/isakmpd/apps/certpatch/certpatch.8 b/sbin/isakmpd/apps/certpatch/certpatch.8
index 5c36552b4e8..00cd4371d30 100644
--- a/sbin/isakmpd/apps/certpatch/certpatch.8
+++ b/sbin/isakmpd/apps/certpatch/certpatch.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: certpatch.8,v 1.5 2000/04/07 22:22:27 niklas Exp $
+.\" $OpenBSD: certpatch.8,v 1.6 2000/04/15 02:15:15 aaron Exp $
 .\" $EOM: certpatch.8,v 1.5 2000/04/07 22:17:11 niklas Exp $
 .\"
 .\" Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -38,7 +38,7 @@
 .Os
 .Sh NAME
 .Nm certpatch
-.Nd Utility to add subjectAltName identities to X.509 certificates.
+.Nd add subjectAltName identities to X.509 certificates
 .Sh SYNOPSIS
 .Nm certpatch
 .Op Fl t Ar identity-type
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 62410003243..6560f2cc827 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_nfs.8,v 1.17 2000/03/18 22:56:00 aaron Exp $
+.\"	$OpenBSD: mount_nfs.8,v 1.18 2000/04/15 02:15:15 aaron Exp $
 .\"	$NetBSD: mount_nfs.8,v 1.3 1996/02/18 11:59:10 fvdl Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994, 1995
@@ -64,7 +64,7 @@ calls the
 .Xr mount 2
 system call to prepare and graft a remote nfs file system (rhost:path)
 on to the file system tree at the point
-.Ar node.
+.Ar node .
 This command is normally executed by
 .Xr mount 8 .
 It implements the mount protocol as described in RFC 1094, Appendix A and
diff --git a/sbin/mount_procfs/mount_procfs.8 b/sbin/mount_procfs/mount_procfs.8
index 0d3032c9d60..c538516b190 100644
--- a/sbin/mount_procfs/mount_procfs.8
+++ b/sbin/mount_procfs/mount_procfs.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_procfs.8,v 1.12 1999/07/21 01:07:55 deraadt Exp $
+.\"	$OpenBSD: mount_procfs.8,v 1.13 2000/04/15 02:15:15 aaron Exp $
 .\"	$NetBSD: mount_procfs.8,v 1.6 1995/03/18 14:58:10 cgd Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -116,7 +116,7 @@ and without the
 prefix,
 in which case that signal is delivered to the process
 (see
-.Xr sigaction 2 ).
+.Xr sigaction 2 ) .
 .It Pa file
 A reference to the vnode from which the process text was read.
 This can be used to gain access to the process's symbol table,
@@ -211,7 +211,7 @@ file.
 The child process will receive a
 .Dv SIGTRAP
 immediately after the call to exec (see
-.Xr execve 2 ).
+.Xr execve 2 ) .
 .Pp
 Statistics reported by
 .Xr df 1
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 6cada58a68c..6449049d369 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: exports.5,v 1.9 2000/03/04 22:19:30 aaron Exp $
+.\"	$OpenBSD: exports.5,v 1.10 2000/04/15 02:15:15 aaron Exp $
 .\"	$NetBSD: exports.5,v 1.9 1996/02/18 11:57:50 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -104,7 +104,7 @@ Export options are specified as follows:
 The credential of the specified user is used for remote access by root.
 The credential includes all the groups to which the user is a member
 on the local machine (see
-.Xr id 1 ).
+.Xr id 1 ) .
 The user may be specified by name or number.
 .Pp
 .Sm off
@@ -174,7 +174,7 @@ addresses may be used in place of names.)
 The second way is to specify a
 .Dq netgroup
 as defined in the netgroup file (see
-.Xr netgroup 5 ).
+.Xr netgroup 5 ) .
 The third way is to specify an internet subnetwork using a network and
 network mask that is defined as the set of all hosts with addresses within
 the subnetwork.
@@ -200,7 +200,7 @@ and optionally
 .Sm on
 If the mask is not specified, it will default to the mask for that network
 class (A, B or C; see
-.Xr inet 5 ).
+.Xr inet 5 ) .
 .Pp
 For example:
 .Bd -literal -offset indent
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 25c76507b56..f96e68566b4 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quotacheck.8,v 1.9 2000/03/18 22:56:03 aaron Exp $
+.\"	$OpenBSD: quotacheck.8,v 1.10 2000/04/15 02:15:16 aaron Exp $
 .\"	$NetBSD: quotacheck.8,v 1.4 1995/03/18 14:59:20 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -93,7 +93,7 @@ are to be checked.
 Limit the number of parallel checks to the number
 .Ar maxparallel
 specified in the argument (see
-.Xr fsck 8 ).
+.Xr fsck 8 ) .
 .It Fl u
 Only user quotas listed in
 .Pa /etc/fstab
diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index 6f4060bf65e..3b1071c9aec 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raidctl.8,v 1.13 2000/04/12 21:47:59 aaron Exp $
+.\"	$OpenBSD: raidctl.8,v 1.14 2000/04/15 02:15:16 aaron Exp $
 .\"     $NetBSD: raidctl.8,v 1.11 2000/01/05 03:02:41 oster Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -176,8 +176,8 @@ This
 be done before the RAID device is labeled and before
 filesystems are created on the RAID device, and is normally used after
 a system crash (and before a
-.Xr fsck 8
-) to ensure the integrity of the parity.
+.Xr fsck 8 )
+to ensure the integrity of the parity.
 .It Fl I Ar serial_number Ar dev
 Initialize the component labels on each component of the device.
 .Ar serial_number
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 94c66ab7606..3f35571e89e 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_i386.8,v 1.11 2000/03/18 22:56:03 aaron Exp $
+.\"	$OpenBSD: boot_i386.8,v 1.12 2000/04/15 02:15:16 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Tobias Weingartner
 .\"
@@ -100,7 +100,7 @@ In other words, the first block of an extended
 partition is really an MBR, which will then load the corresponding MBR or PBR
 out of its extended partition's partition table.
 .Sh GEOMETRY TRANSLATION
-.Em WARNING:
+.Em WARNING :
 This portion of the
 .Dq PC BIOS Architecture
 is a mess, and a compatibility nightmare.
diff --git a/sbin/reboot/boot_sparc.8 b/sbin/reboot/boot_sparc.8
index e981df13106..1d2c79fca9d 100644
--- a/sbin/reboot/boot_sparc.8
+++ b/sbin/reboot/boot_sparc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_sparc.8,v 1.14 2000/03/18 22:56:03 aaron Exp $
+.\"	$OpenBSD: boot_sparc.8,v 1.15 2000/04/15 02:15:17 aaron Exp $
 .\"	$NetBSD: boot_sparc.8,v 1.4 1995/04/25 11:37:25 pk Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@ system bootstrapping procedures
 Normally, the system will reboot itself at power-up or after crashes.
 An automatic consistency check of the file systems will be performed
 (as described in
-.Xr fsck 8 ),
+.Xr fsck 8 ) ,
 and unless this fails, the system will resume multi-user operations.
 .Pp
 .Ss Cold starts
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 27ad3a5dda9..c10fc009346 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: restore.8,v 1.17 2000/03/18 22:56:04 aaron Exp $
+.\"	$OpenBSD: restore.8,v 1.18 2000/04/15 02:15:17 aaron Exp $
 .\"	$NetBSD: restore.8,v 1.15 1997/07/01 05:37:53 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -452,7 +452,7 @@ and
 .Pa /tmp/rstmode*
 are generated with a unique name based on the date of the dump
 and the process ID (see
-.Xr mktemp 3 ),
+.Xr mktemp 3 ) ,
 except when
 .Fl r
 or
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 2876047cbda..e67c6a7aee7 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route.8,v 1.22 2000/04/12 21:48:00 aaron Exp $
+.\"	$OpenBSD: route.8,v 1.23 2000/04/15 02:15:17 aaron Exp $
 .\"	$NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -96,7 +96,7 @@ Change aspects of a route (such as its gateway).
 Lookup and display the route for a destination.
 .It Cm show
 Print out the route table similar to "netstat \-r" (see
-.Xr netstat 1 ).
+.Xr netstat 1 ) .
 .It Cm monitor
 Continuously report any changes to the routing information base,
 routing lookup misses, or suspected network partitionings.
@@ -131,7 +131,7 @@ When the address family is specified by any of the
 .Fl osi ,
 .Fl xns ,
 .Fl ipx ,
-.Fl link,
+.Fl link ,
 .Fl encap ,
 .Fl x25 ,
 .Fl inet ,
@@ -184,7 +184,7 @@ is interpreted as
 .Fl host Li 128.32.0.130 ;
 .Fl net Li 128.32
 is interpreted as
-.Li 128.32.0.0;
+.Li 128.32.0.0 ;
 and
 .Fl net Li 128.32.130
 is interpreted as
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 6bd3efea49b..31acef60a64 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: routed.8,v 1.29 2000/03/18 22:56:04 aaron Exp $
+.\"	$OpenBSD: routed.8,v 1.30 2000/04/15 02:15:17 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -91,7 +91,7 @@ non-static routes in the kernel table.
 Static routes in the kernel table are preserved and
 included in RIP responses if they have a valid RIP metric
 (see
-.Xr route 8 ).
+.Xr route 8 ) .
 .Pp
 If more than one interface is present (not counting the loopback interface),
 it is assumed that the host should forward packets among the
@@ -116,7 +116,7 @@ with a "hop count" metric (a count of 16 or greater is
 considered "infinite").
 Advertised metrics reflect the metric associated with interface
 (see
-.Xr ifconfig 8 ),
+.Xr ifconfig 8 ) ,
 so setting the metric on an interface
 is an effective way to steer traffic.
 .Pp
@@ -184,7 +184,7 @@ support multicasting.
 If no response is received on a remote interface, if there are errors
 while sending responses,
 or if there are more errors than input or output (see
-.Xr netstat 1 ),
+.Xr netstat 1 ) ,
 then the cable or some other part of the interface is assumed to be
 disconnected or broken, and routes are adjusted appropriately.
 .Pp
@@ -445,7 +445,7 @@ or
 is the name of the destination network or host.
 It may be a symbolic network name or an Internet address
 specified in "dot" notation (see
-.Xr inet 3 ).
+.Xr inet 3 ) .
 (If it is a name, then it must either be defined in
 .Pa /etc/networks
 or
@@ -468,7 +468,7 @@ be forwarded.
 is the hop count to the destination host or network.
 .Ar " host hname "
 is equivalent to
-.Ar " net  nname/32 ".
+.Ar " net  nname/32 " .
 .Pp
 One of the keywords
 .Cm passive ,
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 703f54d11ce..a0e328aff99 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: savecore.8,v 1.10 2000/04/01 13:08:36 hugh Exp $
+.\"	$OpenBSD: savecore.8,v 1.11 2000/04/15 02:15:17 aaron Exp $
 .\"	$NetBSD: savecore.8,v 1.11 1995/06/27 22:40:46 briggs Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -72,7 +72,7 @@ as the kernel instead of the default
 Prints out some additional debugging information.
 .It Fl z
 Compresses the core dump and kernel (see
-.Xr compress 1 ).
+.Xr compress 1 ) .
 .El
 .Pp
 .Nm
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 04b88dd510f..1d2ea58bde3 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ar.1,v 1.7 2000/03/04 21:11:59 aaron Exp $
+.\"	$OpenBSD: ar.1,v 1.8 2000/04/15 02:15:11 aaron Exp $
 .\"	$NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -270,7 +270,7 @@ style listing of information about the members of
 the archive.
 This listing consists of eight, whitespace-separated fields:
 the file permissions (see
-.Xr strmode 3 ),
+.Xr strmode 3 ) ,
 the decimal user and group IDs, separated by a single slash
 .Pq Ql / ,
 the file size (in bytes), the file modification time (in the
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index ca3f9c373f2..21c6863263e 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getopt.1,v 1.6 2000/03/07 21:11:09 aaron Exp $	-*- nroff -*-
+.\"	$OpenBSD: getopt.1,v 1.7 2000/04/15 02:15:11 aaron Exp $	-*- nroff -*-
 .Dd June 21, 1993
 .Dt GETOPT 1
 .Os
@@ -13,8 +13,7 @@ is used to break up options in command lines for easy parsing by
 shell procedures, and to check for legal options.
 .Op optstring
 is a string of recognized option letters (see
-.Xr getopt 3
-);
+.Xr getopt 3 ) ;
 if a letter is followed by a colon, the option
 is expected to have an argument which may or may not be
 separated from it by whitespace.
diff --git a/usr.bin/lndir/lndir.1 b/usr.bin/lndir/lndir.1
index 120e88472f2..fd3614106ba 100644
--- a/usr.bin/lndir/lndir.1
+++ b/usr.bin/lndir/lndir.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lndir.1,v 1.9 2000/03/08 03:11:31 aaron Exp $
+.\" $OpenBSD: lndir.1,v 1.10 2000/04/15 02:15:11 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -77,7 +77,7 @@ The
 program makes a shadow copy
 .Ar todir
 of a directory tree
-.Ar fromdir,
+.Ar fromdir ,
 except that the shadow is not
 populated with real files but instead with symbolic links pointing at
 the real files in the
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 22b4a292acb..d42732d9d39 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: netstat.1,v 1.19 1999/12/08 12:30:17 itojun Exp $
+.\"	$OpenBSD: netstat.1,v 1.20 2000/04/15 02:15:12 aaron Exp $
 .\"	$NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1992, 1993
@@ -162,7 +162,7 @@ option is present, show per-interface statistics on the
 for the specfied
 .Ar address_family
 or
-.Ar protocol,
+.Ar protocol ,
 respectively.
 .It Fl i
 Show the state of interfaces which have been auto-configured
@@ -184,7 +184,7 @@ option is present, show per-interface statistics on all interfaces
 for the specfied
 .Ar address_family
 or
-.Ar protocol,
+.Ar protocol ,
 respectively.
 .It Fl M Ar core
 Extract values associated with the name list from the specified core
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index b05398c12f7..baf403101c3 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rup.1,v 1.6 2000/03/10 20:17:51 aaron Exp $
+.\"	$OpenBSD: rup.1,v 1.7 2000/04/15 02:15:12 aaron Exp $
 .\"
 .\" Copyright (c) 1985, 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -91,7 +91,7 @@ Either the network is excessively congested, or the
 daemon has terminated on the remote host.
 .It rup: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
-.Xr portmap 8 ),
+.Xr portmap 8 ) ,
 and cannot accommodate any RPC-based services.
 The host may be down.
 .El
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 26ed1e82d76..8336dbf365e 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rusers.1,v 1.7 2000/03/23 21:39:54 aaron Exp $
+.\"	$OpenBSD: rusers.1,v 1.8 2000/04/15 02:15:12 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -81,7 +81,7 @@ Either the network is excessively congested, or the
 daemon has terminated on the remote host.
 .It rusers: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
-.Xr portmap 8 ),
+.Xr portmap 8 ) ,
 and cannot accommodate any RPC-based services.
 The host may be down.
 .El
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 0a581013539..d14bdac4e22 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rwall.1,v 1.5 2000/03/23 21:39:54 aaron Exp $
+.\"	$OpenBSD: rwall.1,v 1.6 2000/04/15 02:15:12 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -63,7 +63,7 @@ Either the network is excessively congested, or the
 daemon has terminated on the remote host.
 .It rwall: RPC: Port mapper failure - RPC: Timed out
 The remote host is not running the portmapper (see
-.Xr portmap 8 ),
+.Xr portmap 8 ) ,
 and cannot accommodate any RPC-based services.
 The host may be down.
 .El
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 8f36ba500cc..9f88641a5a5 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.13 2000/03/11 21:40:08 aaron Exp $
+.\"	$OpenBSD: sed.1,v 1.14 2000/04/15 02:15:13 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -395,7 +395,7 @@ where
 .Ql #
 is a digit, is replaced by the text matched
 by the corresponding backreference expression (see
-.Xr re_format 7 ).
+.Xr re_format 7 ) .
 .Pp
 A line can be split by substituting a newline character into it.
 To specify a newline character in the replacement string, precede it with
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 6bbdc3a7c13..12963a0b863 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnet.1,v 1.23 2000/03/23 21:39:55 aaron Exp $
+.\"	$OpenBSD: telnet.1,v 1.24 2000/04/15 02:15:13 aaron Exp $
 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -427,7 +427,7 @@ Attempts to start encryption.
 If you omit
 .Ic input
 and
-.Ic output,
+.Ic output ,
 both input and output are enabled.
 To obtain a list of available types, use the
 .Ic encrypt enable \&?
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index cb86cf266a8..ff2eaf85604 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tip.1,v 1.7 2000/03/11 21:40:05 aaron Exp $
+.\"	$OpenBSD: tip.1,v 1.8 2000/04/15 02:15:13 aaron Exp $
 .\"	$NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -430,7 +430,7 @@ default is
 When
 .Ar script
 is
-.Li true,
+.Li true ,
 .Nm
 will record everything transmitted by the remote machine in
 the script record file specified in
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 53a0d0db69c..39c4ad6adb7 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lint.1,v 1.8 2000/03/14 21:31:42 aaron Exp $
+.\"	$OpenBSD: lint.1,v 1.9 2000/04/15 02:15:13 aaron Exp $
 .\"	$NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
@@ -384,7 +384,7 @@ Suppress complaints about use of long long integer types.
 At appropriate points, inhibit complaints about unreachable code.
 (This comment is typically placed just after calls to functions
 like
-.Xr exit 3 ).
+.Xr exit 3 ) .
 .It Li /* PRINTFLIKE Ns Ar n Li */
 makes
 .Nm
diff --git a/usr.sbin/afs/fs/fs.1 b/usr.sbin/afs/fs/fs.1
index 8184fe087a0..6c9a361c1e0 100644
--- a/usr.sbin/afs/fs/fs.1
+++ b/usr.sbin/afs/fs/fs.1
@@ -24,7 +24,7 @@ The
 .Nm
 utility provides several commands:
 .Pp
-.Bl -tag -width Fl -compact
+.Bl -tag -width setmaxpriority -compact
 .It Cm apropos
 locate commands by keyword
 .It Cm arladebug
@@ -61,13 +61,13 @@ not yet implemented
 get priority of a file/dir
 .It Cm gp
 shorthand for the
-.Nm getpriority
+.Cm getpriority
 command
 .It Cm getmaxpriority
 get max priority for a file gc
 .It Cm gmp
 shorthand for the
-.Nm getmaxpriority
+.Cm getmaxpriority
 command
 .It Cm help
 get help for
@@ -76,7 +76,7 @@ get help for
 show acl
 .It Cm la
 shorthand for the
-.Nm listacl
+.Cm listacl
 command
 .It Cm listcells
 list cells that the cache handler can communicate with
@@ -84,11 +84,11 @@ list cells that the cache handler can communicate with
 show volume quota
 .It Cm lq
 shorthand for the
-.Nm listquita
+.Cm listquota
 command
 .It Cm quota
 shorthand for the
-.Nm listquota
+.Cm listquota
 command
 .It Cm lsmount
 show a mount point
@@ -114,13 +114,13 @@ delete a mount point
 remove priority from file/directory
 .It Cm rmp
 shorthand for the
-.Nm removepriority
+.Cm removepriority
 command
 .It Cm setacl
 add an acl entry on a directory
 .It Cm sa
 shorthand for the
-.Nm setacl
+.Cm setacl
 command
 .It Cm setcachesize
 change disk cache size
@@ -130,19 +130,19 @@ change cell status
 set priority of a file/directory
 .It Cm sp
 shorthand for the
-.Nm setpriority
+.Cm setpriority
 command
 .It Cm setmaxpriority
 set upper limit of prio gc
 .It Cm smq
 shorthand for the
-.Nm setmaxpriority
+.Cm setmaxpriority
 comand
 .It Cm setquota
 change quota on a volume
 .It Cm sq
 shorthand for the
-.Nm setquota
+.Cm setquota
 command
 .It Cm setserverprefs
 not yet implemented
@@ -181,7 +181,8 @@ Specifies which AFS cell to use, if the default cell is not to be used.
 .Op Fl noauth
 Specifies that
 .Nm
-should not try to authenticate the connection to the server. This may be
+should not try to authenticate the connection to the server.
+This may be
 useful with shell scripts, or if there is a problem with the AFS cell.
 Note that the server will reject many commands if
 .Fl noauth
@@ -192,12 +193,12 @@ The syntax of the
 .Nm
 commands:
 .Pp
-.Nm fs apropos
+.Ic fs apropos
 .Bd -filled -offset indent -compact
 Locate commands by keyword
 .Ed
 .Pp
-.Nm fs arladebug
+.Ic fs arladebug
 .Op Ar flags
 .Op Fl cell Ar cellname
 .Op Fl noauth
@@ -205,118 +206,119 @@ Locate commands by keyword
 Tweek arla-debugging flags.
 .Ed
 .Pp
-.Nm fs checkservers
+.Ic fs checkservers
 .Op Fl cell Ar cellname
 .Op Fl noauth
 .Op Fl nopoll
 .Bd -filled -offset indent -compact
-Check if the server in a cell are up. If
+Check if the server in a cell are up.
+If
 .Fl nopoll
 is specified, the servers are not contactad; only internal information is
 printed.
 .Ed
 .Pp
-.Nm fs checkvolumes
+.Ic fs checkvolumes
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs cleanacl
+.Ic fs cleanacl
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs copyacl
+.Ic fs copyacl
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs diskfree
+.Ic fs diskfree
 .Ar path
 .Bd -filled -offset indent -compact
 show free partition space
 .Ed
 .Pp
-.Nm fs examine
+.Ic fs examine
 .Op Ar path
 .Bd -filled -offset indent -compact
 Print detailed information about the volume mounted on the specified path
 or the current directory.
 .Ed
 .Pp
-.Nm fs flush
+.Ic fs flush
 .Ar path
 .Bd -filled -offset indent -compact
 Flush the file specified, causing it to be stored on the fileserver.
 .Ed
 .Pp
-.Nm fs flushvolume
+.Ic fs flushvolume
 .Ar path
 .Bd -filled -offset indent -compact
 Flush all the files in the volume where the file specified is stored,
-causing them to be stored on the fileserver. Meta information about the
-volume is also flushed.
+causing them to be stored on the fileserver.
+Meta information about the volume is also flushed.
 .Ed
 .Pp
-.Nm fs gcpags
+.Ic fs gcpags
 .Bd -filled -offset indent -compact
 Remove unused PAGs from the kernel.
 .Ed
 .Pp
-.Nm fs getcacheparms
+.Ic fs getcacheparms
 .Bd -filled -offset indent -compact
 Print information about cache usage.
 .Ed
 .Pp
-.Nm fs getcrypt
+.Ic fs getcrypt
 .Bd -filled -offset indent -compact
 Display wether traffic between the client and server is encrypted.
 .Ed
 .Pp
-.Nm fs getcellstatus
+.Ic fs getcellstatus
 .Ar cellname
 .Bd -filled -offset indent -compact
 Indicate if setuid files are enabled for the specified cell.
 .Ed
 .Pp
-.Nm fs getfid
+.Ic fs getfid
 .Ar path
 .Bd -filled -offset indent -compact
 Print fid information for a file.
 .Ed
 .Pp
-.Nm fs getserverprefs
+.Ic fs getserverprefs
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs getpriority
+.Ic fs getpriority
 .Bd -filled -offset indent -compact
 Display priority of a file or directory.
 .Ed
 .Pp
-.Nm fs gp
+.Ic fs gp
 .Bd -filled -offset indent -compact
 shorthand for the
-.Nm getpriority
+.Cm getpriority
 command
 .Ed
 .Pp
-.Nm fs getmaxpriority
+.Ic fs getmaxpriority
 .Bd -filled -offset indent -compact
 Display max priority for a file.
 .Ed
 .Pp
-.Nm fs gmp
+.Ic fs gmp
 .Op Fl cell Ar cellname
 .Op Fl noauth
 .Bd -filled -offset indent -compact
 Shorthand for the
-.Nm getmaxpriority
+.Cm getmaxpriority
 command.
 .Ed
 .Pp
-.Nm fs help
+.Ic fs help
 .Op Fl cell Ar cellname
 .Op Fl noauth
 .Bd -filled -offset indent -compact
@@ -324,74 +326,76 @@ Get help for
 .Nm
 .Ed
 .Pp
-.Nm fs listacl
+.Ic fs listacl
 .Ar path
 .Bd -filled -offset indent -compact
 Show acl for the specified path or the current directory.
 .Ed
 .Pp
-.Nm fs la
+.Ic fs la
 .Op Fl cell Ar cellname
 .Op Fl noauth
 .Bd -filled -offset indent -compact
 Shorthand for the
-.Nm listacl
+.Cm listacl
 command.
 .Ed
 .Pp
-.Nm fs listcells
+.Ic fs listcells
 .Bd -filled -offset indent -compact
-List cells that the cache handler can communicate with. These are the cells
-listed in the file
-.Nm /etc/afs/CellServDB.
+List cells that the cache handler can communicate with.
+These are the cells listed in the file
+.Pa /etc/afs/CellServDB .
 .Ed
 .Pp
-.Nm fs listquota
+.Ic fs listquota
 .Op Ar path
 .Bd -filled -offset indent -compact
 Show the quota for the volume of the file or directory specified.
 .Ed
 .Pp
-.Nm fs lq
+.Ic fs lq
 .Bd -filled -offset indent -compact
 shorthand for the
-.Nm listquita
+.Cm listquota
 command
 .Ed
 .Pp
-.Nm fs quota
+.Ic fs quota
 .Op Fl cell Ar cellname
 .Op Fl noauth
 .Bd -filled -offset indent -compact
 Shorthand for the
-.Nm listquota
+.Ic listquota
 command.
 .Ed
 .Pp
-.Nm fs lsmount
+.Ic fs lsmount
 .Bd -filled -offset indent -compact
 .Ar path
 Show a mount point.
 .Ed
 .Pp
-.Nm fs messages
+.Ic fs messages
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs mkmount
+.Ic fs mkmount
 .Ar directory
 .Ar volume
 .Bd -filled -offset indent -compact
-Create a mountpoint. Note that the there must not exist a directory named as
+Create a mountpoint.
+Note that the there must not exist a directory named as
 the mount point you are creating.
 .Ed
 .Pp
-.Nm fs connect
+.Ic fs connect
 .Op Ar mode
 .Bd -filled -offset indent -compact
 Set or get connected mode, if a mode is specified, the cache manager will be
-set to that mode. If not, the current mode will be printed.
+set to that mode.
+If not, the current mode will be printed.
 Valid modes are:
 .Bl -tag -width -Fl -compact
 .It Cm connected
@@ -404,66 +408,68 @@ attempt is made to contact a fileserver-
 .El
 .Pp
 Disconnected mode is very useful for machines that are not connected to
-the network at all times, such as laptops. Disconnected mode is to be
-considered very experimental at this stage.
+the network at all times, such as laptops.
+Disconnected mode is to be considered very experimental at this stage.
 .Ed
 .Pp
-.Nm fs monitor
+.Ic fs monitor
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs newcell
+.Ic fs newcell
 .Fl cell Ar cellname
 .Fl servers Ar vldb-servers
 .Op Fl help
 .Bd -filled -offset indent -compact
 Add a new cell to the running configuration of the cache manager, or update
-already existing information. This information should also be entered in the
-file
-.Nm /etc/afs/CellServDB.
+already existing information.
+This information should also be entered in the file
+.Pa /etc/afs/CellServDB .
 .Ed
 .Pp
-.Nm fs nop
+.Ic fs nop
 .Bd -filled -offset indent -compact
-Do a pioctl-nop. This is useful for debugging.
+Do a pioctl-nop.
+This is useful for debugging.
 .Ed
 .Pp
-.Nm fs quit
+.Ic fs quit
 .Bd -filled -offset indent -compact
 Leave interactive mode.
 .Ed
 .Pp
-.Nm fs exit
+.Ic fs exit
 .Bd -filled -offset indent -compact
 Leave interactive mode.
 .Ed
 .Pp
-.Nm fs rmmount
+.Ic fs rmmount
 .Ar mountpoint
 .Bd -filled -offset indent -compact
 Delete a mount point.
 .Ed
 .Pp
-.Nm fs removepriority
+.Ic fs removepriority
 .Ar file
 .Bd -filled -offset indent -compact
 Remove priority from file/directory.
 .Ed
 .Pp
-.Nm fs rmp
+.Ic fs rmp
 .Bd -filled -offset indent -compact
 Shorthand for the
-.Nm removepriority
+.Cm removepriority
 command.
 .Ed
 .Pp
-.Nm fs setacl
+.Ic fs setacl
 .Bd -filled -offset indent -compact
-Add an acl entry on a directory. Each entry consists of two components:
+Add an acl entry on a directory.
+Each entry consists of two components:
 a user or group and a character string describing the permissions granted
-for that user or group. These characters and the permission they represent
-are:
+for that user or group.
+These characters and the permission they represent are:
 .Bl -tag -width Fl -compact
 .It Cm r
 read the files
@@ -482,7 +488,7 @@ administer the acl, that is, to change the acl
 .El
 .Pp
 There are also a few convinience strings recognized by
-.Nm fs setacl:
+.Ic fs setacl :
 .Bl -tag -width Fl -compact
 .It Cm none
 removes all permissions.
@@ -496,138 +502,139 @@ add all permissions.
 .El
 .Pp
 Note that in AFS you set the permissions on a directory, and the permissions
-of a file are those of their directory. So, if you move a file from one
+of a file are those of their directory.
+So, if you move a file from one
 directory to another, you might change the permission of the file, as
 the two directorys may have different permissions.
 .Pp
 Of the traditional
 .Ux
 permission bits only the user part is honored, and is used for any
-user permissioned by the directorys acl. The group and world permission
-bits are ignored, but they are stored.
+user permissioned by the directorys acl.
+The group and world permission bits are ignored, but they are stored.
 .Ed
 .Pp
-.Nm fs sa
+.Ic fs sa
 .Bd -filled -offset indent -compact
 shorthand for the
-.Nm setacl
+.Cm setacl
 command
 .Ed
 .Pp
-.Nm fs setcachesize
+.Ic fs setcachesize
 .Ar lowvnodes
 .Op Ar highvnodes Ar lowbytes Ar highbytes
 .Bd -filled -offset indent -compact
 Set the size of the disk cache.
 .Ed
 .Pp
-.Nm fs setcell
+.Ic fs setcell
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs setpriority
+.Ic fs setpriority
 .Ar file
 .Ar priority
 .Bd -filled -offset indent -compact
 Set priority of a file/directory.
 .Ed
 .Pp
-.Nm fs sp
+.Ic fs sp
 .Bd -filled -offset indent -compact
 Shorthand for the
-.Nm setpriority
+.Cm setpriority
 command.
 .Ed
 .Pp
-.Nm fs setmaxpriority
+.Ic fs setmaxpriority
 .Ar macprio
 .Bd -filled -offset indent -compact
 Set upper limit of priority.
 .Ed
 .Pp
-.Nm fs smq
+.Ic fs smq
 .Bd -filled -offset indent -compact
 shorthand for the
-.Nm setmaxpriority
+.Cm setmaxpriority
 comand
 .Ed
 .Pp
-.Nm fs setquota
+.Ic fs setquota
 .Ar path
 .Ar quota
 .Bd -filled -offset indent -compact
 Set the quota (in Kbytes) on a volume.
 .Ed
 .Pp
-.Nm fs sq
+.Ic fs sq
 .Bd -filled -offset indent -compact
 Shorthand for the
-.Nm setquota
+.Cm setquota
 command.
 .Ed
 .Pp
-.Nm fs setserverprefs
+.Ic fs setserverprefs
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs setcrypt
+.Ic fs setcrypt
 .Ar flag
 .Bd -filled -offset indent -compact
 If 'no' is specified, encryption of the traffic to/from fileservers is
 disabled, and if 'yes' is specified, it is enabled.
 .Ed
 .Pp
-.Nm fs setvol
+.Ic fs setvol
 .Bd -filled -offset indent -compact
 Not implemented yet.
 .Ed
 .Pp
-.Nm fs suidcells
+.Ic fs suidcells
 .Bd -filled -offset indent -compact
 Print cells and wether setuid execution is allowed for them.
 .Ed
 .Pp
-.Nm fs sysname
+.Ic fs sysname
 .Op Ar sysname
 .Bd -filled -offset indent -compact
 Get or set the value of the '@sys' value.
 .Ed
 .Pp
-.Nm fs version
+.Ic fs version
 .Bd -filled -offset indent -compact
 Print version of fs and fs_lib.
 .Ed
 .Pp
-.Nm fs venuslog
+.Ic fs venuslog
 .Bd -filled -offset indent -compact
 Make afsd print status.
 .Ed
 .Pp
-.Nm fs whereis
+.Ic fs whereis
 .Op Ar path
 .Bd -filled -offset indent -compact
 Show server(s) of the specified file or the current directory.
 .Ed
 .Pp
-.Nm fs whichcell
+.Ic fs whichcell
 .Op Ar path
 .Bd -filled -offset indent -compact
 Show cell of a file or the current directory.
 .Ed
 .Pp
-.Nm fs wscell
+.Ic fs wscell
 .Bd -filled -offset indent -compact
 Display default cell of the client.
 .Ed
 .Pp
-.Nm fs xfsdebug
+.Ic fs xfsdebug
 .Bd -filled -offset indent -compact
 Tweek xfs-debugging flags
 .Ed
 .Pp
-.Nm fs xfsprint
+.Ic fs xfsprint
 .Op Ar flags
 .Bd -filled -offset indent -compact
 Make xfs print debug info.
diff --git a/usr.sbin/afs/pts/pts.1 b/usr.sbin/afs/pts/pts.1
index 720d81839ce..a2f65867cd0 100644
--- a/usr.sbin/afs/pts/pts.1
+++ b/usr.sbin/afs/pts/pts.1
@@ -26,7 +26,7 @@ The
 .Nm
 utility provides several commands:
 .Pp
-.Bl -tag -width Fl -compact
+.Bl -tag -width "membership groups" -compact
 .It Cm adduser
 add a user to a group
 .It Cm chown
@@ -73,7 +73,8 @@ Specifies which AFS cell to use, if the default cell is not to be used.
 .Op Fl noauth
 Specifies that
 .Nm
-should not try to authenticate the connection to the server. This may be
+should not try to authenticate the connection to the server.
+This may be
 useful with shell scripts, or if there is a problem with the AFS cell.
 Note that the server will reject many commands if
 .Fl noauth
@@ -84,7 +85,7 @@ The syntax of the
 .Nm
 commands:
 .Pp
-.Nm pts adduser
+.Ic pts adduser
 .Op Fl name
 .Ar user
 .Op Fl group
@@ -95,7 +96,7 @@ commands:
 Add the specified user to the specified group.
 .Ed
 .Pp
-.Nm pts chown
+.Ic pts chown
 .Op Fl name
 .Ar user/group
 .Op Fl owner
@@ -106,47 +107,49 @@ Add the specified user to the specified group.
 Change owner of a group or user.
 .Ed
 .Pp
-.Nm pts creategroup
+.Ic pts creategroup
 .Op Fl name
 .Ar name
 .Op Fl id Ar idnumber
 .Op Fl cell Ar cellname
 .Op Fl noauth
 .Bd -filled -offset indent -compact
-Create a new group. If
+Create a new group.
+If
 .Fl id
 is not specified, a new idnumber is taken automatically.
 .Ed
 .Pp
-.Nm pts cg
+.Ic pts cg
 .Bd -filled -offset indent -compact
-.Nm pts cg
+.Ic pts cg
 is an alias for the
-.Nm pts creategroup
+.Ic pts creategroup
 command.
 .Ed
 .Pp
-.Nm pts createuser
+.Ic pts createuser
 .Op Fl name
 .Ar name
 .Op Fl id Ar idnumber
 .Op Fl cell Ar cellname
 .Op Fl noauth
 .Bd -filled -offset indent -compact
-Create a new user. If
+Create a new user.
+If
 .Fl id
 is not specified, a new idnumber is taken automatically.
 .Ed
 .Pp
-.Nm pts dump
+.Ic pts dump
 .Ar server
 .Op Fl cell cellname
 .Bd -filled -offset indent -compact
-Dump the Protection Database in a human readable form. The database is read
-from the given database server.
+Dump the Protection Database in a human readable form.
+The database is read from the given database server.
 .Ed
 .Pp
-.Nm pts delete
+.Ic pts delete
 .Op Fl name
 .Ar name/group
 .Op Fl cell Ar cellname
@@ -155,7 +158,7 @@ from the given database server.
 Delete a user or group from the database.
 .Ed
 .Pp
-.Nm pts examine
+.Ic pts examine
 .Ar user/group
 .Op Fl cell Ar cellname
 .Op Fl noauth
@@ -163,21 +166,21 @@ Delete a user or group from the database.
 Print verbose information about a user or a group.
 .Ed
 .Pp
-.Nm pts help
+.Ic pts help
 or
-.Nm pts ?
+.Ic pts ?
 .Bd -filled -offset indent -compact
 Print help about
 .Nm
 .Ed
 .Pp
-.Nm pts listmax
+.Ic pts listmax
 .Op Fl cell Ar cellname
 .Bd -filled -offset indent -compact
 Print the largest uid and gid.
 .Ed
 .Pp
-.Nm pts listowned
+.Ic pts listowned
 .Op Fl id
 .Ar user/group
 .Op Fl cell Ar cellname
@@ -186,7 +189,7 @@ Print the largest uid and gid.
 List the groups owned by a user or group.
 .Ed
 .Pp
-.Nm pts membership
+.Ic pts membership
 .Op Fl nameorid Ar user/group
 .Op Fl cell Ar cellname
 .Op Fl noauth
@@ -194,15 +197,15 @@ List the groups owned by a user or group.
 List the members of a group, or the groups a user is a member of.
 .Ed
 .Pp
-.Nm pts groups
+.Ic pts groups
 .Bd -filled -offset indent -compact
-.Nm pts groups
+.Ic pts groups
 is an alias for the
-.Nm pts membership
+.Ic pts membership
 command.
 .Ed
 .Pp
-.Nm pts removeuser
+.Ic pts removeuser
 .Op Fl user
 .Ar user
 .Op Fl group
@@ -213,7 +216,7 @@ command.
 Remove a users membership from a group.
 .Ed
 .Pp
-.Nm pts rename
+.Ic pts rename
 .Op Fl from
 .Ar "old name"
 .Op Fl to
@@ -224,19 +227,19 @@ Remove a users membership from a group.
 Rename a user or group.
 .Ed
 .Pp
-.Nm pts setfields
+.Ic pts setfields
 .Bd -filled -offset indent -compact
 This command is available in the original AFS client, but has not been
 implemented yet.
 .Ed
 .Pp
-.Nm pts setmax
+.Ic pts setmax
 .Bd -filled -offset indent -compact
 This command is available in the original AFS client, but has not been
 implemented yet.
 .Ed
 .Pp
-.Nm pts syncdb
+.Ic pts syncdb
 .Bd -filled -offset indent -compact
 This command has not been implemented yet.
 .Ed
diff --git a/usr.sbin/afs/vos/vos.8 b/usr.sbin/afs/vos/vos.8
index c84b68373b2..25367e88b60 100644
--- a/usr.sbin/afs/vos/vos.8
+++ b/usr.sbin/afs/vos/vos.8
@@ -3,7 +3,7 @@
 .Os
 .Sh NAME
 .Nm vos
-.Nd Manage AFS volumes and the VLDB.
+.Nd manage AFS volumes and the VLDB
 .Sh SYNOPSIS
 .Nm vos
 .Op Ar command
@@ -16,7 +16,7 @@ utility is used to manage AFS volumes and the volume location database (VLDB).
 .Nm
 provides several commands:
 .Pp
-.Bl -tag -width Fl -compact
+.Bl -tag -width createentry -compact
 .It Cm addsite
 not yet implemented
 .It Cm apropos
@@ -96,7 +96,8 @@ Specifies which AFS cell to use, if the default cell is not to be used.
 .Op Fl noauth
 Specifies that
 .Nm
-should not try to authenticate the connection to the server. This may be
+should not try to authenticate the connection to the server.
+This may be
 useful with shell scripts, or if there is a problem with the AFS cell.
 Note that the server will reject many commands if
 .Fl noauth
@@ -112,32 +113,32 @@ The syntax of the
 .Nm
 commands:
 .Pp
-.Nm vos addsite
+.Ic vos addsite
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos apropos
+.Ic vos apropos
 .Bd -filled -offset indent -compact
 apropos
 .Ed
 .Pp
-.Nm vos backup
+.Ic vos backup
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos backupsys
+.Ic vos backupsys
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos changeaddr
+.Ic vos changeaddr
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos create
+.Ic vos create
 .Op Fl server
 .Ar fileserver
 .Op Fl part
@@ -154,10 +155,10 @@ Create a new volume named
 on server
 .Ar fileserver
 partition
-.Ar partition.
+.Ar partition .
 .Ed
 .Pp
-.Nm vos createentry
+.Ic vos createentry
 .Op Fl id
 .Ar "id of volume"
 .Op Fl host
@@ -173,19 +174,20 @@ partition
 .Op Fl noauth
 .Op Fl localauth
 .Bd -filled -offset indent -compact
-Create a vldb entry manually. This command should
+Create a vldb entry manually.
+This command should
 .Em not
 be used unless you know
 .Em exactly
 what you are doing.
 .Ed
 .Pp
-.Nm vos delentry
+.Ic vos delentry
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos dump
+.Ic vos dump
 .Op Fl id
 .Ar volume
 .Op Fl server Ar fileserver
@@ -199,7 +201,7 @@ not yet implemented
 Dump a volume to a file.
 .Ed
 .Pp
-.Nm vos endtrans
+.Ic vos endtrans
 .Op Fl server
 .Ar server
 .Op Fl trans
@@ -208,10 +210,11 @@ Dump a volume to a file.
 .Op Fl noauth
 .Op Fl verbose
 .Bd -filled -offset indent -compact
-End a transaction. XXX what is this?
+End a transaction.
+XXX what is this?
 .Ed
 .Pp
-.Nm vos examine
+.Ic vos examine
 .Op Fl id
 .Ar volume
 .Op Fl host
@@ -225,28 +228,28 @@ End a transaction. XXX what is this?
 Print information about a volume.
 .Ed
 .Pp
-.Nm vos volinfo
+.Ic vos volinfo
 .Bd -filled -offset indent -compact
-.Nm vos volinfo
+.Ic vos volinfo
 is an alias for the
-.Nm vos examine
+.Ic vos examine
 command.
 .Ed
 .Pp
-.Nm vos help
+.Ic vos help
 .Bd -filled -offset indent -compact
 print help
 .Ed
 .Pp
-.Nm vos ?
+.Ic vos ?
 .Bd -filled -offset indent -compact
-.Nm vos ?
+.Ic vos ?
 is an alias for the
-.Nm vos help
+.Ic vos help
 command.
 .Ed
 .Pp
-.Nm vos listpart
+.Ic vos listpart
 .Op Fl server
 .Ar fileserver
 .Op Fl cell Ar cellname
@@ -257,7 +260,7 @@ command.
 List partitions on a fileserver.
 .Ed
 .Pp
-.Nm vos listvldb
+.Ic vos listvldb
 .Op Fl server
 .Ar fileserver
 .Op Fl cell Ar cellname
@@ -269,7 +272,7 @@ List volumes in the volume location database without reading them on the
 fileserver.
 .Ed
 .Pp
-.Nm vos listvol
+.Ic vos listvol
 .Op Fl server
 .Ar fileserver
 .Op Fl partition
@@ -282,17 +285,17 @@ fileserver.
 List volumes on a fileserver, without consulting the volume location database.
 .Ed
 .Pp
-.Nm vos lock
+.Ic vos lock
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos move
+.Ic vos move
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos partinfo
+.Ic vos partinfo
 .Op Fl server
 .Ar fileserver
 .Op Fl partition
@@ -305,32 +308,32 @@ not yet implemented
 Print the total and remaining diskspace on a fileserver.
 .Ed
 .Pp
-.Nm vos release
+.Ic vos release
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos remove
+.Ic vos remove
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos remsite
+.Ic vos remsite
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos rename
+.Ic vos rename
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos restore
+.Ic vos restore
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos status
+.Ic vos status
 .Op Fl server
 .Ar fileserver
 .Op Fl cell Ar cellname
@@ -340,37 +343,37 @@ not yet implemented
 Show volume server transactions.
 .Ed
 .Pp
-.Nm vos syncserv
+.Ic vos syncserv
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos syncvldb
+.Ic vos syncvldb
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos syncsite
+.Ic vos syncsite
 .Bd -filled -offset indent -compact
 print the syncsite
 .Ed
 .Pp
-.Nm vos unlock
+.Ic vos unlock
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos unlockvldb
+.Ic vos unlockvldb
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos zap
+.Ic vos zap
 .Bd -filled -offset indent -compact
 not yet implemented
 .Ed
 .Pp
-.Nm vos quit
+.Ic vos quit
 .Bd -filled -offset indent -compact
 Exit interactive mode.
 .Ed
diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index 1cc9189e195..7e3e56db8b8 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)inetd.8	6.7 (Berkeley) 3/16/91
-.\"	$Id: inetd.8,v 1.14 2000/04/12 21:47:53 aaron Exp $
+.\"	$Id: inetd.8,v 1.15 2000/04/15 02:15:18 aaron Exp $
 .\"
 .Dd March 16, 1991
 .Dt INETD 8
@@ -413,7 +413,7 @@ If you have two servers on
 and
 .Dq tcp6 ,
 IPv4 traffic will be routed to the server on
-.Dq tcp4,
+.Dq tcp4 ,
 and IPv6 traffic will go to server on
 .Dq tcp6 .
 .It
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index ccdae1e54fa..f767ddb69ee 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: iostat.8,v 1.13 2000/03/19 17:57:05 aaron Exp $
+.\"	$OpenBSD: iostat.8,v 1.14 2000/04/15 02:15:19 aaron Exp $
 .\"	$NetBSD: iostat.8,v 1.10 1996/10/25 18:21:57 scottr Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -85,8 +85,8 @@ interval is specified, the default is 1 second.
 .It Fl C
 Show CPU statistics.
 This is enabled by default unless the
-.Fl d,
-.Fl D,
+.Fl d ,
+.Fl D ,
 or
 .Fl T
 flags are used.
@@ -113,8 +113,8 @@ Extract the name list from the specified system instead of the default
 .It Fl T
 Show tty statistics.
 This is enabled by default unless the
-.Fl C,
-.Fl d,
+.Fl C ,
+.Fl d ,
 or
 .Fl D
 flags are used.
@@ -158,8 +158,8 @@ Megabytes transferred per second
 .Pp
 .El
 The alternate display format, (selected with
-.Fl D
-), presents the following values.
+.Fl D ) ,
+presents the following values.
 .Bl -tag -width indent -compact
 .It KB
 Kilobytes transferred
diff --git a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8 b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
index 1c372d4dfc4..6e9ec16a81c 100644
--- a/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
+++ b/usr.sbin/netgroup_mkdb/netgroup_mkdb.8
@@ -27,7 +27,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: netgroup_mkdb.8,v 1.3 2000/03/19 17:57:09 aaron Exp $
+.\"	$Id: netgroup_mkdb.8,v 1.4 2000/04/15 02:15:19 aaron Exp $
 .\"
 .Dd February 3, 1994
 .Dt NETGROUP_MKDB 8
@@ -50,7 +50,7 @@ is used.
 These databases are then installed into
 .Pa /etc/netgroup.db .
 The file must be in the correct format (see
-.Xr netgroup 5 ).
+.Xr netgroup 5 ) .
 .Pp
 The options are as follows:
 .Bl -tag -width indent
@@ -59,7 +59,7 @@ Put the output databases in the named file.
 .El
 .Pp
 The databases are used by the C library netgroup routines (see
-.Xr getnetgrent 3 ).
+.Xr getnetgrent 3 ) .
 .Pp
 .Nm netgroup_mkdb
 exits zero on success, non-zero on failure.
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index b148a55a52b..250fd0de6dc 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.19 2000/04/12 21:47:55 aaron Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.20 2000/04/15 02:15:19 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -276,7 +276,7 @@ final location, otherwise it is extracted into the staging area.
 If the package contains a
 .Ar require
 script (see
-.Xr pkg_create 1 ),
+.Xr pkg_create 1 ) ,
 it is executed with the following arguments:
 .Bl -tag -width indentindent
 .It Ar pkg-name
@@ -315,7 +315,7 @@ the staging area into their final locations.
 If the package contains an
 .Ar mtreefile
 file (see
-.Xr pkg_create 1 ),
+.Xr pkg_create 1 ) ,
 then mtree is invoked as:
 .Pp
 .Bd -filled -offset indent -compact
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index aab877ee3cf..ea1ee68c799 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.9 2000/03/19 17:57:10 aaron Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.10 2000/04/15 02:15:19 aaron Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -122,7 +122,7 @@ option is given).
 If the package contains a
 .Ar require
 file (see
-.Xr pkg_create 1 ),
+.Xr pkg_create 1 ) ,
 then this is executed first as
 .Bd -filled -offset indent
 .Cm require
diff --git a/usr.sbin/pkg_install/sign/pkg_sign.1 b/usr.sbin/pkg_install/sign/pkg_sign.1
index 807eb252da1..fd709e83be7 100644
--- a/usr.sbin/pkg_install/sign/pkg_sign.1
+++ b/usr.sbin/pkg_install/sign/pkg_sign.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_sign.1,v 1.5 2000/04/12 21:47:55 aaron Exp $
+.\" $OpenBSD: pkg_sign.1,v 1.6 2000/04/15 02:15:20 aaron Exp $
 .\"
 .\" Copyright (c) 1999 Marc Espie.
 .\"
@@ -64,7 +64,7 @@ If
 is
 .Li sha1 ,
 you must supply an
-.Ar id,
+.Ar id ,
 which will be recorded as the name of the package, and printed as the
 SHA1 checksum.
 .Pp
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index cc114f87148..3a4833777c9 100644
--- a/usr.sbin/rtadvd/rtadvd.conf.5
+++ b/usr.sbin/rtadvd/rtadvd.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtadvd.conf.5,v 1.6 2000/04/12 21:47:57 aaron Exp $
+.\"	$OpenBSD: rtadvd.conf.5,v 1.7 2000/04/15 02:15:20 aaron Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -36,33 +36,33 @@
 .Nm rtadvd.conf
 .Nd config file for router advertisement daemon
 .Sh DESCRIPTION
-The file describes how the router advertisement packet must be constructed
+This file describes how the router advertisement packets must be constructed
 for each of the interfaces.
 .Pp
-It obeys famous
+It obeys the famous
 .Xr termcap 5
 file format.
 Each line in the file describes a network interface.
 Fields are separated by a colon
-.Po
-.Dq \&:
-.Pc ,
+.Pq Sq \&: ,
 and each field contains one capability description.
-Lines may be concatenated by \e character.
-The comment marker is `#' character.
+Lines may be concatenated by the
+.Sq \e
+character.
+The comment marker is the `#' character.
 .Pp
 .Sh CAPABILITIES
 Capabilities describe the value to be filled into ICMPv6 router
-advertisement message and to control
+advertisement messages and to control
 .Xr rtadvd 8
 behavior.
 Therefore, you are encouraged to read IETF neighbor discovery documents
-if you would like to modify sample configuration file.
+if you would like to modify the sample configuration file.
 .Pp
 Note that almost all items have default values.
 If you omit an item, the default value of the item will be used.
 .Pp
-There are two items to control interval of sending router advertisements.
+There are two items which control the interval of sending router advertisements.
 .Bl -tag -width indent
 .It Cm \&maxinterval
 (num) The maximum time allowed between sending unsolicited
@@ -76,10 +76,10 @@ and no greater than 1800 seconds.
 router advertisements
 .Pq unit: seconds .
 The default value is the one third of value of
-.Ic maxinterval.
+.Cm maxinterval .
 Its value must be no less than 3 seconds and no greater than .75 *
 the value of
-.Ic maxinterval.
+.Cm maxinterval .
 .El
 .Pp
 The following items are for ICMPv6 router advertisement message
@@ -132,7 +132,7 @@ If its value is more than 1, you must specify the index of the prefix
 for each item below.
 Indices vary from 0 to N-1, where N is the
 value of
-.Ic addrs.
+.Cm addrs .
 Each index shall follows the name of each item, e.g.,
 .Dq prefixlen2 .
 .It Cm \&prefixlen
@@ -161,7 +161,7 @@ file format as well as IPv6 numeric address, the field MUST be quoted by
 doublequote character.
 This field cannot be
 omitted if the value of
-.Ic addrs
+.Cm addrs
 is more than 0.
 .It Cm \&vltime
 (num) Valid lifetime field
diff --git a/usr.sbin/rtsold/rtsold.8 b/usr.sbin/rtsold/rtsold.8
index 82d5d2ab70c..190a7f3699f 100644
--- a/usr.sbin/rtsold/rtsold.8
+++ b/usr.sbin/rtsold/rtsold.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rtsold.8,v 1.9 2000/04/12 21:47:57 aaron Exp $
+.\"	$OpenBSD: rtsold.8,v 1.10 2000/04/15 02:15:20 aaron Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -119,7 +119,7 @@ Upon receipt of signal
 .Dv SIGUSR1 ,
 .Nm
 will dump the current internal state into
-.Pa /var/run/rtsold.dump.
+.Pa /var/run/rtsold.dump .
 .\"
 .Sh OPTIONS
 .Bl -tag -width indent
diff --git a/usr.sbin/sendmail/src/sendmail.8 b/usr.sbin/sendmail/src/sendmail.8
index 7d9ab430756..a181a6474c6 100644
--- a/usr.sbin/sendmail/src/sendmail.8
+++ b/usr.sbin/sendmail/src/sendmail.8
@@ -157,7 +157,7 @@ Ignore dots alone on lines by themselves in incoming messages.
 This should be set if you are reading data from a file.
 .It Fl N Ar dsn
 Set delivery status notification conditions to
-.Ar dsn,
+.Ar dsn ,
 which can be
 .Ql never
 for no notifications
@@ -531,9 +531,8 @@ Except for the file
 .Pa /etc/sendmail.cf
 itself and the daemon process ID file,
 the following pathnames are all specified in
-.Pa /etc/sendmail.cf.
-Thus,
-these values are only approximations.
+.Pa /etc/sendmail.cf .
+Thus, these values are only approximations.
 .Pp
 .Bl -tag -width /usr/lib/sendmail.fc -compact
 .It Pa /etc/aliases
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index 891b70bf8d2..82e9c0203d8 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.21 2000/03/19 17:57:16 aaron Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.22 2000/04/15 02:15:21 aaron Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -1104,7 +1104,7 @@ The following description assumes familiarity with
 the
 .Tn TCP
 protocol described in
-.Tn RFC 793.
+.Tn RFC 793 .
 If you are not familiar
 with the protocol, neither this description nor
 .Nm
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 134083df3f8..7fe047525fb 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timedc.8,v 1.7 2000/03/19 17:57:16 aaron Exp $
+.\"	$OpenBSD: timedc.8,v 1.8 2000/04/15 02:15:21 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -99,7 +99,7 @@ Show the master time server for specified host(s).
 Enable or disable the tracing of incoming messages to
 .Xr timed
 in the file
-.Pa /var/log/timed.log.
+.Pa /var/log/timed.log .
 .Pp
 .It Ic election Ar host
 Asks the daemon
diff --git a/usr.sbin/traceroute/traceroute.8 b/usr.sbin/traceroute/traceroute.8
index 67a6f0e8a33..7836c105c50 100644
--- a/usr.sbin/traceroute/traceroute.8
+++ b/usr.sbin/traceroute/traceroute.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: traceroute.8,v 1.19 2000/04/11 13:20:32 aaron Exp $
+.\"	$OpenBSD: traceroute.8,v 1.20 2000/04/15 02:15:21 aaron Exp $
 .\"	$NetBSD: traceroute.8,v 1.6 1995/10/12 03:05:50 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
@@ -114,11 +114,11 @@ to a numeric protocol or a name as specified in
 This will not work reliably for most protocols.
 If set to 1 (ICMP), then
 ICMP Echo Request messages will be used (same as
-.Xr ping 8
-).
+.Xr ping 8 ) .
 .It Fl I
 Equivalent to
-.Fl P 1.
+.Fl P
+1.
 Used for compatibility with other OSes.
 .It Fl p Ar port
 Set the base
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 94e227cfe7c..b911a309579 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypbind.8,v 1.14 2000/03/19 17:57:17 aaron Exp $
+.\"	$OpenBSD: ypbind.8,v 1.15 2000/04/15 02:15:21 aaron Exp $
 .\"	$NetBSD: ypbind.8,v 1.2 1996/02/28 01:21:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,13 +50,13 @@
 .Nm
 finds the server for a particular YP domain and stores information about it
 in a
-.Pa binding file.
+.Dq binding file .
 This binding information includes the IP address of the server associated with
 that particular domain and which port the server is using.
 This information is stored in the directory
 .Pa /var/yp/binding
 in a file named with the convention
-.Pa DOMAINNAME.version.
+.Pa DOMAINNAME.version .
 (The YP system only supplies information on version 2.)
 .Pp
 When