23 files changed, 98 insertions, 85 deletions

diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 0f20c7d6225..95a4234f39e 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.2,v 1.5 1999/05/16 19:55:20 alex Exp $
+.\"	$OpenBSD: chown.2,v 1.6 1999/06/05 04:16:07 aaron Exp $
 .\"	$NetBSD: chown.2,v 1.10 1995/10/12 15:40:47 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -86,11 +86,11 @@ is particularly useful when used in conjunction
 with the file locking primitives (see
 .Xr flock 2 ) .
 .Pp
-One of the owner or group id's
-may be left unchanged by specifying it as -1.
+One of the owner or group IDs
+may be left unchanged by specifying it as \-1.
 .Sh RETURN VALUES
 Zero is returned if the operation was successful;
--1 is returned if an error occurs, with a more specific
+\-1 is returned if an error occurs, with a more specific
 error code being placed in the global variable
 .Va errno .
 .Sh ERRORS
diff --git a/lib/libc/sys/fork.2 b/lib/libc/sys/fork.2
index 29b790d13d2..e8c51ed267e 100644
--- a/lib/libc/sys/fork.2
+++ b/lib/libc/sys/fork.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fork.2,v 1.6 1999/05/23 14:10:51 aaron Exp $
+.\"	$OpenBSD: fork.2,v 1.7 1999/06/05 04:16:08 aaron Exp $
 .\"	$NetBSD: fork.2,v 1.6 1995/02/27 12:32:36 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -97,7 +97,7 @@ This limit is configuration-dependent.
 The limit
 .Dv RLIMIT_NPROC
 on the total number of
-processes under execution by a this user id would be exceeded.
+processes under execution by a this user ID would be exceeded.
 .It Bq Er ENOMEM
 There is insufficient swap space for the new process.
 .El
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index 04c51723f8a..0f1d1e3e8aa 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kill.2,v 1.8 1999/05/25 13:06:46 aaron Exp $
+.\"	$OpenBSD: kill.2,v 1.9 1999/06/05 04:16:08 aaron Exp $
 .\"	$NetBSD: kill.2,v 1.7 1995/02/27 12:33:53 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -93,7 +93,8 @@ No error is returned if any process could be signaled.
 .Pp
 Setuid and setgid processes are dealt with slightly differently.  For
 the non-root user, to prevent attacks against such processes, some signal
-deliveries are not permitted and return the error EPERM.
+deliveries are not permitted and return the error
+.Er EPERM .
 The following signals are allowed through to this class of processes:
 .Em SIGKILL ,
 .Em SIGINT ,
@@ -128,11 +129,11 @@ is not a valid signal number.
 No process can be found corresponding to that specified by
 .Fa pid .
 .It Bq Er ESRCH
-The process id was given as 0
+The process ID was given as 0
 but the sending process does not have a process group.
 .It Bq Er EPERM
 The sending process is not the super-user and its effective
-user id does not match the effective user-id of the receiving process.
+user ID does not match the effective user ID of the receiving process.
 When signaling a process group, this error is returned if any members
 of the group could not be signaled.
 .El
diff --git a/lib/libc/sys/msgctl.2 b/lib/libc/sys/msgctl.2
index 562116fc5c1..e6d8be987d4 100644
--- a/lib/libc/sys/msgctl.2
+++ b/lib/libc/sys/msgctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msgctl.2,v 1.7 1999/05/27 14:05:09 aaron Exp $
+.\"	$OpenBSD: msgctl.2,v 1.8 1999/06/05 04:16:08 aaron Exp $
 .\"	$NetBSD: msgctl.2,v 1.2 1997/03/27 08:20:35 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -117,7 +117,7 @@ The values are taken from the corresponding fields in the structure
 pointed to by
 .Fa buf .
 This operation can only be executed by the super-user, or a process that
