20 files changed, 49 insertions, 44 deletions

diff --git a/lib/libc/crypt/crypt.3 b/lib/libc/crypt/crypt.3
index c22e4d21af5..11f465faa82 100644
--- a/lib/libc/crypt/crypt.3
+++ b/lib/libc/crypt/crypt.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: crypt.3,v 1.13 1999/07/09 13:35:15 aaron Exp $
+.\" $OpenBSD: crypt.3,v 1.14 2000/01/22 02:17:55 aaron Exp $
 .\"
 .\" FreeSec: libcrypt
 .\"
@@ -160,7 +160,7 @@ The
 introduces disorder in the
 .Tn DES
 algorithm in one of 16777216 or 4096 possible ways
-(ie. with 24 or 12 bits: if bit
+(i.e., with 24 or 12 bits: if bit
 .Em i
 of the
 .Ar salt
diff --git a/lib/libc/sys/select.2 b/lib/libc/sys/select.2
index 88349838865..c807b5f0969 100644
--- a/lib/libc/sys/select.2
+++ b/lib/libc/sys/select.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: select.2,v 1.15 1999/09/23 04:12:00 alex Exp $
+.\"	$OpenBSD: select.2,v 1.16 2000/01/22 02:17:55 aaron Exp $
 .\"	$NetBSD: select.2,v 1.5 1995/06/27 22:32:28 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -248,7 +248,7 @@ 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 (ie.
+written that way (i.e.,
 .Xr httpd 8 ).
 .Sh HISTORY
 The
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index dbc3e00b84d..4177ff342c6 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdisk.8,v 1.28 1999/09/23 23:23:30 aaron Exp $
+.\"	$OpenBSD: fdisk.8,v 1.29 2000/01/22 02:17:53 aaron Exp $
 .\"
 .\" Copyright (c) 1997 Tobias Weingartner
 .\" All rights reserved.
@@ -85,7 +85,7 @@ This
 .Nm
 program serves a similar purpose to the DOS program.
 When called with no special flags, it prints the MBR partition
-table of the specified device, ie.
+table of the specified device, i.e.,
 .Bd -literal
     # fdisk fd0
     Disk: fd0       geometry: 80/2/18 [2880 sectors]
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index 55c7e72eb11..a551841d25a 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.8,v 1.13 1999/07/23 06:00:05 deraadt Exp $
+.\"	$OpenBSD: scsi.8,v 1.14 2000/01/22 02:17:53 aaron Exp $
 .\"	$FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
 .\"
 .\" Written By Julian ELischer
@@ -98,7 +98,7 @@ The following options are available:
 .It Fl f Ar device
 Specifies the
 .Ar device
-that should be opened, ie.
+that should be opened, i.e.,
 .Pa /dev/rsd0c .
 .It Fl d Ar debug_level
 Sets the SCSI kernel debug level.  The kernel must have been compiled
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index 321b0835362..587835a7cc1 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -170,7 +170,7 @@ library provided in 4.3.
 For use with
 .Xo
 .Xr libocurses
-.Pf ( ie. Fl l Ns Ar ocurses
+.Pf ( i.e., Fl l Ns Ar ocurses
 .Fl l Ns Ar otermcap )
 .Xc
 .It Pa /usr/lib/libpanel.a
@@ -178,7 +178,7 @@ For use with
 library for use with
 .Xo
 .Xr libcurses
-.Pf ( ie. Fl l Ns Ar panel
+.Pf ( i.e., Fl l Ns Ar panel
 .Fl l Ns Ar curses )
 .Xc
 .It Pa /usr/lib/libpcap.a
diff --git a/share/man/man4/man4.sun3/leds.4 b/share/man/man4/man4.sun3/leds.4
index 8a4f1e535b7..3cb6d3705d7 100644
--- a/share/man/man4/man4.sun3/leds.4
+++ b/share/man/man4/man4.sun3/leds.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: leds.4,v 1.2 1999/06/05 13:18:36 aaron Exp $
+.\"	$OpenBSD: leds.4,v 1.3 2000/01/22 02:17:55 aaron Exp $
 .\"
 .Dd March 2, 1996
 .Dt LEDS 4 sun3
@@ -27,7 +27,7 @@ dark.  The first
 gives the number of clock ticks that are skipped after each pattern is
 loaded before the next is loaded.  For example, if this value is 0, a
 new pattern is loaded each clock tick; if it is 3, a new pattern will
-be loaded every fourth clock tick (ie, three ticks will be skipped
+be loaded every fourth clock tick (i.e., three ticks will be skipped
 between loads).  The second
 .Li unsigned int
 gives the number of patterns in the list, that is, the number of bytes
diff --git a/share/man/man4/random.4 b/share/man/man4/random.4
index b681cee0af6..f06663c5c4d 100644
--- a/share/man/man4/random.4
+++ b/share/man/man4/random.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: random.4,v 1.7 1999/06/29 22:06:11 deraadt Exp $
+.\"	$OpenBSD: random.4,v 1.8 2000/01/22 02:17:54 aaron Exp $
 .\"
 .\" Copyright (c) 1996, 1997 Michael Shalayeff
 .\"
@@ -38,7 +38,7 @@
 .Nm urandom ,
 .Nm prandom ,
 .Nm arandom
-.Nd random data source devices.
+.Nd random data source devices
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <dev/rndvar.h>
@@ -57,7 +57,7 @@ This device is reserved for future support of hardware
 random generators.
 .It /dev/srandom
 Strong random data.  This device returns reliable random data.
-If sufficient entropy is not currently available (ie. the entropy
+If sufficient entropy is not currently available (i.e., the entropy
 pool quality starts to run low), the driver pauses while more of
 such data is collected.
 The entropy pool data is converted into output data using MD5.
diff --git a/share/man/man8/diskless.8 b/share/man/man8/diskless.8
index d800d56b2e2..2679712facc 100644
--- a/share/man/man8/diskless.8
+++ b/share/man/man8/diskless.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: diskless.8,v 1.10 2000/01/03 20:04:26 pjanzen Exp $
+.\"	$OpenBSD: diskless.8,v 1.11 2000/01/22 02:17:54 aaron Exp $
 .\"	$NetBSD: diskless.8,v 1.7.4.1 1996/05/30 18:58:10 cgd Exp $
 .\"
 .\"
@@ -300,7 +300,7 @@ Correct the critical mount points in the client's
 .Pa /etc/fstab
 (which will be
 .Pa /export/myclient/root/etc/fstab )
-ie.
+i.e.,
 .Bd -literal -offset indent -compact
 myserver:/export/myclient/root / nfs rw 0 0
 myserver:/usr /usr nfs rw 0 0
diff --git a/share/man/man8/ssl.8 b/share/man/man8/ssl.8
index 5f6f6276ac8..b91da6c5496 100644
--- a/share/man/man8/ssl.8
+++ b/share/man/man8/ssl.8
@@ -91,7 +91,7 @@ States.
 Additionally
 .Ar RSA inc.
 permits non-licensed use of the algorithm by certain parties
-(ie. non-commercial use).
+(i.e., non-commercial use).
 If you are permitted to use the
 .Ar RSA
 algorithm, you can enable the full function of the
diff --git a/usr.bin/ssh/ssh-add.1 b/usr.bin/ssh/ssh-add.1
index 7aca43715ff..8872e715432 100644
--- a/usr.bin/ssh/ssh-add.1
+++ b/usr.bin/ssh/ssh-add.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 23:55:14 1995 ylo
 .\"
-.\" $Id: ssh-add.1,v 1.9 1999/12/02 20:05:40 markus Exp $
+.\" $Id: ssh-add.1,v 1.10 2000/01/22 02:17:50 aaron Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH-ADD 1
@@ -97,7 +97,7 @@ newer versions bore successively more restrictive licenses.  This version
 of OpenSSH
 .Bl -bullet
 .It
-has all components of a restrictive nature (ie. patents, see
+has all components of a restrictive nature (i.e., patents, see
 .Xr ssl 8 )
 directly removed from the source code; any licensed or patented components
 are chosen from
diff --git a/usr.bin/ssh/ssh-agent.1 b/usr.bin/ssh/ssh-agent.1
index 506b83723ec..b98775d90bc 100644
--- a/usr.bin/ssh/ssh-agent.1
+++ b/usr.bin/ssh/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.8 1999/11/16 23:59:21 deraadt Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.9 2000/01/22 02:17:50 aaron Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -136,7 +136,7 @@ newer versions bore successively more restrictive licenses.  This version
 of OpenSSH
 .Bl -bullet
 .It
-has all components of a restrictive nature (ie. patents, see
+has all components of a restrictive nature (i.e., patents, see
 .Xr ssl 8 )
 directly removed from the source code; any licensed or patented components
 are chosen from
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1
index 0cb5745bd33..e7c837c79fb 100644
--- a/usr.bin/ssh/ssh-keygen.1
+++ b/usr.bin/ssh/ssh-keygen.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 23:55:14 1995 ylo
 .\"
-.\" $Id: ssh-keygen.1,v 1.10 1999/12/25 13:35:55 markus Exp $
+.\" $Id: ssh-keygen.1,v 1.11 2000/01/22 02:17:50 aaron Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH-KEYGEN 1
@@ -134,7 +134,7 @@ newer versions bore successively more restrictive licenses.  This version
 of OpenSSH
 .Bl -bullet
 .It
-has all components of a restrictive nature (ie. patents, see
+has all components of a restrictive nature (i.e., patents, see
 .Xr ssl 8 )
 directly removed from the source code; any licensed or patented components
 are chosen from
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index dcfa66cace7..889a5105f3c 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sat Apr 22 21:55:14 1995 ylo
 .\"
-.\" $Id: ssh.1,v 1.34 2000/01/14 09:47:26 markus Exp $
+.\" $Id: ssh.1,v 1.35 2000/01/22 02:17:50 aaron Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSH 1
@@ -971,7 +971,7 @@ newer versions bore successively more restrictive licenses.  This version
 of OpenSSH
 .Bl -bullet
 .It
-has all components of a restrictive nature (ie. patents, see
+has all components of a restrictive nature (i.e., patents, see
 .Xr ssl 8 )
 directly removed from the source code; any licensed or patented components
 are chosen from
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index c210352bfa7..aecfe1053de 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.31 2000/01/15 20:56:39 provos Exp $
+.\" $Id: sshd.8,v 1.32 2000/01/22 02:17:50 aaron Exp $
 .\"
 .Dd September 25, 1999
 .Dt SSHD 8
@@ -776,7 +776,7 @@ newer versions bore successively more restrictive licenses.  This version
 of OpenSSH
 .Bl -bullet
 .It
-has all components of a restrictive nature (ie. patents, see
+has all components of a restrictive nature (i.e., patents, see
 .Xr ssl 8 )
 directly removed from the source code; any licensed or patented components
 are chosen from
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 45b15147754..1d368fcff4c 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tail.1,v 1.7 1999/06/05 01:21:42 aaron Exp $
+.\"	$OpenBSD: tail.1,v 1.8 2000/01/22 02:17:49 aaron Exp $
 .\"	$NetBSD: tail.1,v 1.4 1994/11/23 07:42:13 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993
@@ -90,7 +90,7 @@ The
 option causes
 .Nm
 to not stop when end-of-file is reached, but rather to wait for additional
-data to be appended to the input.  If the file is replaced (ie. the
+data to be appended to the input.  If the file is replaced (i.e., the
 inode number changes),
 .Nm
 will reopen the file and continue.  If the file is truncated,
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 28e6bdf2436..c30238c26b8 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whois.1,v 1.10 1999/11/19 19:14:40 deraadt Exp $
+.\"	$OpenBSD: whois.1,v 1.11 2000/01/22 02:17:49 aaron Exp $
 .\"	$NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -99,7 +99,7 @@ Construct the name of a whois server to use from the top-level domain
 .Pq Tn TLD
 of the supplied (single) argument, and appending ".whois-servers.net".
 This effectively allows a suitable whois server to be selected
-automatically for a large number of TLDs, ie. all of the following will
+automatically for a large number of TLDs, i.e., all of the following will
 .Ql just work :
 .Pp
 .Bd -literal -offset indent -compact
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index a1e689df8bf..01f81971823 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,4 +1,4 @@
-.\" $Id: ppp.8,v 1.74 2000/01/18 21:49:02 aaron Exp $
+.\" $Id: ppp.8,v 1.75 2000/01/22 02:17:52 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Dt PPP 8
@@ -327,7 +327,7 @@ minimum.
 Name Server Addresses and NetBIOS Name Server Addresses can be negotiated
 with clients using the Microsoft
 .Em PPP
-stack (ie. Win95, WinNT)
+stack (i.e., Win95, WinNT)
 .It Supports Multi-link PPP (rfc 1990)
 It is possible to configure
 .Nm
@@ -1554,7 +1554,7 @@ and represent the TH_ACK, TH_SYN and TH_FIN or TH_RST TCP flags respectively.
 .It
 Each filter can hold up to 40 rules, starting from rule 0.
 The entire rule set is not effective until rule 0 is defined,
-ie. the default is to allow everything through.
+i.e., the default is to allow everything through.
 .It
 If no rule is matched to a packet, that packet will be discarded
 (blocked).
@@ -2062,7 +2062,7 @@ should immediately follow
 .Dq set log .
 The default is
 .Dq set log local
-(ie. only the un-maskable warning, error and alert output).
+(i.e., only the un-maskable warning, error and alert output).
 .Pp
 If The first argument to
 .Dq set log Op local
@@ -3573,7 +3573,7 @@ options) if you wish callback to be optional.
 .Oc
 .Xc
 If no arguments are given, CBCP (Microsoft's CallBack Control Protocol)
-is disabled - ie, configuring CBCP in the
+is disabled - i.e., configuring CBCP in the
 .Dq set callback
 command will result in
 .Nm
diff --git a/usr.sbin/rpc.lockd/rpc.lockd.8 b/usr.sbin/rpc.lockd/rpc.lockd.8
index 07a952e861c..36dddbaebb6 100644
--- a/usr.sbin/rpc.lockd/rpc.lockd.8
+++ b/usr.sbin/rpc.lockd/rpc.lockd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpc.lockd.8,v 1.5 1997/08/10 21:06:41 millert Exp $
+.\"	$OpenBSD: rpc.lockd.8,v 1.6 2000/01/22 02:17:52 aaron Exp $
 .\"
 .\" Copyright (c) 1995 A.R.Gordon, andrew.gordon@net-tel.co.uk
 .\" All rights reserved.
@@ -82,8 +82,12 @@ RPC protocol specification for the network lock manager protocol.
 .Xr rpc.statd 8
 .Sh BUGS
 The current implementation provides only the server side of the protocol
-(ie. clients running other OS types can establish locks on a OpenBSD fileserver,
-but there is currently no means for a OpenBSD client to establish locks).
+(i.e., clients running other OS types can establish locks on an
+.Ox
+fileserver,
+but there is currently no means for an
+.Ox
+client to establish locks).
 .Pp
 Versions 1, 2 and 3 of the protocol are supported.  However, only versions
 2 (Unix systems) and 3 (PC-NFS clients) seem to be in common use - the version
diff --git a/usr.sbin/vnconfig/vnconfig.8 b/usr.sbin/vnconfig/vnconfig.8
index f8c2e9203ca..ebc16c3bd92 100644
--- a/usr.sbin/vnconfig/vnconfig.8
+++ b/usr.sbin/vnconfig/vnconfig.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vnconfig.8,v 1.8 1999/06/05 22:18:21 aaron Exp $
+.\"	$OpenBSD: vnconfig.8,v 1.9 2000/01/22 02:17:51 aaron Exp $
 .\
 .\" Copyright (c) 1993 University of Utah.
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -96,7 +96,7 @@ is assumed.
 .Pp
 Configures the vnode disk
 .Pa svnd0
-(ie. all of its partitions become useable).
+(i.e., all of its partitions become useable).
 .Pp
 .Dl vnconfig -u svnd0
 .Pp
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 99128874411..77397826ba5 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypbind.8,v 1.12 1999/05/16 19:58:17 alex Exp $
+.\"	$OpenBSD: ypbind.8,v 1.13 2000/01/22 02:17:51 aaron Exp $
 .\"	$NetBSD: ypbind.8,v 1.2 1996/02/28 01:21:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -64,7 +64,8 @@ When
 starts the primary domain (or gets the first request for a new domain),
 it checks if a file for the domain in question exists in the directory
 .Pa /etc/yp/
-(ie. /etc/yp/DOMAINNAME).
+(i.e.,
+.Pa /etc/yp/DOMAINNAME ) .
 If such a file exists, it will list the hosts which
 .Nm
 should restrict its server search to.