From: aaron <aaron@openbsd.org>
Date: Tue, 14 Mar 2000 21:31:34 +0000 (+0000)
Subject: Suffix "i.e." and "e.g." with a comma. Just another really picky man page
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=4267197969b149ed1ccab7d61a83a0ed22afbe15;p=openbsd

Suffix "i.e." and "e.g." with a comma. Just another really picky man page
commit, as we want our documentation to be as consistently formatted as
possible (it's getting there :-)).
---

diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index bd7dac96701..f8feb04c1c2 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.16 2000/03/05 00:28:52 aaron Exp $
+.\"	$OpenBSD: pax.1,v 1.17 2000/03/14 21:31:41 aaron Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -781,7 +781,7 @@ This option is the same as the
 option, except that the file inode change time is checked instead of the
 file modification time.
 The file inode change time can be used to select files whose inode information
-(e.g. UID, GID, etc.) is newer than a copy of the file in the destination
+(e.g., UID, GID, etc.) is newer than a copy of the file in the destination
 .Ar directory .
 .It Fl E Ar limit
 Limit the number of consecutive read faults while trying to read a flawed
@@ -875,7 +875,7 @@ the file was last written).
 The
 .Ar c
 specifies the comparison of inode change time (the time when the file
-inode was last changed; e.g. a change of owner, group, mode, etc).
+inode was last changed; e.g., a change of owner, group, mode, etc).
 When
 .Ar c
 and
diff --git a/lib/libc/crypt/blowfish.3 b/lib/libc/crypt/blowfish.3
index b73d727c91f..41dfb59bc9b 100644
--- a/lib/libc/crypt/blowfish.3
+++ b/lib/libc/crypt/blowfish.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: blowfish.3,v 1.6 1999/09/23 04:12:00 alex Exp $
+.\" $OpenBSD: blowfish.3,v 1.7 2000/03/14 21:31:44 aaron Exp $
 .\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
 .\" All rights reserved.
 .\"
@@ -95,7 +95,7 @@ and
 .Fn Blowfish_decipher
 are used for customization of the
 .Pa Blowfish
-cipher, e.g. for the blowfish password hashing function.
+cipher, e.g., for the blowfish password hashing function.
 .Sh SEE ALSO
 .Xr passwd 1 ,
 .Xr crypt 3 ,
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 298f1b0e66f..097f529ebf3 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: btree.3,v 1.12 1999/07/09 13:35:15 aaron Exp $
+.\"	$OpenBSD: btree.3,v 1.13 2000/03/14 21:31:39 aaron Exp $
 .\"	$NetBSD: btree.3,v 1.6 1996/05/03 21:26:48 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -96,7 +96,7 @@ The flag value is specified by
 any of the following values:
 .Bl -tag -width XXXXX
 .It Dv R_DUP
-Permit duplicate keys in the tree, i.e. permit insertion if the key to be
+Permit duplicate keys in the tree, i.e., permit insertion if the key to be
 inserted already exists in the tree.
 The default behavior, as described in
 .Xr dbopen 3 ,
@@ -143,7 +143,7 @@ Not currently implemented.
 .It minkeypage
 The minimum number of keys which will be stored on any single page.
 This value is used to determine which keys will be stored on overflow
-pages, i.e. if a key or data item is longer than the pagesize divided
+pages, i.e., if a key or data item is longer than the pagesize divided
 by the minkeypage value, it will be stored on overflow pages instead
 of in the page itself. If
 .Fa minkeypage
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index dd029dc6861..8f0f5c46ffb 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dbopen.3,v 1.13 1999/07/07 14:22:24 aaron Exp $
+.\"	$OpenBSD: dbopen.3,v 1.14 2000/03/14 21:31:39 aaron Exp $
 .\"	$NetBSD: dbopen.3,v 1.6 1995/02/27 13:23:25 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -315,7 +315,7 @@ or
 .Fa sync
 routines.
 Modifications to the database during a sequential scan will be reflected
-in the scan, i.e. records inserted behind the cursor will not be returned
+in the scan, i.e., records inserted behind the cursor will not be returned
 while records inserted in front of the cursor will be returned.
 .Pp
 The flag value
diff --git a/lib/libc/db/man/recno.3 b/lib/libc/db/man/recno.3
index 03dd057416c..871e3c7b7e9 100644
--- a/lib/libc/db/man/recno.3
+++ b/lib/libc/db/man/recno.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: recno.3,v 1.8 1999/07/09 13:35:15 aaron Exp $
+.\"	$OpenBSD: recno.3,v 1.9 2000/03/14 21:31:39 aaron Exp $
 .\"	$NetBSD: recno.3,v 1.6 1996/05/03 21:26:51 cgd Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -183,7 +183,7 @@ field of the key should be the size of that type.
 .Pp
 Because there can be no meta-data associated with the underlying
 recno access method files, any changes made to the default values
-(e.g. fixed record length or byte separator value) must be explicitly
+(e.g., fixed record length or byte separator value) must be explicitly
 specified each time the file is opened.
 .Pp
 In the interface specified by
diff --git a/lib/libc/gen/ualarm.3 b/lib/libc/gen/ualarm.3
index b89f065fe17..f802b55d260 100644
--- a/lib/libc/gen/ualarm.3
+++ b/lib/libc/gen/ualarm.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ualarm.3,v 1.11 1999/07/09 13:35:19 aaron Exp $
+.\"	$OpenBSD: ualarm.3,v 1.12 2000/03/14 21:31:45 aaron Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -64,7 +64,7 @@ argument is non-zero, the
 signal will be sent
 to the process every
 .Fa interval