-has an effective user id equal to either 
+has an effective user ID equal to either 
 .Va msg_perm.cuid
 or
 .Va msg_perm.uid
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index 6332d596611..1b4b8c1c702 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: semctl.2,v 1.8 1999/05/27 14:05:10 aaron Exp $
+.\"	$OpenBSD: semctl.2,v 1.9 1999/06/05 04:16:08 aaron Exp $
 .\"	$NetBSD: semctl.2,v 1.2 1997/03/27 08:20:40 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -147,7 +147,7 @@ The values are taken from the corresponding fields in the structure
 pointed to by
 .Fa arg.buf .
 This operation can only be executed by the super-user, or a process that
-has an effective user id equal to either 
+has an effective user ID equal to either 
 .Va sem_perm.cuid
 or
 .Va sem_perm.uid
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index df75ce5008c..4e1bf42ca80 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shmctl.2,v 1.8 1999/05/27 14:05:10 aaron Exp $
+.\"	$OpenBSD: shmctl.2,v 1.9 1999/06/05 04:16:08 aaron Exp $
 .\"	$NetBSD: shmctl.2,v 1.3 1997/03/27 08:20:39 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -116,7 +116,7 @@ The values are taken from the corresponding fields in the structure
 pointed to by
 .Fa buf .
 This operation can only be executed by the super-user, or a process that
-has an effective user id equal to either 
+has an effective user ID equal to either 
 .Va shm_perm.cuid
 or
 .Va shm_perm.uid
diff --git a/lib/libc_r/man/pthread_cond_init.3 b/lib/libc_r/man/pthread_cond_init.3
index 664f6207ab7..cb86792401a 100644
--- a/lib/libc_r/man/pthread_cond_init.3
+++ b/lib/libc_r/man/pthread_cond_init.3
@@ -42,11 +42,13 @@ function creates a new condition variable, with attributes specified with
 .Fa attr .
 If
 .Fa attr
-is NULL the default attributes are used.
+is
+.Dv NULL
+the default attributes are used.
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_cond_init
-function will return zero and put the new condition variable id into
+function will return zero and put the new condition variable ID into
 .Fa cond ,
 otherwise an error number will be returned to indicate the error.
 .Sh ERRORS
diff --git a/lib/libc_r/man/pthread_mutex_init.3 b/lib/libc_r/man/pthread_mutex_init.3
index f6d89be4e9f..6fe4cd858e4 100644
--- a/lib/libc_r/man/pthread_mutex_init.3
+++ b/lib/libc_r/man/pthread_mutex_init.3
@@ -42,11 +42,13 @@ function creates a new mutex, with attributes specified with
 .Fa attr .
 If
 .Fa attr
-is NULL the default attributes are used.
+is
+.Dv NULL
+the default attributes are used.
 .Sh RETURN VALUES
 If successful,
 .Fn pthread_mutex_init
-will return zero and put the new mutex id into
+will return zero and put the new mutex ID into
 .Fa mutex ,
 otherwise an error number will be returned to indicate the error.
 .Sh ERRORS
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index 180bf56ee7d..5d64b8c6070 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kvm_getprocs.3,v 1.3 1996/05/26 01:04:36 deraadt Exp $
+.\"	$OpenBSD: kvm_getprocs.3,v 1.4 1999/06/05 04:16:08 aaron Exp $
 .\"	$NetBSD: kvm_getprocs.3,v 1.3 1996/05/20 16:58:03 mrg Exp $
 .\"
 .\" Copyright (c) 1992, 1993
@@ -60,7 +60,7 @@
 .Sh DESCRIPTION
 .Fn kvm_getprocs
 returns a (sub-)set of active processes in the kernel indicated by
-.Fa kd.
+.Fa kd .
 The
 .Fa op
 and
@@ -74,7 +74,7 @@ describes the filtering predicate as follows:
 .It Sy KERN_PROC_ALL
 all processes
 .It Sy KERN_PROC_PID
-processes with process id 
+processes with process ID
 .Fa arg
 .It Sy KERN_PROC_PGRP
 processes with process group
@@ -86,10 +86,10 @@ processes with session
 processes with tty
 .Fa arg
 .It Sy KERN_PROC_UID
