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 :-)).

22 files changed, 68 insertions, 65 deletions

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