-microseconds after the timer expires (e.g. after
+microseconds after the timer expires (e.g., after
 .Fa microseconds
 number of microseconds have passed).
 .Sh RETURN VALUES
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7
index 3f2ff55ab09..baf243d7cfa 100644
--- a/lib/libc/regex/re_format.7
+++ b/lib/libc/regex/re_format.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: re_format.7,v 1.7 1999/07/09 13:35:22 aaron Exp $
+.\"	$OpenBSD: re_format.7,v 1.8 2000/03/14 21:31:45 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -130,9 +130,9 @@ for the full
 .Em range
 of characters between those two (inclusive) in the
 collating sequence,
-e.g. `[0-9]' in ASCII matches any decimal digit.
+e.g., `[0-9]' in ASCII matches any decimal digit.
 It is illegal\(dg for two ranges to share an
-endpoint, e.g. `a-c-e'.
+endpoint, e.g., `a-c-e'.
 Ranges are very collating-sequence-dependent,
 and portable programs should avoid relying on them.
 .Pp
@@ -154,7 +154,7 @@ sequence of characters of that collating element.
 The sequence is a single element of the bracket expression's list.
 A bracket expression containing a multi-character collating element
 can thus match more than one character,
-e.g. if the collating sequence includes a `ch' collating element,
+e.g., if the collating sequence includes a `ch' collating element,
 then the RE `[[.ch.]]*c' matches the first five characters
 of `chchcc'.
 .Pp
@@ -236,7 +236,7 @@ alphabet.
 When an alphabetic that exists in multiple cases appears as an
 ordinary character outside a bracket expression, it is effectively
 transformed into a bracket expression containing both cases,
-e.g. `x' becomes `[xX]'.
+e.g., `x' becomes `[xX]'.
 When it appears inside a bracket expression, all case counterparts
 of it are added to the bracket expression, so that (e.g.) `[x]'
 becomes `[xX]' and `[^x]' becomes `[^xX]'.
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 589f970102f..f4917464776 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: regex.3,v 1.12 2000/03/06 21:46:56 aaron Exp $
+.\"	$OpenBSD: regex.3,v 1.13 2000/03/14 21:31:45 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
 .\"
@@ -593,7 +593,7 @@ empty (sub)expression
 .Dq can't happen
 \(emyou found a bug
 .It Er REG_INVARG
-invalid argument, e.g. negative-length string
+invalid argument, e.g., negative-length string
 .El
 .Sh HISTORY
 Originally written by Henry Spencer.
diff --git a/lib/libc/sys/brk.2 b/lib/libc/sys/brk.2
index d94beef6100..6967e52a960 100644
--- a/lib/libc/sys/brk.2
+++ b/lib/libc/sys/brk.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: brk.2,v 1.9 1999/06/29 14:09:50 aaron Exp $
+.\"	$OpenBSD: brk.2,v 1.10 2000/03/14 21:31:40 aaron Exp $
 .\"	$NetBSD: brk.2,v 1.7 1995/02/27 12:31:57 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -102,7 +102,7 @@ beyond the
 .Em rlim_max
 value returned from a call to
 .Xr getrlimit ,
-e.g.
+e.g.,
 .Dq etext + rlp\(->rlim_max.
 (see
 .Xr end 3
diff --git a/lib/libc/sys/ioctl.2 b/lib/libc/sys/ioctl.2
index b9de49dce3d..d90d61eeb63 100644
--- a/lib/libc/sys/ioctl.2
+++ b/lib/libc/sys/ioctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ioctl.2,v 1.9 1999/06/29 14:23:29 aaron Exp $
+.\"	$OpenBSD: ioctl.2,v 1.10 2000/03/14 21:31:40 aaron Exp $
 .\"	$NetBSD: ioctl.2,v 1.5 1995/02/27 12:33:47 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -49,7 +49,7 @@ The
 .Fn ioctl
 function manipulates the underlying device parameters of special files.
 In particular, many operating
-characteristics of character special files (e.g. terminals)
+characteristics of character special files (e.g., terminals)
 may be controlled with
 .Fn ioctl
 requests.
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2
index 04c87195bc4..7cc34aa3091 100644
--- a/lib/libc/sys/mlock.2
+++ b/lib/libc/sys/mlock.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mlock.2,v 1.9 1999/06/29 14:10:07 aaron Exp $
+.\"	$OpenBSD: mlock.2,v 1.10 2000/03/14 21:31:39 aaron Exp $
 .\"	$NetBSD: mlock.2,v 1.3 1995/06/24 10:42:03 cgd Exp $
 .\"
 .\" Copyright (c) 1993
@@ -146,7 +146,7 @@ Unlike The Sun implementation, multiple
 .Nm mlock
 calls on the same address range require the corresponding number of
 .Nm munlock
-calls to actually unlock the pages, i.e.
+calls to actually unlock the pages, i.e.,
 .Nm mlock
 nests.
 This should be considered a consequence of the implementation
diff --git a/lib/libc/sys/send.2 b/lib/libc/sys/send.2
index 3ee0184af87..e5cb99fd318 100644
--- a/lib/libc/sys/send.2
+++ b/lib/libc/sys/send.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: send.2,v 1.17 1999/08/15 13:14:12 deraadt Exp $
+.\"	$OpenBSD: send.2,v 1.18 2000/03/14 21:31:40 aaron Exp $
 .\"	$NetBSD: send.2,v 1.6 1996/01/15 01:17:18 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -107,7 +107,7 @@ The flag
 .Dv MSG_OOB
 is used to send
 .Dq out-of-band
-data on sockets that support this notion (e.g.
+data on sockets that support this notion (e.g.,
 .Dv SOCK_STREAM ) ;
 the underlying protocol must also support
 .Dq out-of-band
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index 850ac578ba6..f63fb31b685 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: socket.2,v 1.13 2000/01/22 12:05:49 aaron Exp $
+.\"	$OpenBSD: socket.2,v 1.14 2000/03/14 21:31:40 aaron Exp $
 .\"	$NetBSD: socket.2,v 1.5 1995/02/27 12:37:53 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -165,7 +165,7 @@ by forcing transmissions
 roughly every minute in the absence of other activity.
 An error is then indicated if no response can be
 elicited on an otherwise
-idle connection for a extended period (e.g. 5 minutes).
+idle connection for a extended period (e.g., 5 minutes).
 A
 .Dv SIGPIPE
 signal is raised if a process sends
diff --git a/lib/libc/yp/ypclnt.3 b/lib/libc/yp/ypclnt.3
index bc55adc8876..d0a1470cf23 100644
--- a/lib/libc/yp/ypclnt.3
+++ b/lib/libc/yp/ypclnt.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypclnt.3,v 1.10 1999/11/30 00:46:19 deraadt Exp $
+.\"	$OpenBSD: ypclnt.3,v 1.11 2000/03/14 21:31:45 aaron Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -137,7 +137,7 @@ to a YP server process.  The client process need not explicitly bind to
 the server, as it happens automatically whenever a lookup occurs.
 The function
 .Fn yp_bind
-is provided for a backup strategy, e.g. a local file, when a YP server process
+is provided for a backup strategy, e.g., a local file, when a YP server process
 is not available.  Each binding uses one socket descriptor on the client
 process, which may be explicitly freed using
 .Fn yp_unbind ,
diff --git a/lib/libc_r/man/pthread_rwlock_rdlock.3 b/lib/libc_r/man/pthread_rwlock_rdlock.3
index 3d038109370..eca23295ce0 100644
--- a/lib/libc_r/man/pthread_rwlock_rdlock.3
+++ b/lib/libc_r/man/pthread_rwlock_rdlock.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_rwlock_rdlock.3,v 1.3 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_rwlock_rdlock.3,v 1.4 2000/03/14 21:31:40 aaron Exp $
 .\" Copyright (c) 1998 Alex Nash
 .\" All rights reserved.
 .\"
@@ -53,7 +53,7 @@ acquire the lock.
 The
 .Fn pthread_rwlock_tryrdlock
 function performs the same action, but does not block if the lock
-cannot be immediately obtained (i.e. the lock is held for writing
+cannot be immediately obtained (i.e., the lock is held for writing
 or there are waiting writers).
 .Pp
 A thread may hold multiple concurrent read locks.  If so,
diff --git a/lib/libc_r/man/pthreads.3 b/lib/libc_r/man/pthreads.3
index 37cb3cdbc12..4e4b1c6822a 100644
--- a/lib/libc_r/man/pthreads.3
+++ b/lib/libc_r/man/pthreads.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthreads.3,v 1.7 2000/01/06 07:10:16 d Exp $
+.\" $OpenBSD: pthreads.3,v 1.8 2000/03/14 21:31:40 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1998. Public domain.
 .Dd August 17, 1998
 .Dt PTHREADS 3
@@ -107,7 +107,7 @@ or similar.
 The meaning of thread flags are as follows:
 .Bl -tag -offset indent -width 3en -compact
 .It p
-Private, system thread (e.g. the garbage collector).
+Private, system thread (e.g., the garbage collector).
 .It E
 Thread is exiting.
 .It C
diff --git a/lib/libcompat/regexp/regexp.3 b/lib/libcompat/regexp/regexp.3
index 88484808b25..8865b06d2e4 100644
--- a/lib/libcompat/regexp/regexp.3
+++ b/lib/libcompat/regexp/regexp.3
@@ -226,7 +226,7 @@ If two characters in the sequence are separated by `\-', this is shorthand
 for the full list of
 .Tn ASCII
 characters between them
-(e.g. `[0-9]' matches any decimal digit).
+(e.g., `[0-9]' matches any decimal digit).
 To include a literal `]' in the sequence, make it the first character
 (following a possible `^').
 To include a literal `\-', make it the first or last character.
diff --git a/lib/libedit/editrc.5 b/lib/libedit/editrc.5
index 9939463df8b..940c5bd7e56 100644
--- a/lib/libedit/editrc.5
+++ b/lib/libedit/editrc.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: editrc.5,v 1.9 1999/09/23 04:12:01 alex Exp $
+.\"	$OpenBSD: editrc.5,v 1.10 2000/03/14 21:31:46 aaron Exp $
 .\"	$NetBSD: editrc.5,v 1.4 1997/04/24 20:20:31 christos Exp $
 .\"
 .\" Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@ can contain control characters of the form
 .Sq No ^ Ar character
 .Sm on
 .Po
-e.g.
+e.g.,
 .Sq ^A
 .Pc ,
 and the following backslashed escape sequences:
diff --git a/lib/libm/man/exp.3 b/lib/libm/man/exp.3
index d354c4c044a..517a61bb8b9 100644
--- a/lib/libm/man/exp.3
+++ b/lib/libm/man/exp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: exp.3,v 1.8 2000/03/02 00:29:49 todd Exp $
+.\"	$OpenBSD: exp.3,v 1.9 2000/03/14 21:31:46 aaron Exp $
 .\" Copyright (c) 1985, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -247,7 +247,7 @@ upon 0**0 to be invalid is dubious anyway since that
 expression's meaning and, if invalid, its consequences
 vary from one computer system to another.
 .It
-Some Algebra texts (e.g. Sigler's) define x**0 = 1 for
+Some Algebra texts (e.g., Sigler's) define x**0 = 1 for
 all x, including x = 0.
 This is compatible with the convention that accepts a[0]
 as the value of polynomial
diff --git a/lib/libmenu/menu_driver.3 b/lib/libmenu/menu_driver.3
index 249d18d0d0e..fb6cd06759a 100644
--- a/lib/libmenu/menu_driver.3
+++ b/lib/libmenu/menu_driver.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: menu_driver.3,v 1.5 1999/01/22 03:45:06 millert Exp $
+.\" $OpenBSD: menu_driver.3,v 1.6 2000/03/14 21:31:46 aaron Exp $
 .\"
 .\"***************************************************************************
 .\" Copyright (c) 1998 Free Software Foundation, Inc.                        *
@@ -105,7 +105,7 @@ corresponding action is performed.
 .PP
 If the second argument is the KEY_MOUSE special key, the associated
 mouse event is translated into one of the above pre-defined requests.
-Currently only clicks in the user window (e.g. inside the menu display
+Currently only clicks in the user window (e.g., inside the menu display
 area or the decoration window) are handled. If you click above the
 display region of the menu, a REQ_SCR_ULINE is generated, if you
 doubleclick a REQ_SCR_UPAGE is generated and if you tripleclick a
diff --git a/lib/libpcap/pcap.3 b/lib/libpcap/pcap.3
index f015b49138e..fbcaa63be8c 100644
--- a/lib/libpcap/pcap.3
+++ b/lib/libpcap/pcap.3
@@ -278,7 +278,7 @@ returns a
 pointer to the next packet.
 .Pp
 .Fn pcap_datalink
-returns the link layer type, e.g.
+returns the link layer type, e.g.,
 .Tn DLT_EN10MB .
 .Pp
 .Fn pcap_snapshot
diff --git a/lib/libpthread/man/pthread_rwlock_rdlock.3 b/lib/libpthread/man/pthread_rwlock_rdlock.3
index 3d038109370..eca23295ce0 100644
--- a/lib/libpthread/man/pthread_rwlock_rdlock.3
+++ b/lib/libpthread/man/pthread_rwlock_rdlock.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_rwlock_rdlock.3,v 1.3 1999/11/24 05:35:32 d Exp $
+.\" $OpenBSD: pthread_rwlock_rdlock.3,v 1.4 2000/03/14 21:31:40 aaron Exp $
 .\" Copyright (c) 1998 Alex Nash
 .\" All rights reserved.
 .\"
@@ -53,7 +53,7 @@ acquire the lock.
 The
 .Fn pthread_rwlock_tryrdlock
 function performs the same action, but does not block if the lock
-cannot be immediately obtained (i.e. the lock is held for writing
+cannot be immediately obtained (i.e., the lock is held for writing
 or there are waiting writers).
 .Pp
 A thread may hold multiple concurrent read locks.  If so,
diff --git a/lib/libpthread/man/pthreads.3 b/lib/libpthread/man/pthreads.3
index 37cb3cdbc12..4e4b1c6822a 100644
--- a/lib/libpthread/man/pthreads.3
+++ b/lib/libpthread/man/pthreads.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthreads.3,v 1.7 2000/01/06 07:10:16 d Exp $
+.\" $OpenBSD: pthreads.3,v 1.8 2000/03/14 21:31:40 aaron Exp $
 .\" David Leonard <d@openbsd.org>, 1998. Public domain.
 .Dd August 17, 1998
 .Dt PTHREADS 3
@@ -107,7 +107,7 @@ or similar.
 The meaning of thread flags are as follows:
 .Bl -tag -offset indent -width 3en -compact
 .It p
-Private, system thread (e.g. the garbage collector).
+Private, system thread (e.g., the garbage collector).
 .It E
 Thread is exiting.
 .It C
diff --git a/lib/libwrap/hosts_access.5 b/lib/libwrap/hosts_access.5
index 40f9336116f..da3dbb54e20 100644
--- a/lib/libwrap/hosts_access.5
+++ b/lib/libwrap/hosts_access.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hosts_access.5,v 1.7 1999/07/09 13:35:28 aaron Exp $
+.\"	$OpenBSD: hosts_access.5,v 1.8 2000/03/14 21:31:41 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -307,7 +307,7 @@ should not get carried away with username lookups, though.
 .Bl -bullet -tag -width XXX
 .It
 The client username information cannot be trusted when it is needed
-most, i.e. when the client system has been compromised.  In general,
+most, i.e., when the client system has been compromised.  In general,
 ALL and (UN)KNOWN are the only user name patterns that make sense.
 .It
 Username lookups are possible only with TCP-based services, and only
diff --git a/libexec/fingerd/fingerd.8 b/libexec/fingerd/fingerd.8
index 9c933d8c6b8..03bf36697ac 100644
--- a/libexec/fingerd/fingerd.8
+++ b/libexec/fingerd/fingerd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fingerd.8,v 1.8 1999/07/21 01:07:57 deraadt Exp $
+.\"	$OpenBSD: fingerd.8,v 1.9 2000/03/14 21:31:38 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)fingerd.8	8.1 (Berkeley) 6/4/93
-.\"	$Id: fingerd.8,v 1.8 1999/07/21 01:07:57 deraadt Exp $
+.\"	$Id: fingerd.8,v 1.9 2000/03/14 21:31:38 aaron Exp $
 .\"
 .Dd June 4, 1993
 .Dt FINGERD 8
@@ -77,7 +77,7 @@ which is passed to
 .Nm Fingerd
 closes its connections as soon as the output is finished.
 .Pp
-If the line is null (i.e. just a
+If the line is null (i.e., just a
 .Aq Tn CRLF
 is sent) then
 .Xr finger
@@ -86,7 +86,7 @@ returns a
 report that lists all people logged into
 the system at that moment.
 .Pp
-If a user name is specified (e.g.
+If a user name is specified (e.g.,
 .Pf eric Aq Tn CRLF )
 then the
 response lists more extended information for only that particular user,
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index bf300beddcf..3fc447b0b78 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftpd.8,v 1.26 1999/12/03 01:22:46 millert Exp $
+.\"	$OpenBSD: ftpd.8,v 1.27 2000/03/14 21:31:46 aaron Exp $
 .\"	$NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -219,9 +219,9 @@ SITE request.
 .Pp
 .Bl -column Request -offset indent
 .It Sy Request Ta Sy Description
-.It UMASK Ta change umask, e.g. ``SITE UMASK 002''
-.It IDLE Ta set idle-timer, e.g. ``SITE IDLE 60''
-.It CHMOD Ta change mode of a file, e.g. ``SITE CHMOD 755 filename''
+.It UMASK Ta change umask, e.g., ``SITE UMASK 002''
+.It IDLE Ta set idle-timer, e.g., ``SITE IDLE 60''
+.It CHMOD Ta change mode of a file, e.g., ``SITE CHMOD 755 filename''
 .It HELP Ta give help information.
 .El
 .Pp
diff --git a/libexec/getty/gettytab.5 b/libexec/getty/gettytab.5
index 6632eda17b7..6099b7cf18c 100644
--- a/libexec/getty/gettytab.5
+++ b/libexec/getty/gettytab.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)gettytab.5	8.4 (Berkeley) 4/19/94
-.\"	$Id: gettytab.5,v 1.9 1999/05/23 14:11:04 aaron Exp $
+.\"	$Id: gettytab.5,v 1.10 2000/03/14 21:31:39 aaron Exp $
 .\"
 .Dd April 19, 1994
 .Dt GETTYTAB 5
@@ -137,7 +137,7 @@ hangup line on last close
 .No "program to exec when name obtained"
 .It "mb	bool	false	do flow control based on carrier"
 .It "nl	bool	false	terminal has (or might have) a newline character"
-.It "np	bool	false	terminal uses no parity (i.e. 8-bit characters)"
+.It "np	bool	false	terminal uses no parity (i.e., 8-bit characters)"
 .It "nx	str	default	next table (for auto speed selection)"
 .It "o0	num	unused	tty output flags to write messages"
 .It "o1	num	unused	tty output flags to read login name"
diff --git a/libexec/lfs_cleanerd/lfs_cleanerd.8 b/libexec/lfs_cleanerd/lfs_cleanerd.8
index ba5a94693f8..e886799f5e4 100644
--- a/libexec/lfs_cleanerd/lfs_cleanerd.8
+++ b/libexec/lfs_cleanerd/lfs_cleanerd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lfs_cleanerd.8,v 1.6 1999/07/02 20:11:49 aaron Exp $
+.\"	$OpenBSD: lfs_cleanerd.8,v 1.7 2000/03/14 21:31:39 aaron Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -57,7 +57,7 @@ The daemon will exit within a few minutes
 of when the file system it was cleaning is unmounted.
 .Pp
 Garbage collection on a log-structured file system is done by scanning
-the file system's segments for active, i.e. referenced, data and copying
+the file system's segments for active, i.e., referenced, data and copying
 it to new segments.
 When all of the active data in a given segment has been copied to a new
 segment that segment can be marked as empty, thus reclaiming the space
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 38700e69d56..92738dcf48c 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.5,v 1.8 1999/06/04 02:45:14 aaron Exp $
+.\"	$OpenBSD: disklabel.5,v 1.9 2000/03/14 21:31:42 aaron Exp $
 .\"	$NetBSD: disklabel.5,v 1.3 1995/03/18 14:54:36 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1991, 1993
@@ -136,7 +136,7 @@ struct disklabel {
 	u_long	d_magic;	/* the magic number */
 	short	d_type;		/* drive type */
 	short	d_subtype;	/* controller/d_type specific */
-	char	d_typename[16];	/* type name, e.g. "eagle" */
+	char	d_typename[16];	/* type name, e.g., "eagle" */
 	/*
 	* d_packname contains the pack identifier and is returned when
 	* the disklabel is read off the disk or in-core copy.
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 2436c04b3f8..7c139f57d4f 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: init.8,v 1.24 2000/02/27 05:01:24 hugh Exp $
+.\"	$OpenBSD: init.8,v 1.25 2000/03/14 21:31:34 aaron Exp $
 .\"	$NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -194,7 +194,7 @@ will cease creating new
 .Xr getty Ns 's
 and allow the system to slowly die away, if it is sent a terminal stop
 .Pq Dv TSTP
-signal, i.e.
+signal, i.e.,
 .Dq Li "kill \-s TSTP 1" .
 A later hangup will resume full
 multi-user operations, or a terminate will start a single-user shell.
diff --git a/sbin/ipf/ipf.5 b/sbin/ipf/ipf.5
index dbbd7125347..a7011230d9a 100644
--- a/sbin/ipf/ipf.5
+++ b/sbin/ipf/ipf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ipf.5,v 1.20 2000/03/06 21:46:55 aaron Exp $
+.\"	$OpenBSD: ipf.5,v 1.21 2000/03/14 21:31:34 aaron Exp $
 .Dd July 9, 1999
 .Dt IPF 5
 .Os
@@ -249,7 +249,7 @@ procedure. Interface names are as printed by
 If this option is used, the rule will only match if the packet is going
 through that interface in the specified direction (in/out). If this
 option is absent, the rule is taken to be applied to a packet
-regardless of the interface it is present on (i.e. on all interfaces).
+regardless of the interface it is present on (i.e., on all interfaces).
 Filter rulesets are common to all interfaces, rather than having a
 filter list for each interface.
 .Pp
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index fb364240fc6..af11574b7c5 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.15 1999/06/17 20:53:27 millert Exp $
+.\"	$OpenBSD: mount_nfs.8,v 1.16 2000/03/14 21:31:34 aaron Exp $
 .\"	$NetBSD: mount_nfs.8,v 1.3 1996/02/18 11:59:10 fvdl Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994, 1995
@@ -88,7 +88,7 @@ of retransmit timeouts,
 cached data for the unresponsive server is assumed to still be valid.
 Values may be set in the range of 1 - 9, with 9 referring to an
 .Dq "infinite dead threshold"
-(i.e. never assume cached data still valid).
+(i.e., never assume cached data still valid).
 This option is not generally recommended and is really an experimental
 feature.
 .It Fl I Ar readdirsize
diff --git a/sbin/raidctl/raidctl.8 b/sbin/raidctl/raidctl.8
index 4a992d2094a..8266cdfa00a 100644
--- a/sbin/raidctl/raidctl.8
+++ b/sbin/raidctl/raidctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raidctl.8,v 1.10 2000/03/05 00:28:56 aaron Exp $
+.\"	$OpenBSD: raidctl.8,v 1.11 2000/03/14 21:31:42 aaron Exp $
 .\"     $NetBSD: raidctl.8,v 1.11 2000/01/05 03:02:41 oster Exp $
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -500,7 +500,7 @@ raidctl -P raid0
 .Ed
 .Pp
 is used.  Note that re-writing the parity can be done while
-other operations on the RAID set are taking place (e.g. while doing a
+other operations on the RAID set are taking place (e.g., while doing a
 .Xr fsck 8
 on a filesystem on the RAID set).  However: for maximum effectiveness
 of the RAID set, the parity should be known to be correct before any
diff --git a/sbin/reboot/boot_mac68k.8 b/sbin/reboot/boot_mac68k.8
index b1e1321ee42..6abeae79b98 100644
--- a/sbin/reboot/boot_mac68k.8
+++ b/sbin/reboot/boot_mac68k.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot_mac68k.8,v 1.10 1999/09/23 04:12:03 alex Exp $
+.\"	$OpenBSD: boot_mac68k.8,v 1.11 2000/03/14 21:31:42 aaron Exp $
 .\"	$NetBSD: boot_mac68k.8,v 1.1 1995/07/02 02:09:52 briggs Exp $
 .\"
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
@@ -89,7 +89,7 @@ The boot application runs in the native OS on the system.  It has a
 dialog where booting preferences may be changed and an option whereby
 these options may be saved.  The preferences are stored in the program
 itself, not in a preferences folder, thus allowing two separate copies
-of the program to be configured differently (e.g. to boot different
+of the program to be configured differently (e.g., to boot different
 bsd or bsd.test, or to boot from two different drives).
 .Pp
 One option that may be specified is a boot to single-user mode.  This
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index ff8afcc1e6b..2cb9785aa7d 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route.8,v 1.19 1999/12/08 07:55:54 itojun Exp $
+.\"	$OpenBSD: route.8,v 1.20 2000/03/14 21:31:35 aaron Exp $
 .\"	$NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -65,7 +65,7 @@ programmatic interface discussed in
 .Xr route 4 .
 .Bl -tag -width Ds
 .It Fl d
-Run in debug-only mode, i.e. don't actually modify the routing table.
+Run in debug-only mode, i.e., don't actually modify the routing table.
 .It Fl n
 Bypasses attempts to print host and network names symbolically
 when reporting actions.  (The process of translating between symbolic
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index 928dd459ff9..71cb478e4a6 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: man.conf.5,v 1.6 1999/09/23 04:12:09 alex Exp $
+.\"	$OpenBSD: man.conf.5,v 1.7 2000/03/14 21:31:35 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -91,7 +91,7 @@ The possible keywords and their meanings are as follows:
 .Bl -tag -width "_version"
 .It _build
 Man file names, regardless of their format, are expected to end in
-a ``.*'' pattern, i.e. a ``.'' followed by some suffix.
+a ``.*'' pattern, i.e., a ``.'' followed by some suffix.
 The first field of a _build line lists a suffix which indicates
 files which need to be reformatted or manipulated in some way before
 being displayed to the user.
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index d091221f79c..85187c448fd 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdist.1,v 1.11 2000/03/11 21:40:07 aaron Exp $
+.\"	$OpenBSD: rdist.1,v 1.12 2000/03/14 21:31:41 aaron Exp $
 .\"
 .\" Copyright (c) 1983 Regents of the University of California.
 .\" All rights reserved.
@@ -530,7 +530,7 @@ Messages to standard output.
 .IP \fBfile\fR
 Log to a file.  To specify the file name, use the format
 ``\fBfile=\fIfilename\fB=\fItypes\fR''.
-e.g.
+e.g.,
 .B "``file=/tmp/rdist.log=all,debug''.
 .IP \fBsyslog\fR
 Use the
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 3f23a6cb478..66037320b8b 100644
--- a/usr.bin/ssh/sshd.8
+++ b/usr.bin/ssh/sshd.8
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: sshd.8,v 1.34 2000/02/24 18:22:16 markus Exp $
+.\" $Id: sshd.8,v 1.35 2000/03/14 21:31:41 aaron Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSHD 8
@@ -147,7 +147,7 @@ is normally not run
 from inetd because it needs to generate the server key before it can
 respond to the client, and this may take tens of seconds.  Clients
 would have to wait too long if the key was regenerated every time.
-However, with small key sizes (e.g.  512) using
+However, with small key sizes (e.g., 512) using
 .Nm
 from inetd may
 be feasible.
diff --git a/usr.bin/sup/src/sup.1 b/usr.bin/sup/src/sup.1
index ad706f79684..03aafa87d5f 100644
--- a/usr.bin/sup/src/sup.1
+++ b/usr.bin/sup/src/sup.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sup.1,v 1.8 1999/09/23 04:12:09 alex Exp $
+.\"	$OpenBSD: sup.1,v 1.9 2000/03/14 21:31:42 aaron Exp $
 .\"
 .\" Copyright (c) 1992 Carnegie Mellon University
 .\" All Rights Reserved.
@@ -25,6 +25,11 @@
 .\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .\" HISTORY
 .\" $Log: sup.1,v $
+.\" Revision 1.9  2000/03/14 21:31:42  aaron
+.\" Suffix "i.e." and "e.g." with a comma. Just another really picky man page
+.\" commit, as we want our documentation to be as consistently formatted as
+.\" possible (it's getting there :-)).
+.\"
 .\" Revision 1.8  1999/09/23 04:12:09  alex
 .\" Typo fixes.
 .\"
@@ -511,7 +516,7 @@ Files on the file server may be protected, and network transmissions
 may be encrypted.
 This prevents unauthorized access to files via
 .IR sup .
-When files are not accessible to the default account (e.g.
+When files are not accessible to the default account (e.g.,
 the
 .B anon
 anonymous account), you can specify an alternative
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 49e118c1fb4..53a0d0db69c 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lint.1,v 1.7 1998/10/30 00:24:44 aaron Exp $
+.\"	$OpenBSD: lint.1,v 1.8 2000/03/14 21:31:42 aaron Exp $
 .\"	$NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
@@ -229,9 +229,9 @@ Traditional C mode.
 is not predefined in this mode. Warnings are printed for constructs
 not allowed in traditional C. Warnings for constructs which behave
 differently in traditional C and ANSI C are suppressed. Preprocessor
-macros describing the machine type (e.g.
+macros describing the machine type (e.g.,
 .Li sun3 Ns )
-and machine architecture (e.g.
+and machine architecture (e.g.,
 .Li m68k Ns )
 are defined without leading and trailing underscores. The keywords
 .Sy const Ns ,
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 7a44556e0a0..b169b3e74b6 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -99,7 +99,7 @@ In the past,
 ARP was used to negotiate the use of a trailer encapsulation.
 This is no longer supported.
 .Pp
-ARP watches passively for hosts impersonating the local host (i.e. a host
+ARP watches passively for hosts impersonating the local host (i.e., a host
 which responds to an ARP mapping request for the local host's address).
 .Sh DIAGNOSTICS
 .Em "duplicate IP address %x!! sent from ethernet address: %x:%x:%x:%x:%x:%x."
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index b60db3d277f..df3f2cbe14e 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -91,7 +91,7 @@ entry for the host called
 with the Ethernet address
 .Ar ether_addr .
 The Ethernet address is given as six hex bytes separated by
-colons.  The entry will be static, i.e. not time out, unless the word
+colons.  The entry will be static, i.e., not time out, unless the word
 .Ar temp
 is given in the command.  A static ARP entry can be overwritten
 by network traffic, unless the word
diff --git a/usr.sbin/bad144/bad144.8 b/usr.sbin/bad144/bad144.8
index 7c46fbdd1e0..af5429309ce 100644
--- a/usr.sbin/bad144/bad144.8
+++ b/usr.sbin/bad144/bad144.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)bad144.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: bad144.8,v 1.6 1999/06/21 11:59:24 aaron Exp $
+.\"	$Id: bad144.8,v 1.7 2000/03/14 21:31:43 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt BAD144 8
@@ -140,7 +140,10 @@ array are filled with all bits set, a putatively
 illegal value.
 .Pp
 .Nm
-is invoked by giving a device name (e.g. hk0, hp1, etc.).
+is invoked by giving a device name (e.g.,
+.Dq hk0 ,
+.Dq hp1 ,
+etc.).
 With no optional arguments
 it reads the first sector of the last track
 of the corresponding disk and prints out the bad sector information.
diff --git a/usr.sbin/bootpd/bootpd.8 b/usr.sbin/bootpd/bootpd.8
index 135fbc534a6..df908865181 100644
--- a/usr.sbin/bootpd/bootpd.8
+++ b/usr.sbin/bootpd/bootpd.8
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Header: /home/cvs/src/usr.sbin/bootpd/Attic/bootpd.8,v 1.7 1999/06/05 22:16:32 aaron Exp $
+.\"	$Header: /home/cvs/src/usr.sbin/bootpd/Attic/bootpd.8,v 1.8 2000/03/14 21:31:35 aaron Exp $
 .\"
 .TH BOOTPD 8 "November 06, 1993" "Carnegie Mellon University"
 .SH NAME
@@ -39,7 +39,7 @@ RFC951, RFC1532, and RFC1533.
 .I Bootpgw
 implements a simple BOOTP gateway which can be used to forward
 requests and responses between clients on one subnet and a
-BOOTP server (i.e.
+BOOTP server (i.e.,
 .IR bootpd )
 on another subnet. While either
 .I bootpd
@@ -125,7 +125,7 @@ variable that controls the amount of debugging messages generated.
 For example, -d4 or -d 4 will set the debugging level to 4.
 For compatibility with older versions of
 .IR bootpd ,
-omitting the numeric parameter (i.e. just -d) will
+omitting the numeric parameter (i.e., just -d) will
 simply increment the debug level by one.
 .TP
 .BI \-c \ chdir\-path
diff --git a/usr.sbin/bootpd/bootptab.5 b/usr.sbin/bootpd/bootptab.5
index 59b85619f7f..1f38e538fe9 100644
--- a/usr.sbin/bootpd/bootptab.5
+++ b/usr.sbin/bootpd/bootptab.5
@@ -1,6 +1,6 @@
 .\" Copyright (c) 1988, 1989, 1991 Carnegie Mellon University
 .\"
-.\"	$Header: /home/cvs/src/usr.sbin/bootpd/Attic/bootptab.5,v 1.4 1999/05/12 13:26:52 aaron Exp $
+.\"	$Header: /home/cvs/src/usr.sbin/bootpd/Attic/bootptab.5,v 1.5 2000/03/14 21:31:35 aaron Exp $
 .\"
 .TH BOOTPTAB 5 "October 31, 1991" "Carnegie Mellon University"
 .UC 6
@@ -35,7 +35,7 @@ default values used by other entries via the
 .B tc=.dummy-entry
 mechanism.  Most tags must be followed by an equal sign
 and a value as above.  Some may also appear in a boolean form with no
-value (i.e.
+value (i.e.,
 .RI : tg :).
 The currently recognized tags are:
 .PP
diff --git a/usr.sbin/config/config.8 b/usr.sbin/config/config.8
index 2588327151f..dfce0323877 100644
--- a/usr.sbin/config/config.8
+++ b/usr.sbin/config/config.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: config.8,v 1.14 1999/11/27 03:49:13 d Exp $
+.\"	$OpenBSD: config.8,v 1.15 2000/03/14 21:31:36 aaron Exp $
 .\"	$NetBSD: config.8,v 1.10 1996/08/31 20:58:16 mycroft Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -373,7 +373,7 @@ After either of these two methods, you can place the new kernel (called
 .Pa bsd )
 in
 .Pa /
-(i.e.
+(i.e.,
 .Pa /bsd )
 and the system will boot it next time.
 Most people save their backup kernels as
@@ -434,7 +434,7 @@ disable mcd0.
  29 mcd0 at isa0 disable port 0x300 size 0 iomem -1 iosiz 0 irq 10 drq -1 drq2 -1
 .Ed
 .Pp
-It's also possible to disable all devices with a common attribute. e.g.
+It's also possible to disable all devices with a common attribute. e.g.,
 .Pp
 .Bd -literal
 .No ukc> Ic disable port 0x300
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index 1dc16aae82e..4aab1a443e9 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdformat.1,v 1.8 1999/07/07 10:50:12 aaron Exp $
+.\"	$OpenBSD: fdformat.1,v 1.9 2000/03/14 21:31:43 aaron Exp $
 .\"
 .\" Copyright (C) 1993, 1994 by Joerg Wunsch, Dresden
 .\" All rights reserved.
@@ -52,9 +52,9 @@ formats a floppy disk at device
 .Ar device_name
 should be a character device; it may be given either with a full path
 name of a raw device node for a floppy disk drive
-.Pq e.g. Pa /dev/rfd0c ,
-or default name in an abbreviated form
-.Pq e.g. Em fd0 .
+.Pq e.g., Pa /dev/rfd0c ,
+or default name in an abbreviated form,
+.Pq e.g., Em fd0 .
 Note that any geometry constraints of the device node
 .Pq minor device number
 are meaningless, since they're overridden by
diff --git a/usr.sbin/ipsend/ipresend/ipresend.1 b/usr.sbin/ipsend/ipresend/ipresend.1
index 04259a5c248..85b5245b4a1 100644
--- a/usr.sbin/ipsend/ipresend/ipresend.1
+++ b/usr.sbin/ipsend/ipresend/ipresend.1
@@ -73,7 +73,7 @@ version 3). Packets are read from this file as being input
 When sending packets out, send them out
 .Sq  raw
 (the way they came in). The
-only real significance here is that it will expect the link layer (i.e.
+only real significance here is that it will expect the link layer (i.e.,
 Ethernet) headers to be prepended to the IP packet being output.
 .It Fl S
 The input file is to be in
diff --git a/usr.sbin/ipsend/ipsend/ipsend.5 b/usr.sbin/ipsend/ipsend/ipsend.5
index f5ccbe905aa..89aee11281a 100644
--- a/usr.sbin/ipsend/ipsend/ipsend.5
+++ b/usr.sbin/ipsend/ipsend/ipsend.5
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ipsend.5,v 1.4 2000/03/04 22:19:28 aaron Exp $
+.\"     $OpenBSD: ipsend.5,v 1.5 2000/03/14 21:31:36 aaron Exp $
 .TH IPSEND 5
 .SH NAME
 ipsend \- IP packet description language
@@ -366,7 +366,7 @@ Router solicitation.
 .TP
 .B "timex [ timexceed-code ]"
 Time Exceeded.  This is used to indicate that the packet failed to reach the
-destination because it was in transit too long (i.e. ttl reached 0).  The
+destination because it was in transit too long (i.e., ttl reached 0).  The
 valid code names are: \fBintrans\fP,
 \fBreass\fP could not reassemble packet from fragments within a given time.
 .TP
diff --git a/usr.sbin/lpr/lprm/lprm.1 b/usr.sbin/lpr/lprm/lprm.1
index 0bdd955b8ad..7757666c887 100644
--- a/usr.sbin/lpr/lprm/lprm.1
+++ b/usr.sbin/lpr/lprm/lprm.1
@@ -79,7 +79,7 @@ is useful only to the super-user.
 A user may dequeue an individual job by specifying its job number.
 This number may be obtained from the
 .Xr lpq  1
-program, e.g.
+program, e.g.,
 .Pp
 .Bd -literal -offset indent
 \&% lpq \-l
diff --git a/usr.sbin/mopd/mopd/mopd.8 b/usr.sbin/mopd/mopd/mopd.8
index b5c2c225570..dab7199baba 100644
--- a/usr.sbin/mopd/mopd/mopd.8
+++ b/usr.sbin/mopd/mopd/mopd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopd.8,v 1.6 1999/07/07 10:50:13 aaron Exp $
+.\"	$OpenBSD: mopd.8,v 1.7 2000/03/14 21:31:43 aaron Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -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.
 .\"
-.\" @(#) $OpenBSD: mopd.8,v 1.6 1999/07/07 10:50:13 aaron Exp $
+.\" @(#) $OpenBSD: mopd.8,v 1.7 2000/03/14 21:31:43 aaron Exp $
 .\"
 .Dd September 24, 1995
 .Dt MOPD 8
@@ -48,7 +48,7 @@ or all interfaces if
 is given.
 In a load request received by
 .Nm mopd
-a filename can be given. This is the normal case for e.g. terminal servers.
+a filename can be given. This is the normal case for, e.g., terminal servers.
 If a filename isn't given
 .Nm mopd
 must know what image to load.
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.1 b/usr.sbin/mopd/mopprobe/mopprobe.1
index 6e576c90c46..9d859a9f06f 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.1
+++ b/usr.sbin/mopd/mopprobe/mopprobe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopprobe.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
+.\"	$OpenBSD: mopprobe.1,v 1.7 2000/03/14 21:31:43 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -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.
 .\"
-.\" @(#) $OpenBSD: mopprobe.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
+.\" @(#) $OpenBSD: mopprobe.1,v 1.7 2000/03/14 21:31:43 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPPROBE 1
@@ -60,7 +60,7 @@ is given. If
 .Sq Fl o
 inhibits all messages but the first from a node. With
 .Sq Fl v
-all MOP/RC SID messages will be shown (e.g. machines running DECnet).
+all MOP/RC SID messages will be shown (e.g., machines running DECnet).
 .Sh OPTIONS
 .Bl -tag -width indent
 .It Fl a
diff --git a/usr.sbin/mrouted/mrouted.8 b/usr.sbin/mrouted/mrouted.8
index fb9f82adc3d..aef5269eb28 100644
--- a/usr.sbin/mrouted/mrouted.8
+++ b/usr.sbin/mrouted/mrouted.8
@@ -141,7 +141,7 @@ The phyint command can be used to disable multicast routing on the physical
 interface identified by local IP address <local-addr>, or to associate a
 non-default metric or threshold with the specified physical interface.
 The local IP address <local-addr> may be replaced by the
-interface name (e.g le0).
+interface name (e.g., le0).
 If a phyint is attached to multiple IP subnets, describe each additional subnet
 with the altnet keyword.
 Phyint commands must precede tunnel commands.
@@ -150,7 +150,7 @@ The tunnel command can be used to establish a tunnel link between local
 IP address <local-addr> and remote IP address <remote-addr>, and to associate
 a non-default metric or threshold with that tunnel.
 The local IP address <local-addr> may be replaced by the
-interface name (e.g. le0).  The remote IP address <remote-addr> may
+interface name (e.g., le0).  The remote IP address <remote-addr> may
 be replaced by a host name, if and only if the host name has a single
 IP address associated with it.
 The tunnel must be set
@@ -379,7 +379,7 @@ interfaces along which datagrams belonging to the source-group are
 forwarded. A "p" indicates that no datagrams are being forwarded along
 that interface. An unlisted interface is a leaf subnet with are no
 members of the particular group on that subnet. A "b" on an interface
-indicates that it is a boundary interface, i.e. traffic will not be
+indicates that it is a boundary interface, i.e., traffic will not be
 forwarded on the scoped address on that interface.
 An additional line with a ">" as the first character is printed for
 each source on the subnet.  Note that there can be many sources in
diff --git a/usr.sbin/named/man/dig.1 b/usr.sbin/named/man/dig.1
index 6d7d51b5808..4375f406144 100644
--- a/usr.sbin/named/man/dig.1
+++ b/usr.sbin/named/man/dig.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dig.1,v 1.16 2000/03/04 22:19:28 aaron Exp $
+.\"	$OpenBSD: dig.1,v 1.17 2000/03/14 21:31:37 aaron Exp $
 .\" $From: dig.1,v 8.2 1997/06/01 20:34:33 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
@@ -376,7 +376,7 @@ does not stick; that is, options specified on a single line
 in a
 .Nm
 batch file will remain in effect for
-subsequent lines (i.e. they are not restored to the
+subsequent lines (i.e., they are not restored to the
 .Dq sticky
 default).
 .\" .El
diff --git a/usr.sbin/named/man/dnsquery.1 b/usr.sbin/named/man/dnsquery.1
index 7c18ea3be92..65da756fa01 100644
--- a/usr.sbin/named/man/dnsquery.1
+++ b/usr.sbin/named/man/dnsquery.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dnsquery.1,v 1.5 1999/06/05 22:17:33 aaron Exp $
+.\"	$OpenBSD: dnsquery.1,v 1.6 2000/03/14 21:31:37 aaron Exp $
 .TH DNSQUERY 1 "10 March 1990"
 .UC 6
 .SH NAME
@@ -158,6 +158,6 @@ for class IN resource records.
 Query uses a call to inet_addr() to determine if the argument
 for the '-n' option is a valid Internet address.  Unfortunately,
 inet_addr() seems to cause a segmentation fault with some (bad)
-addresses (e.g. 1.2.3.4.5).
+addresses (e.g., 1.2.3.4.5).
 .SH AUTHOR
 Bryan Beecher
diff --git a/usr.sbin/named/man/host.1 b/usr.sbin/named/man/host.1
index c33b9f0445d..e4f504e7217 100644
--- a/usr.sbin/named/man/host.1
+++ b/usr.sbin/named/man/host.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: host.1,v 1.4 2000/03/04 22:19:28 aaron Exp $
+.\"	$OpenBSD: host.1,v 1.5 2000/03/14 21:31:37 aaron Exp $
 .\"
 .\"	@(#)host.1              e07@nikhef.nl (Eric Wassenaar) 961010
 .\"
@@ -40,13 +40,13 @@ The arguments can be either host names (domain names) or numeric
 Internet addresses.
 .PP
 A numeric Internet address consists of four decimal numbers
-separated by dots, e.g. \fB192.16.199.1\fP, representing the
+separated by dots, e.g., \fB192.16.199.1\fP, representing the
 four bytes of the 32-bit address.
 .br
 The default action is to look up the associated host name.
 .PP
 A host name or domain name consists of component names (labels)
-separated by dots, e.g. \fBnikhefh.nikhef.nl\fP
+separated by dots, e.g., \fBnikhefh.nikhef.nl\fP
 .br
 The default action is to look up all of its Internet addresses.
 .PP
@@ -56,7 +56,7 @@ Thus a user in domain "nikhef.nl" can say "host nikhapo",
 and it will actually look up "nikhapo.nikhef.nl".
 In all other cases, the name is tried unchanged.
 Single names with trailing dot are considered top-level domain
-specifications, e.g. "nl."
+specifications, e.g., "nl."
 .PP
 Note that the usual lookup convention for any name that does not end
 with a trailing dot is to try first with the local domain appended,
@@ -570,7 +570,7 @@ the queryname is valid or not. The answer was not authoritative.
 Perhaps recursion was off, and no data was cached locally.
 .TP
 \fIname\fP \fItype\fP record not found [at \fIserver\fP], try again
-Some intermediate failure, e.g. timeout reaching a nameserver.
+Some intermediate failure, e.g., timeout reaching a nameserver.
 .TP
 \fIname\fP \fItype\fP record not found [at \fIserver\fP], server failure
 Some explicit nameserver failure to process the query, due to internal
diff --git a/usr.sbin/named/man/hostname.7 b/usr.sbin/named/man/hostname.7
index 1d1d13b05f3..d1687a3f529 100644
--- a/usr.sbin/named/man/hostname.7
+++ b/usr.sbin/named/man/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.4 2000/03/04 22:19:28 aaron Exp $
+.\"	$OpenBSD: hostname.7,v 1.5 2000/03/14 21:31:37 aaron Exp $
 .\" Copyright (c) 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -41,7 +41,7 @@ resolver behave the same as earlier, non-\s-1RFC\s+1 1535 resolvers.
 .PP
 The default method (using \s-1RFC\s+1 1535 guidelines) follows:
 .PP
-If the name consists of a single component, i.e. contains no dot, and if the
+If the name consists of a single component, i.e., contains no dot, and if the
 environment variable ``\s-1HOSTALIASES\s+1'' is set to the name of a file,
 that file is searched for a string matching the input hostname.  The file
 should consist of lines made up of two strings separated by whitespace, the
diff --git a/usr.sbin/named/man/resolver.5 b/usr.sbin/named/man/resolver.5
index 0a63fbf8e7b..959d80b4a60 100644
--- a/usr.sbin/named/man/resolver.5
+++ b/usr.sbin/named/man/resolver.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.5,v 1.3 2000/03/04 22:19:28 aaron Exp $
+.\"	$OpenBSD: resolver.5,v 1.4 2000/03/14 21:31:38 aaron Exp $
 .\" Copyright (c) 1986 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -91,7 +91,7 @@ optional and defaults to the natural netmask of the net. The IP address
 and optional network pairs are separated by slashes. Up to 10 pairs may
 be specified.
 .IP
-e.g. sortlist 130.155.160.0/255.255.240.0 130.155.0.0
+e.g., sortlist 130.155.160.0/255.255.240.0 130.155.0.0
 .TP
 \fBoptions\fP
 Options allows certain internal resolver variables to be modified.
@@ -124,7 +124,7 @@ amended on a per-process basis by setting the environment variable
 as explained above under \fBoptions\fP.
 .LP
 The keyword and value must appear on a single line, and the keyword
-(e.g. \fBnameserver\fP) must start the line.  The value follows
+(e.g., \fBnameserver\fP) must start the line.  The value follows
 the keyword, separated by whitespace.
 .SH FILES
 .I /etc/resolv.conf
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index 2121b0ae1b6..83cedd5e839 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ppp.8,v 1.78 2000/02/28 01:20:23 brian Exp $
+.\" $OpenBSD: ppp.8,v 1.79 2000/03/14 21:31:44 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Dt PPP 8
@@ -19,7 +19,7 @@ This is a user process
 .Em PPP
 software package.  Normally,
 .Em PPP
-is implemented as a part of the kernel (e.g. as managed by
+is implemented as a part of the kernel (e.g., as managed by
 .Xr pppd 8 )
 and it's thus somewhat hard to debug and/or modify its behaviour.
 However, in this implementation
@@ -313,7 +313,7 @@ network interface.
 .It "Supports IETF draft Predictor-1 (rfc 1978) and DEFLATE (rfc 1979) compression."
 .Nm
 supports not only VJ-compression but also Predictor-1 and DEFLATE compression.
-Normally, a modem has built-in compression (e.g. v42.bis) and the system
+Normally, a modem has built-in compression (e.g., v42.bis) and the system
 may receive higher data rates from it as a result of such compression.
 While this is generally a good thing in most other situations, this
 higher speed data imposes a penalty on the system by increasing the
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index c90b36aeeff..69119bbbd53 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppd.8,v 1.19 1999/09/23 04:12:11 alex Exp $
+.\" $OpenBSD: pppd.8,v 1.20 2000/03/14 21:31:38 aaron Exp $
 .\" manual page [] for pppd 2.3
 .\" Id: pppd.8,v 1.27 1998/03/31 04:31:08 paulus Exp $
 .\" SH section heading
@@ -44,7 +44,7 @@ used.
 .I <speed>
 Set the baud rate to <speed> (a decimal number).  On systems such as
 4.4BSD and OpenBSD, any speed can be specified.  Other systems
-(e.g. SunOS) allow only a limited set of speeds.
+(e.g., SunOS) allow only a limited set of speeds.
 .TP
 .B active-filter \fIfilter-expression
 Specifies a packet filter to be applied to data packets to determine
@@ -93,7 +93,7 @@ program to dial the modem and start the remote ppp session.  This
 option is privileged if the \fInoauth\fR option is used.
 .TP
 .B crtscts
-Use hardware flow control (i.e. RTS/CTS) to control the flow of data
+Use hardware flow control (i.e., RTS/CTS) to control the flow of data
 on the serial port.  If neither the \fIcrtscts\fR nor the
 \fInocrtscts\fR option is given, the hardware flow control setting
 for the serial port is left unchanged.
@@ -153,7 +153,7 @@ the peer, instead of exiting, as it would without this option.
 .I <local_IP_address>\fB:\fI<remote_IP_address>
 Set the local and/or remote interface IP addresses.  Either one may be
 omitted.  The IP addresses can be specified with a host name or in
-decimal dot notation (e.g. 150.234.56.78).  The default local
+decimal dot notation (e.g., 150.234.56.78).  The default local
 address is the (first) IP address of the system (unless the
 \fInoipdefault\fR
 option is given).  The remote address will be obtained from the peer
@@ -220,7 +220,7 @@ requests Deflate compression in preference to BSD-Compress if the peer
 can do either.)
 .TP
 .B demand
-Initiate the link only on demand, i.e. when data traffic is present.
+Initiate the link only on demand, i.e., when data traffic is present.
 With this option, the remote IP address must be specified by the user
 on the command line or in an options file.  Pppd will initially
 configure the interface and enable it for IP traffic without
@@ -251,7 +251,7 @@ the link was terminated because it was idle.
 .TP
 .B idle \fIn
 Specifies that pppd should disconnect if the link is idle for \fIn\fR
-seconds.  The link is idle when no data packets (i.e. IP packets) are
+seconds.  The link is idle when no data packets (i.e., IP packets) are
 being sent or received.  Note: it is not advisable to use this option
 with the \fIpersist\fR option without the \fIdemand\fR option.
 If the \fBactive-filter\fR
@@ -406,7 +406,7 @@ system password database to be allowed access.
 .TP
 .B maxconnect \fIn
 Terminate the connection when it has been available for network
-traffic for \fIn\fR seconds (i.e. \fIn\fR seconds after the first
+traffic for \fIn\fR seconds (i.e., \fIn\fR seconds after the first
 network control protocol comes up).
 .TP
 .B modem
@@ -453,7 +453,7 @@ name to \fIname\fR.)
 .TP
 .B netmask \fIn
 Set the interface netmask to \fIn\fR, a 32 bit netmask in "decimal dot"
-notation (e.g. 255.255.255.0).  If this option is given, the value
+notation (e.g., 255.255.255.0).  If this option is given, the value
 specified is ORed with the default netmask.  The default netmask is
 chosen based on the negotiated remote IP address; it is the
 appropriate network mask for the class of the remote IP address, ORed
@@ -478,7 +478,7 @@ should only be required if the peer is buggy and gets confused by
 requests from pppd for CCP negotiation.
 .TP
 .B nocrtscts
-Disable hardware flow control (i.e. RTS/CTS) on the serial port.  If
+Disable hardware flow control (i.e., RTS/CTS) on the serial port.  If
 neither the \fIcrtscts\fR nor the \fInocrtscts\fR option is given,
 the hardware flow control setting for the serial port is left
 unchanged.
@@ -643,7 +643,7 @@ completed.  This option is privileged if the \fInoauth\fR option is
 used.
 .TP
 .B xonxoff
-Use software flow control (i.e. XON/XOFF) to control the flow of data on
+Use software flow control (i.e., XON/XOFF) to control the flow of data on
 the serial port.
 .SH OPTIONS FILES
 Options can be taken from files as well as the command line.  Pppd
@@ -750,7 +750,7 @@ on the line, or if the first word is "-", then all IP addresses are
 disallowed.  To allow any address, use "*".
 A word starting with "!" indicates that the
 specified address is \fInot\fR acceptable.  An address may be followed
-by "/" and a number \fIn\fR, to indicate a whole subnet, i.e. all
+by "/" and a number \fIn\fR, to indicate a whole subnet, i.e., all
 addresses which have the same value in the most significant \fIn\fR
 bits.  Note that case is significant in the client and server names
 and in the secret.
@@ -758,7 +758,7 @@ and in the secret.
 If the secret starts with an `@', what follows is assumed to be the
 name of a file from which to read the secret.  A "*" as the client or
 server name matches any name.  When selecting a secret, pppd takes the
-best match, i.e.  the match with the fewest wildcards.
+best match, i.e., the match with the fewest wildcards.
 .LP
 Thus a secrets file contains both secrets for use in authenticating
 other hosts, plus secrets which we use for authenticating ourselves to
diff --git a/usr.sbin/rtadvd/rtadvd.conf.5 b/usr.sbin/rtadvd/rtadvd.conf.5
index f176e33f980..3869f1b7f18 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.3 2000/03/13 06:16:11 itojun Exp $
+.\"	$OpenBSD: rtadvd.conf.5,v 1.4 2000/03/14 21:31:38 aaron Exp $
 .\" 
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -132,7 +132,7 @@ for each item below.
 Indices vary from 0 to N-1, where N is the
 value of
 .Ic addrs.
-Each index shall follows the name of each item, e.g.
+Each index shall follows the name of each item, e.g.,
 .Dq prefixlen2 .
 .It Cm \&prefixlen
 (num) Prefix length field.
@@ -149,7 +149,7 @@ and Bit 6
 .Li 0x40
 .Pc
 means Autonomous address-configuration flag bit.
-The default value is 0xc0, i.e. both bits are set.
+The default value is 0xc0, i.e., both bits are set.
 .It Cm \&addr
 (str) The address filled into Prefix field.
 Since
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index 68e3f4c062d..e0d8e97101f 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.19 1999/07/28 20:41:37 jakob Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.20 2000/03/14 21:31:44 aaron Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -1269,7 +1269,7 @@ Name server requests are formatted as
 .Ar flags qtype qclass name
 .Pq Ar len
 .Pp
-e.g.
+e.g.,
 .Pp
 h2opolo.1538 > helios.domain: 3+ A? ucbvax.berkeley.edu. (37)
 .Ed
@@ -1348,7 +1348,7 @@ Name server responses are formatted as
 .Ar type class data
 .Pq Ar len
 .Pp
-e.g.
+e.g.,
 .Pp
 helios.domain > h2opolo.1538: 3 3/3/7 A 128.32.137.3 (273)
 .br
@@ -1597,7 +1597,7 @@ AppleTalk addresses are printed in the form
 .Ar net Ns . Ns Ar host Ns .
 .Ns Ar port
 .Pp
-e.g.
+e.g.,
 .Pp
 144.1.209.2 > icsd-net.112.220
 .br