-processes with effective user id
+processes with effective user ID
 .Fa arg
 .It Sy KERN_PROC_RUID
-processes with real user id
+processes with real user ID
 .Fa arg
 .El
 .Pp
@@ -111,7 +111,9 @@ Most likely, these arguments correspond to the values passed to
 on process creation.  This information is, however,
 deliberately under control of the process itself.
 Note that the original command name can be found, unaltered,
-in the p_comm field of the process structure returned by
+in the
+.Fa p_comm
+field of the process structure returned by
 .Fn kvm_getprocs .
 .Pp
 The 
diff --git a/lib/libpthread/man/pthread_cond_init.3 b/lib/libpthread/man/pthread_cond_init.3
index 664f6207ab7..cb86792401a 100644
--- a/lib/libpthread/man/pthread_cond_init.3
+++ b/lib/libpthread/man/pthread_cond_init.3
@@ -42,11 +42,13 @@ function creates a new condition variable, with attributes specified with
 .Fa attr .
 If
 .Fa attr
-is NULL the default attributes are used.
+is
+.Dv NULL
+the default attributes are used.
 .Sh RETURN VALUES
 If successful, the
 .Fn pthread_cond_init
-function will return zero and put the new condition variable id into
+function will return zero and put the new condition variable ID into
 .Fa cond ,
 otherwise an error number will be returned to indicate the error.
 .Sh ERRORS
diff --git a/lib/libpthread/man/pthread_mutex_init.3 b/lib/libpthread/man/pthread_mutex_init.3
index f6d89be4e9f..6fe4cd858e4 100644
--- a/lib/libpthread/man/pthread_mutex_init.3
+++ b/lib/libpthread/man/pthread_mutex_init.3
@@ -42,11 +42,13 @@ function creates a new mutex, with attributes specified with
 .Fa attr .
 If
 .Fa attr
-is NULL the default attributes are used.
+is
+.Dv NULL
+the default attributes are used.
 .Sh RETURN VALUES
 If successful,
 .Fn pthread_mutex_init
-will return zero and put the new mutex id into
+will return zero and put the new mutex ID into
 .Fa mutex ,
 otherwise an error number will be returned to indicate the error.
 .Sh ERRORS
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index 5bb1fa51e08..ecf3d07d14f 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -21,7 +21,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\" 
-.\" $Id: uucplock.3,v 1.2 1998/06/08 20:28:29 brian Exp $
+.\" $Id: uucplock.3,v 1.3 1999/06/05 04:16:08 aaron Exp $
 .\" "
 .Dd March 30, 1997
 .Os
@@ -59,9 +59,9 @@ If the file already exists, it is expected to contain the process
 id of the locking program.
 .Pp
 If the file does not already exist, or the owning process given by
-the process id found in the lock file is no longer running,
+the process ID found in the lock file is no longer running,
 .Fn uu_lock
-will write its own process id into the file and return success.
+will write its own process ID into the file and return success.
 .Pp
 .Fn uu_lock_txfr
 transfers lock ownership to another process.
@@ -109,7 +109,7 @@ Can't create temporary lock file via
 .Xr creat 2 .
 .Pp
 .Dv UU_LOCK_WRITE_ERR:
-The current process id could not be written to the lock file via a call to
+The current process ID could not be written to the lock file via a call to
 .Xr write 2 .
 .Pp
 .Dv UU_LOCK_LINK_ERR:
@@ -147,7 +147,7 @@ lock.
 The current process does not already own a lock on the specified device.
 .Pp
 .Dv UU_LOCK_WRITE_ERR:
-The new process id could not be written to the lock file via a call to
+The new process ID could not be written to the lock file via a call to
 .Xr write 2 .
 .Sh ERRORS
 If
@@ -171,7 +171,7 @@ for further details.
 .Xr write 2
 .Sh BUGS
 It is possible that a stale lock is not recognised as such if a new
-processes is assigned the same processes id as the program that left
+process is assigned the same process ID as the program that left
 the stale lock.
 .Pp
 The calling process must have write permissions to the
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 3dc93610964..5868e63149d 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftpd.8,v 1.19 1999/05/28 15:54:31 aaron Exp $
+.\"	$OpenBSD: ftpd.8,v 1.20 1999/06/05 04:16:06 aaron Exp $
 .\"	$NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -369,7 +369,7 @@ Log file for anonymous transfers.
 .Sh BUGS
 The server must run as the super-user
 to create sockets with privileged port numbers.  It maintains
-an effective user id of the logged in user, reverting to
+an effective user ID of the logged in user, reverting to
 the super-user only when binding addresses to sockets.  The
 possible security holes have been extensively
 scrutinized, but are possibly incomplete.
diff --git a/libexec/identd/identd.8 b/libexec/identd/identd.8
index 00d68d7872c..31deae499d0 100644
--- a/libexec/identd/identd.8
+++ b/libexec/identd/identd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: identd.8,v 1.10 1999/05/28 23:00:08 aaron Exp $
+.\"	$OpenBSD: identd.8,v 1.11 1999/06/05 04:16:06 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -105,14 +105,14 @@ so that the administrator can later discover who the real user was.
 Specifies an idle timeout in seconds where a daemon running in
 "wait" mode will timeout and exit. The default is no timeout.
 .It Fl u Ar uid
-Specify a user id number or user name which the
+Specify a user ID number or user name which the
 .Nm identd
 server should
 switch to after binding itself to the
 .Tn TCP/IP
 port if running as a stand alone daemon.
 .It Fl g Ar gid
-Specify a group id number or group name which the
+Specify a group ID number or group name which the
 .Nm
 server should
 switch to after binding itself to the
@@ -158,7 +158,7 @@ in upper case characters.
 .It Fl n
 Always return uid numbers instead of usernames.
 .It Fl N
-When replying with a user name or id, first 
+When replying with a user name or ID, first 
 check for a file
 .Pa .noident
 in the user's home directory. If this file is accessible, return 
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 353640647cd..8946d5aab9f 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: modload.8,v 1.11 1999/06/04 02:45:18 aaron Exp $
+.\"	$OpenBSD: modload.8,v 1.12 1999/06/05 04:16:05 aaron Exp $
 .\"	$NetBSD: modload.8,v 1.5 1995/03/18 14:56:43 cgd Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
@@ -80,7 +80,7 @@ The default module entry point name is
 .It Fl p Ar postinstall
 Specify the name of a shell script or program that will
 be executed if the module is successfully loaded. It
-is always passed the module id (in decimal) and module
+is always passed the module ID (in decimal) and module
 type (in hexadecimal) as the first two arguments.
 For loadable drivers, the third argument is
 the block or character major device number.
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 4342ef92e9b..8926f90b3a9 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.32 1999/05/25 02:24:51 provos Exp $
+.\"	$OpenBSD: options.4,v 1.33 1999/06/05 04:16:06 aaron Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt 
@@ -131,7 +131,7 @@ available on the alpha architecture.
 See
 .Xr compat_osf1 8 .
 .It Cd option COMPAT_NOMID
-Enable compatibility with a.out executables that lack a machine id.
+Enable compatibility with a.out executables that lack a machine ID.
 On the i386, this includes NetBSD 0.8's ZMAGIC format, 386BSD and BSDI's
 QMAGIC, NMAGIC, and OMAGIC a.out formats.  On the hp300 and other m68k
 architectures this permits certain old
@@ -337,7 +337,7 @@ files in the procfs namespace.  See
 .Xr mount_procfs 8
 for details.
 .It Cd option UMAPFS
-Includes a loopback file system in which user and group ids may be
+Includes a loopback file system in which user and group IDs may be
 remapped -- this can be useful when mounting alien file systems with
 different uids and gids than the local system (eg, remote NFS).  See
 .Xr mount_umap 8
@@ -442,7 +442,7 @@ for details on the implications of this.  The kernel secure level may
 be manipulated by the superuser by altering the
 .Em kern.securelevel
 sysctl variable. (It should be noted that the secure level may only be
-lowered by a call from process id 1, i.e.
+lowered by a call from process ID 1, i.e.,
 .Em init . )
 See also
 .Xr sysctl 8
diff --git a/share/man/man4/raid.4 b/share/man/man4/raid.4
index 4a3125bb959..07a0db7f10c 100644
--- a/share/man/man4/raid.4
+++ b/share/man/man4/raid.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: raid.4,v 1.3 1999/05/16 19:56:35 alex Exp $
+.\"	$OpenBSD: raid.4,v 1.4 1999/06/05 04:16:07 aaron Exp $
 .\"
 .\"
 .\" Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@ or a
 .Xr newfs 8
 filesystem integrity and parity integrity can be ensured.  It bears
 repeating again that parity recomputation is 
-.Ar required
+.Em required
 before any filesystems are created or used on the RAID device.  If the
 parity is not correct, then missing data cannot be correctly recovered.
 .Pp
@@ -149,12 +149,12 @@ device can be constructed out of a number of RAID 5 devices (which, in turn,
 may be constructed out of the physical disks, or of other RAID devices).
 .Pp
 At the time of this writing, it is 
-.Ar imperative
+.Em imperative
 that drives be 
 .Sq nailed down
 at their respective addresses (i.e. not left free-floating, where a
 drive with SCSI ID of 4 can end up as /dev/sd0c).  Consider a system 
-with three SCSI drives at SCSI ID's 4, 5, and 6, and which map to 
+with three SCSI drives at SCSI IDs 4, 5, and 6, and which map to 
 components /dev/sd0e, /dev/sd1e, and /dev/sd2e.  If the drive with
 SCSI ID 5 fails,
 and the system reboots, the old /dev/sd2e will show up as /dev/sd1e.
@@ -201,7 +201,7 @@ device is found in
 .Xr raidctl 8 .
 It is highly recommended that the steps to reconstruct, copyback, and
 re-compute parity are well understood by the system administrator(s)
-.Ar before
+.Em before
 a component failure.  Doing the wrong thing when a component fails may
 result in data loss.
 .Pp
@@ -212,11 +212,11 @@ components of a RAID 4 or 5 system, or the loss of a single component
 of a RAID 0 system, will result in the entire filesystems on that RAID
 device being lost.
 RAID is 
-.Ar NOT
+.Em not
 a substitute for good backup practices.
 .Pp
 Recomputation of parity 
-.Ar MUST
+.Em must
 be performed whenever there is a chance that it may have been
 compromised.  This includes after system crashes, or before a RAID
 device has been used for the first time.  Failure to keep parity
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index 32aaa5f6457..31d2c2e981f 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.samples.7,v 1.13 1999/05/24 18:42:25 aaron Exp $
+.\"	$OpenBSD: mdoc.samples.7,v 1.14 1999/06/05 04:16:07 aaron Exp $
 .\"	$NetBSD: mdoc.samples.7,v 1.5 1996/04/03 20:17:34 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -2485,7 +2485,7 @@ by the process to pages not loaded in core.
 .It UID
 numerical user-id of process owner
 .It PPID
-numerical id of parent of process process priority
+numerical ID of parent of process process priority
 (non-positive when in non-interruptible wait)
 .El
 .Pp
@@ -2502,7 +2502,7 @@ The raw text:
 \&.It UID
 \&numerical user-id of process owner
 \&.It PPID
-\&numerical id of parent of process process priority
+\&numerical ID of parent of process process priority
 \&(non-positive when in non-interruptible wait)
 \&.El
 .Ed
diff --git a/share/man/man8/man8.hp300/crash.8 b/share/man/man8/man8.hp300/crash.8
index 177e25c8f6a..d72ec57e986 100644
--- a/share/man/man8/man8.hp300/crash.8
+++ b/share/man/man8/man8.hp300/crash.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: crash.8,v 1.2 1997/07/27 08:23:08 downsj Exp $
+.\"	$OpenBSD: crash.8,v 1.3 1999/06/05 04:16:07 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -146,7 +146,7 @@ in the low 16.
 ``v'' (hex) is the virtual address which caused the fault.
 Additionally, the kernel will dump about a screenful of semi-useful
 information.
-``pid'' (decimal) is the process id of the process running at the
+``pid'' (decimal) is the process ID of the process running at the
 time of the exception.
 Note that if we panic in an interrupt routine,
 this process may not be related to the panic.
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index 09e26d8466d..564371cce49 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: newsyslog.8,v 1.13 1999/06/05 01:21:35 aaron Exp $
+.\"	$OpenBSD: newsyslog.8,v 1.14 1999/06/05 04:16:05 aaron Exp $
 .\"
 .\" Copyright (c) 1997, Jason Downs.  All rights reserved.
 .\"
@@ -156,8 +156,9 @@ deserves what they get if they mark the
 .Xr sendmail 8
 log file as monitored.
 .It pid file (optional)
-Specify a file containing the id of a process to send a HUP signal to
-instead of
+Specify a file containing the PID of a process to send a
+.Dv SIGHUP
+signal to instead of
 .Pa /var/run/syslog.pid .
 .El
 .Pp
@@ -186,7 +187,9 @@ Removes the restriction that
 .Nm
 must be running as root.  Of course,
 .Nm
-will not be able to send a HUP signal to
+will not be able to send a
+.Dv SIGHUP
+signal to
 .Xr syslogd 8 ,
 so this option should only be used in debugging.
 .It Fl m
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 18055ee41fe..7342ebcc059 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdist.1,v 1.8 1999/06/05 01:21:37 aaron Exp $
+.\"	$OpenBSD: rdist.1,v 1.9 1999/06/05 04:16:04 aaron Exp $
 .\"
 .\" Copyright (c) 1983 Regents of the University of California.
 .\" All rights reserved.
@@ -442,10 +442,10 @@ If this option is enabled, then any files listed in the
 file list in the distfile that are directories are not recursively scanned.
 Only the existence, ownership, and mode of the directory are checked.
 .IP \fBnumchkgroup\fR
-Use the numeric group id (gid) to check group ownership instead of
+Use the numeric group ID (GID) to check group ownership instead of
 the group name.
 .IP \fBnumchkowner\fR
-Use the numeric user id (uid) to check user ownership instead of
+Use the numeric user ID (UID) to check user ownership instead of
 the user name.
 .IP \fBsavetargets\fR
 Save files that are updated instead of removing them.
diff --git a/usr.sbin/named/man/named.8 b/usr.sbin/named/man/named.8
index da64a864c1a..bc7b02272ba 100644
--- a/usr.sbin/named/man/named.8
+++ b/usr.sbin/named/man/named.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: named.8,v 1.7 1999/05/15 02:17:55 aaron Exp $
+.\"	$OpenBSD: named.8,v 1.8 1999/06/05 04:16:05 aaron Exp $
 .\" ++Copyright++ 1985
 .\" -
 .\" Copyright (c) 1985
@@ -125,9 +125,9 @@ of the boot file directive ``options no-recursion''.
 .TP
 .B \-u
 Specifies the user the server should run as after it initializes.  The value
-specified may be either a username or a numeric user id.  If the
+specified may be either a username or a numeric user ID.  If the
 .B \-g
-flag is not specified, then the group id used will be the primary group of
+flag is not specified, then the group ID used will be the primary group of
 the user specified (initgroups() is called, so all of the user's groups will
 be available to the server).
 .br
@@ -139,7 +139,7 @@ on is a reserved port that only the superuser may bind to.
 .TP
 .B \-g
 Specifies the group the server should run as after it initializes.  The value
-specified may be either a groupname or a numeric group id.
+specified may be either a groupname or a numeric group ID.
 .TP
 .B \-t
 Specifies the directory the server should chroot() into as soon as it is
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index 9d2a67050b5..1d7aed9cb7e 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,4 +1,4 @@
-.\" $Id: ppp.8,v 1.45 1999/06/02 00:46:55 brian Exp $
+.\" $Id: ppp.8,v 1.46 1999/06/05 04:16:05 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
 .Os
@@ -191,22 +191,21 @@ with permissions
 .Dv 04554 .
 By default, 
 .Nm
-will not run if the invoking user id is not zero.  This may be overridden
+will not run if the invoking user ID is not 0.  This may be overridden
 by using the
 .Dq allow users
 command in
 .Pa /etc/ppp/ppp.conf .
 When running as a normal user,
 .Nm
-switches to user id 0 in order to alter the system routing table, set up
+switches to user ID 0 in order to alter the system routing table, set up
 system lock files and read the ppp configuration files.  All
 external commands (executed via the "shell" or "!bg" commands) are executed
-as the user id that invoked
+as the user ID that invoked
 .Nm ppp .
 Refer to the
 .Sq ID0
-logging facility if you're interested in what exactly is done as user id
-zero.
+logging facility if you're interested in what exactly is done as user ID 0.
 .Sh GETTING STARTED
 The following command line switches are understood by
 .Nm ppp :
@@ -1941,7 +1940,7 @@ Log debug information.
 .It Li HDLC
 Dump HDLC packet in hex.
 .It Li ID0
-Log all function calls specifically made as user id 0.
+Log all function calls specifically made as user ID 0.
 .It Li IPCP
 Generate an IPCP packet trace.
 .It Li LCP
@@ -2050,7 +2049,7 @@ protocol.  Refer to RFC 1990 for specification details.
 The peer is identified using a combination of his
 .Dq endpoint discriminator
 and his
-.Dq authentication id .
+.Dq authentication ID .
 Either or both of these may be specified.  It is recommended that
 at least one is specified, otherwise there is no way of ensuring that
 all links are actually connected to the same peer program, and some
@@ -2712,13 +2711,13 @@ in
 .Fl background
 mode.
 .Pp
-User id 0 is immune to these commands.
+User ID 0 is immune to these commands.
 .Bl -tag -width XX
 .It allow user Ns Xo
 .Op s
 .Ar logname Ns No ...
 .Xc
-By default, only user id 0 is allowed access to
+By default, only user ID 0 is allowed access to
 .Nm ppp .
 If this command is used, all of the listed users are allowed access to
 the section in which the
@@ -2914,7 +2913,7 @@ This is replaced with the IP number assigned to the local interface.
 .It Li PEER_ENDDISC
 This is replaced with the value of the peers endpoint discriminator.
 .It Li PROCESSID
-This is replaced with the current process id.
+This is replaced with the current process ID.
 .It Li USER
 This is replaced with the username that has been authenticated with PAP or
 CHAP.  Normally, this variable is assigned only in -direct mode.  This value
@@ -3304,7 +3303,7 @@ to be sent with the CHAP response.
 .It
 The
 .Dq authkey ,
-which is encrypted with the challenge and request id, the answer being sent
+which is encrypted with the challenge and request ID, the answer being sent
 in the CHAP response packet.
 .El
 .Pp
@@ -3314,7 +3313,7 @@ in this manner, it's expected that the host challenge is a series of ascii
 digits or characters.  An encryption device or Secure ID card is usually
 required to calculate the secret appropriate for the given challenge.
 .It set authname Ar id
-This sets the authentication id used in client mode PAP or CHAP negotiation.
+This sets the authentication ID used in client mode PAP or CHAP negotiation.
 .Pp
 If used in
 .Fl direct
@@ -4514,7 +4513,7 @@ tty port locking file.  Refer to
 .Xr uucplock 3
 for further details.
 .It Pa /var/run/tunN.pid
-The process id (pid) of the
+The process ID (PID) of the
 .Nm
 program connected to the tunN device, where
 .Sq N