From: aaron <aaron@openbsd.org>
Date: Sat, 15 Apr 2000 11:45:51 +0000 (+0000)
Subject: - For consistency, `super-user' -> `superuser' in all cases.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a3542fadceea0b2934914fdb31f44bdc344ef18e;p=openbsd

- For consistency, `super-user' -> `superuser' in all cases.
- Some punctuation fixes.
- Some `id' -> `ID'.
---

diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index a7b32987e72..6f9bbea5650 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.1,v 1.17 2000/03/21 14:40:13 aaron Exp $
+.\"	$OpenBSD: chmod.1,v 1.18 2000/04/15 11:45:52 aaron Exp $
 .\"	$NetBSD: chmod.1,v 1.8 1995/03/21 09:02:07 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -99,7 +99,7 @@ option is specified.
 In addition, these options override each other and the
 command's actions are determined by the last one specified.
 .Pp
-Only the owner of a file or the super-user is permitted to change
+Only the owner of a file or the superuser is permitted to change
 the mode of a file.
 .Pp
 The
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index bc500674202..da9f4a43d24 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: csh.1,v 1.34 2000/04/15 02:15:09 aaron Exp $
+.\"	$OpenBSD: csh.1,v 1.35 2000/04/15 11:45:53 aaron Exp $
 .\"	$NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -1827,7 +1827,7 @@ If the
 .Fl h
 flag is given, the hard limits are used instead of the current limits.
 The hard limits impose a ceiling on the values of the current limits.
-Only the super-user may raise the hard limits,
+Only the superuser may raise the hard limits,
 but a user may lower or raise the current limits within the legal range.
 .Pp
 Resources controllable currently include
@@ -1910,7 +1910,7 @@ respectively.
 The greater the number, the less
 .Tn CPU
 the process will get.
-The super-user may specify negative priority by using
+The superuser may specify negative priority by using
 .Dq nice \-number ... .
 .Ar command
 is always executed in a sub-shell, and the restrictions
@@ -2485,7 +2485,7 @@ and
 .Dq /usr/sbin ,
 but this
 may vary from system to system.
-For the super-user the default search path is
+For the superuser the default search path is
 .Dq /bin ,
 .Dq /usr/bin ,
 .Dq /sbin ,
@@ -2519,7 +2519,7 @@ Default is
 .Dq % ,
 or
 .Dq #
-for the super-user.
+for the superuser.
 .It Ic savehist
 Is given a numeric value to control the number of entries of the
 history list that are saved in
diff --git a/bin/date/date.1 b/bin/date/date.1
index e95bd5bd162..ff72ee5018d 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: date.1,v 1.24 2000/03/31 00:10:24 deraadt Exp $
+.\"	$OpenBSD: date.1,v 1.25 2000/04/15 11:45:53 aaron Exp $
 .\"	$NetBSD: date.1,v 1.12 1996/03/12 04:32:37 phil Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -59,7 +59,7 @@ Otherwise, depending on the options specified,
 .Nm
 will set the date and time or print it in a user-defined way.
 .Pp
-Only the super-user may set the date.
+Only the superuser may set the date.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index c6a5c4a42fc..770a03d42d9 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kill.1,v 1.12 2000/03/17 18:15:14 aaron Exp $
+.\"	$OpenBSD: kill.1,v 1.13 2000/04/15 11:45:53 aaron Exp $
 .\"	$NetBSD: kill.1,v 1.8 1995/09/07 06:30:26 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -70,7 +70,7 @@ If no signal is specified,
 .Dv SIGTERM
 is used.
 .Pp
-Only the super-user may send signals to other users' processes.
+Only the superuser may send signals to other users' processes.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -96,7 +96,7 @@ The following PIDs have special meanings:
 .Pp
 .Bl -tag -width Ds -compact -offset indent
 .It \-1
-If super-user, broadcast the signal to all processes; otherwise, broadcast
+If superuser, broadcast the signal to all processes; otherwise, broadcast
 to all processes belonging to the user.
 .El
 .Pp
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index ccebeae348d..7302684a4cc 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.23 2000/03/24 21:41:08 aaron Exp $
+.\"	$OpenBSD: ls.1,v 1.24 2000/04/15 11:45:53 aaron Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -77,7 +77,7 @@ List all entries except for
 .Dq \&.
 and
 .Dq \&.. .
-Always set for the super-user.
+Always set for the superuser.
 .It Fl C
 Force multi-column output; this is the default when output is to a terminal.
 .It Fl F
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 072974ced66..3491e5a9de2 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stty.1,v 1.23 2000/04/12 21:47:48 aaron Exp $
+.\"	$OpenBSD: stty.1,v 1.24 2000/04/15 11:45:54 aaron Exp $
 .\"	$NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -406,7 +406,7 @@ or the string
 .Dq undef
 the control character
 is disabled (i.e., set to
-.Pf { Dv _POSIX_VDISABLE Ns } . )
+.Pf { Dv _POSIX_VDISABLE Ns } ) .
 .Pp
 Recognized control-characters:
 .Bd -ragged -offset indent
diff --git a/lib/libarch/i386/i386_get_ioperm.2 b/lib/libarch/i386/i386_get_ioperm.2
index 6d77be8b50a..97bf1d23c7e 100644
--- a/lib/libarch/i386/i386_get_ioperm.2
+++ b/lib/libarch/i386/i386_get_ioperm.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: i386_get_ioperm.2,v 1.7 1999/07/09 13:35:14 aaron Exp $
+.\"	$OpenBSD: i386_get_ioperm.2,v 1.8 2000/04/15 11:46:01 aaron Exp $
 .\"	$NetBSD: i386_get_ioperm.2,v 1.3 1996/02/27 22:57:17 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ copies the current I/O permission bitmap into the memory referenced by
 .Fn i386_set_ioperm
 sets the I/O permission bitmap from the data pointed to by
 .Ar iomap .
-This call is restricted to the super-user.
+This call is restricted to the superuser.
 .Pp
 The permission bitmap contains
 1024
@@ -92,7 +92,7 @@ will fail if:
 .Ar Iomap
 points outside the process's allocated address space.
 .It Bq Er EPERM
-The caller was not the super-user.
+The caller was not the superuser.
 .El
 .Sh BUGS
 The bitmap should really cover 65536 bits, but that's just too big for
diff --git a/lib/libarch/i386/i386_iopl.2 b/lib/libarch/i386/i386_iopl.2
index 0b4c63ccc61..e48755ebb09 100644
--- a/lib/libarch/i386/i386_iopl.2
+++ b/lib/libarch/i386/i386_iopl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: i386_iopl.2,v 1.8 1999/07/07 14:22:24 aaron Exp $
+.\"	$OpenBSD: i386_iopl.2,v 1.9 2000/04/15 11:46:01 aaron Exp $
 .\"	$NetBSD: i386_iopl.2,v 1.3 1996/02/27 22:57:25 jtc Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
 .Fn i386_iopl
 sets the i386 I/O privilege level to the value specified by
 .Ar iopl .
-This call is restricted to the super-user.
+This call is restricted to the superuser.
 .Sh RETURN VALUES
 Upon successful completion,
 .Fn i386_iopl
@@ -64,7 +64,7 @@ is set to indicate the error.
 will fail if:
 .Bl -tag -width [EINVAL]
 .It Bq Er EPERM
-The caller was not the super-user.
+The caller was not the superuser.
 .El
 .Sh SEE ALSO
 .Xr i386_get_ioperm 2 ,
diff --git a/lib/libc/compat-43/gethostid.3 b/lib/libc/compat-43/gethostid.3
index 40b671a90e9..638427de545 100644
--- a/lib/libc/compat-43/gethostid.3
+++ b/lib/libc/compat-43/gethostid.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: gethostid.3,v 1.6 1999/07/09 13:35:14 aaron Exp $
+.\"	$OpenBSD: gethostid.3,v 1.7 2000/04/15 11:46:01 aaron Exp $
 .\"
 .Dd June 2, 1993
 .Dt GETHOSTID 3
@@ -50,7 +50,7 @@ establishes a 32-bit identifier for the
 current processor that is intended to be unique among all
 UNIX systems in existence.  This is normally a DARPA Internet
 address for the local machine.  This call is allowed only to the
-super-user and is normally performed at boot time.
+superuser and is normally performed at boot time.
 .Pp
 .Fn gethostid
 returns the 32-bit identifier for the current processor.
diff --git a/lib/libc/compat-43/killpg.3 b/lib/libc/compat-43/killpg.3
index 2cb71b2ad9f..928f188c4d0 100644
--- a/lib/libc/compat-43/killpg.3
+++ b/lib/libc/compat-43/killpg.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: killpg.3,v 1.6 1999/07/07 14:22:24 aaron Exp $
+.\"	$OpenBSD: killpg.3,v 1.7 2000/04/15 11:46:01 aaron Exp $
 .\"
 .Dd March 10, 1991
 .Dt KILLPG 3
@@ -58,7 +58,7 @@ sends the signal to the sending process's process group.
 .Pp
 The sending process and members of the process group must
 have the same effective user ID, or
-the sender must be the super-user.
+the sender must be the superuser.
 As a single special case the continue signal SIGCONT may be sent
 to any process that is a descendant of the current process.
 .Sh RETURN VALUES
@@ -80,7 +80,7 @@ No process can be found in the process group specified by
 The process group 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 one or more
+The sending process is not the superuser and one or more
 of the target processes has an effective user ID different from that
 of the sending process.
 .El
diff --git a/lib/libc/compat-43/setregid.3 b/lib/libc/compat-43/setregid.3
index be3b4881e75..cc88faf7850 100644
--- a/lib/libc/compat-43/setregid.3
+++ b/lib/libc/compat-43/setregid.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: setregid.3,v 1.6 1999/07/09 13:35:14 aaron Exp $
+.\"	$OpenBSD: setregid.3,v 1.7 2000/04/15 11:46:01 aaron Exp $
 .\"
 .Dd March 10, 1991
 .Dt SETREGID 3
@@ -45,7 +45,7 @@
 The real and effective group IDs of the current process
 are set to the arguments.
 Unprivileged users may change the real group
-ID to the effective group ID and vice-versa; only the super-user may
+ID to the effective group ID and vice-versa; only the superuser may
 make other changes.
 .Pp
 Supplying a value of \-1 for either the real or effective
@@ -74,8 +74,8 @@ is set to indicate the error.
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er EPERM
-The current process is not the super-user and a change
-other than changing the effective group-id to the real group-id
+The current process is not the superuser and a change
+other than changing the effective group ID to the real group ID
 was specified.
 .El
 .Sh SEE ALSO
diff --git a/lib/libc/compat-43/setreuid.3 b/lib/libc/compat-43/setreuid.3
index 7cf5169e203..72e0408d075 100644
--- a/lib/libc/compat-43/setreuid.3
+++ b/lib/libc/compat-43/setreuid.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: setreuid.3,v 1.6 1999/07/09 13:35:14 aaron Exp $
+.\"	$OpenBSD: setreuid.3,v 1.7 2000/04/15 11:46:01 aaron Exp $
 .\"
 .Dd March 10, 1991
 .Dt SETREUID 3
@@ -50,7 +50,7 @@ or
 .Fa euid
 is \-1, the current UID is filled in by the system.
 Unprivileged users may change the real user
-ID to the effective user ID and vice-versa; only the super-user may
+ID to the effective user ID and vice-versa; only the superuser may
 make other changes.
 .Pp
 The
@@ -73,8 +73,8 @@ is set to indicate the error.
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er EPERM
-The current process is not the super-user and a change
-other than changing the effective user-id to the real user-id
+The current process is not the superuser and a change
+other than changing the effective user ID to the real user ID
 was specified.
 .El
 .Sh SEE ALSO
diff --git a/lib/libc/gen/getdomainname.3 b/lib/libc/gen/getdomainname.3
index 5ccb8701912..a295a9f2d94 100644
--- a/lib/libc/gen/getdomainname.3
+++ b/lib/libc/gen/getdomainname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getdomainname.3,v 1.15 1999/07/09 13:35:16 aaron Exp $
+.\"	$OpenBSD: getdomainname.3,v 1.16 2000/04/15 11:46:02 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -63,7 +63,7 @@ sets the domain name of the host machine to be
 .Fa name ,
 which has length
 .Fa namelen .
-This call is restricted to the super-user and
+This call is restricted to the superuser and
 is normally used only when the system is bootstrapped.
 .Sh RETURN VALUES
 If the call succeeds a value of 0 is returned.  If the call
@@ -81,7 +81,7 @@ or
 parameter gave an
 invalid address.
 .It Bq Er EPERM
-The caller tried to set the domain name and was not the super-user.
+The caller tried to set the domain name and was not the superuser.
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
diff --git a/lib/libc/gen/gethostname.3 b/lib/libc/gen/gethostname.3
index 479e9257cc7..d89aa0f7bd5 100644
--- a/lib/libc/gen/gethostname.3
+++ b/lib/libc/gen/gethostname.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gethostname.3,v 1.15 1999/07/09 13:35:17 aaron Exp $
+.\"	$OpenBSD: gethostname.3,v 1.16 2000/04/15 11:46:02 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -62,7 +62,7 @@ sets the name of the host machine to be
 .Fa name ,
 which has length
 .Fa namelen .
-This call is restricted to the super-user and
+This call is restricted to the superuser and
 is normally used only when the system is bootstrapped.
 .Sh RETURN VALUES
 If the call succeeds a value of 0 is returned.  If the call
@@ -80,7 +80,7 @@ or
 parameter gave an
 invalid address.
 .It Bq Er EPERM
-The caller tried to set the hostname and was not the super-user.
+The caller tried to set the hostname and was not the superuser.
 .El
 .Sh SEE ALSO
 .Xr hostname 1 ,
diff --git a/lib/libc/gen/initgroups.3 b/lib/libc/gen/initgroups.3
index ec2ff8105e1..90df74914e9 100644
--- a/lib/libc/gen/initgroups.3
+++ b/lib/libc/gen/initgroups.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: initgroups.3,v 1.8 1999/07/09 13:35:17 aaron Exp $
+.\"	$OpenBSD: initgroups.3,v 1.9 2000/04/15 11:46:02 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -69,7 +69,7 @@ the later groups are ignored.
 The
 .Fn initgroups
 function
-returns \-1 if it was not invoked by the super-user.
+returns \-1 if it was not invoked by the superuser.
 .Sh SEE ALSO
 .Xr setgroups 2 ,
 .Xr getgrouplist 3
diff --git a/lib/libc/gen/nice.3 b/lib/libc/gen/nice.3
index 1e514df3361..f2396349fab 100644
--- a/lib/libc/gen/nice.3
+++ b/lib/libc/gen/nice.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nice.3,v 1.9 1999/07/09 13:35:18 aaron Exp $
+.\"	$OpenBSD: nice.3,v 1.10 2000/04/15 11:46:02 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -54,7 +54,7 @@ from the system and sets it to the priority value specified in
 .Fa incr .
 The priority is a value in the range \-20 to 20.
 The default priority is 0; lower priorities cause more favorable scheduling.
-Only the super-user may lower priorities.
+Only the superuser may lower priorities.
 .Pp
 Children inherit the priority of their parent processes via
 .Xr fork 2 .
diff --git a/lib/libc/gen/utime.3 b/lib/libc/gen/utime.3
index f73fcc22655..2615ddda57b 100644
--- a/lib/libc/gen/utime.3
+++ b/lib/libc/gen/utime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utime.3,v 1.11 1999/07/09 13:35:19 aaron Exp $
+.\"	$OpenBSD: utime.3,v 1.12 2000/04/15 11:46:02 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -83,7 +83,7 @@ time is set to the value of the
 member.  The times are measured in
 seconds since 0 hours, 0 minutes, 0 seconds, January 1, 1970, Coordinated
 Universal Time (UTC).
-The calling process must be the owner of the file or be the super-user.
+The calling process must be the owner of the file or be the superuser.
 .Pp
 In either case, the inode change-time of the file is set to the current
 time.
@@ -103,7 +103,7 @@ or the
 argument is
 .Dv NULL
 and the effective user ID of the process does not
-match the owner of the file, and is not the super-user, and write
+match the owner of the file, and is not the superuser, and write
 access is denied.
 .It Bq Er EFAULT
 .Fa file
@@ -131,7 +131,7 @@ The
 argument is not
 .Dv NULL
 and the calling process's effective user ID
-does not match the owner of the file and is not the super-user.
+does not match the owner of the file and is not the superuser.
 .It Bq Er EROFS
 The file system containing the file is mounted read-only.
 .El
diff --git a/lib/libc/net/rcmd.3 b/lib/libc/net/rcmd.3
index ccc7294e529..ea71e40d71b 100644
--- a/lib/libc/net/rcmd.3
+++ b/lib/libc/net/rcmd.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcmd.3,v 1.18 2000/02/23 17:28:25 aaron Exp $
+.\"	$OpenBSD: rcmd.3,v 1.19 2000/04/15 11:46:02 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -63,7 +63,7 @@
 The
 .Fn rcmd
 function
-is used by the super-user to execute a command on a remote
+is used by the superuser to execute a command on a remote
 machine using an authentication scheme based on reserved
 port numbers.  If the calling process is not setuid, the
 .Ev RSH
@@ -74,7 +74,7 @@ is
 .Xr rcmdsh 3
 is called instead with the value of
 .Ev RSH .
-Alternately, if the user is not the super-user,
+Alternately, if the user is not the superuser,
 .Fn rcmd
 will invoke
 .Xr rcmdsh 3
@@ -123,7 +123,7 @@ is set to the standard name of the host
 and a connection is established to a server
 residing at the well-known Internet port
 .Fa inport .
-If the user is not the super-user, the only valid port is
+If the user is not the superuser, the only valid port is
 .Dq shell/tcp
 (usually port 514).
 .Pp
@@ -150,7 +150,7 @@ is 0, then the standard error (unit 2 of the remote command) will be made the
 same as the standard output and no
 provision is made for sending arbitrary signals to the remote process,
 although you may be able to get its attention by using out-of-band data.
-Note that if the user is not the super-user,
+Note that if the user is not the superuser,
 .Fa fd2p
 must be 0.
 .Pp
@@ -174,7 +174,7 @@ address bound to it.  This socket is suitable for use
 by
 .Fn rcmd
 and several other functions.  Privileged Internet ports are those
-in the range 0 to 1023.  Only the super-user
+in the range 0 to 1023.  Only the superuser
 is allowed to bind an address of this sort to a socket.
 .Fn rresvport
 and
@@ -188,10 +188,10 @@ and
 .Fn ruserok
 functions take a remote host's IP address or name, respectively,
 two user names and a flag indicating whether the local user's
-name is that of the super-user.
+name is that of the superuser.
 Then, if the user is
 .Em not
-the super-user, it checks the
+the superuser, it checks the
 .Pa /etc/hosts.equiv
 file.
 If that lookup is not done, or is unsuccessful, the
@@ -200,7 +200,7 @@ in the local user's home directory is checked to see if the request for
 service is allowed.
 .Pp
 If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the super-user, or is writeable by anyone other
+other than the user or the superuser, or is writeable by anyone other
 than the owner, the check automatically fails.
 Zero is returned if the machine name is listed in the
 .Pa hosts.equiv
diff --git a/lib/libc/sys/acct.2 b/lib/libc/sys/acct.2
index 262e2bba6a6..0021e57673e 100644
--- a/lib/libc/sys/acct.2
+++ b/lib/libc/sys/acct.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acct.2,v 1.6 1999/10/07 22:28:04 aaron Exp $
+.\"	$OpenBSD: acct.2,v 1.7 2000/04/15 11:46:02 aaron Exp $
 .\"	$NetBSD: acct.2,v 1.6 1995/02/27 12:31:47 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -74,20 +74,20 @@ see
 and
 .Xr acct 5 .
 .Pp
-This call is permitted only to the super-user.
+This call is permitted only to the superuser.
 .Sh NOTES
 Accounting is automatically disabled when the file system the
 accounting file resides on runs out of space; it is enabled when
 space once again becomes available.
 .Sh RETURN VALUES
 On error \-1 is returned.
-The file must exist and the call may be exercised only by the super-user.
+The file must exist and the call may be exercised only by the superuser.
 .Sh ERRORS
 .Fn acct
 will fail if one of the following is true:
 .Bl -tag -width Er
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .It Bq Er ENOTDIR
 A component of the path prefix is not a directory.
 .It Bq Er ENAMETOOLONG
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
index 70b278a24f0..592292bc308 100644
--- a/lib/libc/sys/adjtime.2
+++ b/lib/libc/sys/adjtime.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: adjtime.2,v 1.8 1999/06/29 14:09:50 aaron Exp $
+.\"	$OpenBSD: adjtime.2,v 1.9 2000/04/15 11:46:02 aaron Exp $
 .\"	$NetBSD: adjtime.2,v 1.5 1995/10/12 15:40:44 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -82,7 +82,7 @@ and speed up the clocks of others to bring them to the average network time.
 .Pp
 The call
 .Fn adjtime
-is restricted to the super-user.
+is restricted to the superuser.
 .Sh RETURN VALUES
 A return value of 0 indicates that the call succeeded.
 A return value of \-1 indicates that an error occurred, and in this
@@ -95,7 +95,7 @@ will fail if:
 .It Bq Er EFAULT
 Either of the arguments point outside the process's allocated address space.
 .It Bq Er EPERM
-The process's effective user ID is not that of the super-user.
+The process's effective user ID is not that of the superuser.
 .El
 .Sh SEE ALSO
 .Xr date 1 ,
diff --git a/lib/libc/sys/chflags.2 b/lib/libc/sys/chflags.2
index a4210accbfb..22d252647b2 100644
--- a/lib/libc/sys/chflags.2
+++ b/lib/libc/sys/chflags.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chflags.2,v 1.13 1999/07/31 03:55:28 deraadt Exp $
+.\"	$OpenBSD: chflags.2,v 1.14 2000/04/15 11:46:02 aaron Exp $
 .\"	$NetBSD: chflags.2,v 1.6 1995/02/27 12:32:03 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1993
@@ -80,13 +80,13 @@ The
 .Dq UF_IMMUTABLE
 and
 .Dq UF_APPEND
-flags may be set or unset by either the owner of a file or the super-user.
+flags may be set or unset by either the owner of a file or the superuser.
 .Pp
 The
 .Dq SF_IMMUTABLE
 and
 .Dq SF_APPEND
-flags may only be set or unset by the super-user.
+flags may only be set or unset by the superuser.
 They may be set at any time, but normally may only be unset when
 the system is in single-user mode.
 (See
@@ -117,7 +117,7 @@ Search permission is denied for a component of the path prefix.
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EPERM
 The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user.
+the effective user ID is not the superuser.
 .It Bq Er EOPNOTSUPP
 The named file resides on a file system that does not support file
 flags.
@@ -141,12 +141,12 @@ The descriptor is not valid.
 .Fa fd
 refers to a socket, not to a file.
 .It Bq Er EINVAL
-Only the super-user can change flags on block and character devices.
+Only the superuser can change flags on block and character devices.
 .It Bq Er EINVAL
 The flags value is invalid.
 .It Bq Er EPERM
 The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user.
+the effective user ID is not the superuser.
 .It Bq Er EOPNOTSUPP
 The named file resides on a file system that does not support file
 flags.
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index c9188372db0..57925f7f989 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chmod.2,v 1.8 1999/06/29 14:09:51 aaron Exp $
+.\"	$OpenBSD: chmod.2,v 1.9 2000/04/15 11:46:02 aaron Exp $
 .\"	$NetBSD: chmod.2,v 1.7 1995/02/27 12:32:06 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -68,7 +68,7 @@ the file specified by
 (or
 .Fa fd ) ,
 or
-is the super-user.
+is the superuser.
 A mode is created from
 .Em or'd
 permission bit masks
@@ -116,11 +116,11 @@ For more details of the properties of the sticky bit, see
 .Xr sticky 8 .
 .Pp
 Writing or changing the owner of a file
-turns off the set-user-id and set-group-id bits
-unless the user is the super-user.
+turns off the set-user-ID and set-group-ID bits
+unless the user is the superuser.
 This makes the system somewhat more secure
-by protecting set-user-id (set-group-id) files
-from remaining set-user-id (set-group-id) if they are modified,
+by protecting set-user-ID (set-group-ID) files
+from remaining set-user-ID (set-group-ID) if they are modified,
 at the expense of a degree of compatibility.
 .Sh RETURN VALUES
 Upon successful completion, a value of 0 is returned.
@@ -150,7 +150,7 @@ contains bits other than the file type and those described above.
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EPERM
 The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user.
+the effective user ID is not the superuser.
 .It Bq Er EROFS
 The named file resides on a read-only file system.
 .It Bq Er EFAULT
diff --git a/lib/libc/sys/chown.2 b/lib/libc/sys/chown.2
index 4776492fc03..1b75cafd7a3 100644
--- a/lib/libc/sys/chown.2
+++ b/lib/libc/sys/chown.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.2,v 1.7 1999/06/29 14:09:52 aaron Exp $
+.\"	$OpenBSD: chown.2,v 1.8 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: chown.2,v 1.10 1995/10/12 15:40:47 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
@@ -67,13 +67,13 @@ to a group of which
 he or she is a member,
 but the change
 .Fa owner
-capability is restricted to the super-user.
+capability is restricted to the superuser.
 .Pp
 .Fn chown
-clears the set-user-id and set-group-id bits
+clears the set-user-ID and set-group-ID bits
 on the file
 to prevent accidental or mischievous creation of
-set-user-id and set-group-id programs.
+set-user-ID and set-group-ID programs.
 .Pp
 .Fn lchown
 operates similarly to how
@@ -114,7 +114,7 @@ Search permission is denied for a component of the path prefix.
 .It Bq Er ELOOP
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EPERM
-The effective user ID is not the super-user.
+The effective user ID is not the superuser.
 .It Bq Er EROFS
 The named file resides on a read-only file system.
 .It Bq Er EFAULT
@@ -134,7 +134,7 @@ does not refer to a valid descriptor.
 .Fa fd
 refers to a socket, not a file.
 .It Bq Er EPERM
-The effective user ID is not the super-user.
+The effective user ID is not the superuser.
 .It Bq Er EROFS
 The named file resides on a read-only file system.
 .It Bq Er EIO
diff --git a/lib/libc/sys/chroot.2 b/lib/libc/sys/chroot.2
index 7d58de52ef2..cd7b6eadbb1 100644
--- a/lib/libc/sys/chroot.2
+++ b/lib/libc/sys/chroot.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chroot.2,v 1.8 1999/06/29 14:09:52 aaron Exp $
+.\"	$OpenBSD: chroot.2,v 1.9 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: chroot.2,v 1.7 1995/02/27 12:32:12 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -70,7 +70,7 @@ process's current directory is changed to the same new root directory.
 This prevents the current directory from being further up the directory
 tree than the altered root directory.
 .Pp
-This call is restricted to the super-user.
+This call is restricted to the superuser.
 .Sh RETURN VALUES
 Upon successful completion, a value of 0 is returned.  Otherwise,
 a value of \-1 is returned and
diff --git a/lib/libc/sys/clock_gettime.2 b/lib/libc/sys/clock_gettime.2
index 532ef11970b..b538c1e24b0 100644
--- a/lib/libc/sys/clock_gettime.2
+++ b/lib/libc/sys/clock_gettime.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: clock_gettime.2,v 1.10 2000/04/15 02:15:24 aaron Exp $
+.\"	$OpenBSD: clock_gettime.2,v 1.11 2000/04/15 11:46:03 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -80,11 +80,11 @@ struct timespec {
 };
 .Ed
 .Pp
-Only the super-user may set the time of day.
+Only the superuser may set the time of day.
 If the system securelevel is greater than 1 (see
 .Xr init 8 ) ,
 the time may only be advanced.
-This limitation is imposed to prevent a malicious super-user
+This limitation is imposed to prevent a malicious superuser
 from setting arbitrary time stamps on files.
 The system time can still be adjusted backwards using the
 .Xr adjtime 2
@@ -112,7 +112,7 @@ The
 .Fa *tp
 argument address referenced invalid memory.
 .It Bq Er EPERM
-A user other than the super-user attempted to set the time.
+A user other than the superuser attempted to set the time.
 .El
 .Sh SEE ALSO
 .Xr date 1 ,
diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2
index 9be132f5517..ecd44ed8e21 100644
--- a/lib/libc/sys/execve.2
+++ b/lib/libc/sys/execve.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: execve.2,v 1.12 1999/07/06 18:21:03 deraadt Exp $
+.\"	$OpenBSD: execve.2,v 1.13 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: execve.2,v 1.9 1995/02/27 12:32:25 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -185,7 +185,8 @@ where
 .Fa argc
 is the number of elements in
 .Fa argv
-(the ``arg count'')
+(the
+.Dq arg count )
 and
 .Fa argv
 points to the array of character pointers
@@ -267,11 +268,12 @@ the system file table was found to be full.
 .Sh CAVEAT
 If a program is
 .Em setuid
-to a non-super-user, but is executed when
+to a non-superuser, but is executed when
 the real
 .Em uid
-is ``root'', then the program has some of the powers
-of a super-user as well.
+is
+.Dq root ,
+then the program has some of the powers of a superuser as well.
 .Sh SEE ALSO
 .Xr _exit 2 ,
 .Xr fork 2 ,
diff --git a/lib/libc/sys/getlogin.2 b/lib/libc/sys/getlogin.2
index ea6e7f81e8c..f8a82f8b1cc 100644
--- a/lib/libc/sys/getlogin.2
+++ b/lib/libc/sys/getlogin.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getlogin.2,v 1.7 1999/06/29 14:09:59 aaron Exp $
+.\"	$OpenBSD: getlogin.2,v 1.8 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: getlogin.2,v 1.4 1995/02/27 12:33:03 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -65,7 +65,7 @@ is used.)
 .Fn setlogin
 sets the login name of the user associated with the current session to
 .Fa name .
-This call is restricted to the super-user, and
+This call is restricted to the superuser, and
 is normally used only when a new session is being created on behalf
 of the named user
 (for example, at login time, or when a remote shell is invoked).
@@ -101,7 +101,7 @@ Login names are limited to
 .Ao Pa sys/param.h Ac )
 characters, currently 12.
 .It Bq Er EPERM
-The caller tried to set the login name and was not the super-user.
+The caller tried to set the login name and was not the superuser.
 .El
 .Sh SEE ALSO
 .Xr setsid 2
diff --git a/lib/libc/sys/getpriority.2 b/lib/libc/sys/getpriority.2
index 5a65f742761..d300f7ed3cb 100644
--- a/lib/libc/sys/getpriority.2
+++ b/lib/libc/sys/getpriority.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getpriority.2,v 1.5 1999/06/29 14:10:00 aaron Exp $
+.\"	$OpenBSD: getpriority.2,v 1.6 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: getpriority.2,v 1.4 1995/02/27 12:33:15 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -89,7 +89,7 @@ call returns the highest priority (lowest numerical value)
 enjoyed by any of the specified processes.  The
 .Fn setpriority
 call sets the priorities of all of the specified processes
-to the specified value.  Only the super-user may lower priorities.
+to the specified value.  Only the superuser may lower priorities.
 .Sh RETURN VALUES
 Since
 .Fn getpriority
@@ -132,7 +132,7 @@ will fail if:
 A process was located, but neither its effective nor real user
 ID matched the effective user ID of the caller.
 .It Bq Er EACCES
-A non super-user attempted to lower a process priority.
+A non-superuser attempted to lower a process priority.
 .El
 .Sh SEE ALSO
 .Xr nice 1 ,
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index 13f40e9657b..e8f5bbdc55c 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getrlimit.2,v 1.9 1999/06/29 14:10:00 aaron Exp $
+.\"	$OpenBSD: getrlimit.2,v 1.10 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: getrlimit.2,v 1.8 1995/10/12 15:40:58 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -110,7 +110,7 @@ struct rlimit {
 };
 .Ed
 .Pp
-Only the super-user may raise the maximum limits.  Other users
+Only the superuser may raise the maximum limits.  Other users
 may only alter
 .Fa rlim_cur
 within the range from 0 to
@@ -175,7 +175,7 @@ is invalid.
 The limit specified to
 .Fn setrlimit
 would have
-raised the maximum limit value, and the caller is not the super-user.
+raised the maximum limit value, and the caller is not the superuser.
 .El
 .Sh SEE ALSO
 .Xr csh 1 ,
diff --git a/lib/libc/sys/gettimeofday.2 b/lib/libc/sys/gettimeofday.2
index 9ba18540e34..279cd8ce1a9 100644
--- a/lib/libc/sys/gettimeofday.2
+++ b/lib/libc/sys/gettimeofday.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: gettimeofday.2,v 1.9 2000/04/15 02:15:24 aaron Exp $
+.\"	$OpenBSD: gettimeofday.2,v 1.10 2000/04/15 11:46:03 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -97,11 +97,11 @@ and a flag that, if nonzero, indicates that
 Daylight Saving time applies locally during
 the appropriate part of the year.
 .Pp
-Only the super-user may set the time of day or time zone.
+Only the superuser may set the time of day or time zone.
 If the system securelevel is greater than 1 (see
 .Xr init 8 ) ,
 the time may only be advanced.
-This limitation is imposed to prevent a malicious super-user
+This limitation is imposed to prevent a malicious superuser
 from setting arbitrary time stamps on files.
 The system time can still be adjusted backwards using the
 .Xr adjtime 2
@@ -118,7 +118,7 @@ The following error codes may be set in
 .It Bq Er EFAULT
 An argument address referenced invalid memory.
 .It Bq Er EPERM
-A user other than the super-user attempted to set the time.
+A user other than the superuser attempted to set the time.
 .El
 .Sh SEE ALSO
 .Xr date 1 ,
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 8602a7e39c1..283a1d4faee 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: intro.2,v 1.15 1999/07/04 18:59:43 aaron Exp $
+.\"	$OpenBSD: intro.2,v 1.16 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: intro.2,v 1.6 1995/02/27 12:33:41 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1983, 1986, 1991, 1993
@@ -525,10 +525,10 @@ or group ID after reverting to the real ID (see
 .Xr setuid 2 ) .
 (In POSIX.1, the saved set-user-ID and saved set-group-ID are optional,
 and are used in setuid and setgid, but this does not work as desired
-for the super-user.)
+for the superuser.)
 .It Super-user
 A process is recognized as a
-.Em super-user
+.Em superuser
 process and is granted special privileges if its effective user ID is 0.
 .It Special Processes
 The processes with process IDs of 0, 1, and 2 are special.
@@ -651,8 +651,8 @@ information applicable to the caller.
 Read, write, and execute/search permissions on
 a file are granted to a process if:
 .Pp
-The process's effective user ID is that of the super-user. (Note:
-even the super-user cannot execute a non-executable file.)
+The process's effective user ID is that of the superuser. (Note:
+even the superuser cannot execute a non-executable file.)
 .Pp
 The process's effective user ID matches the user ID of the owner
 of the file and the owner permissions allow the access.
diff --git a/lib/libc/sys/kill.2 b/lib/libc/sys/kill.2
index 314fa12096d..6fd0065f654 100644
--- a/lib/libc/sys/kill.2
+++ b/lib/libc/sys/kill.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kill.2,v 1.11 1999/06/29 14:10:04 aaron Exp $
+.\"	$OpenBSD: kill.2,v 1.12 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: kill.2,v 1.7 1995/02/27 12:33:53 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -67,7 +67,7 @@ by
 .Fa pid ,
 the real or effective user ID of the receiving process must match
 that of the sending process or the user must have appropriate privileges
-(such as given by a set-user-ID program or the user is the super-user).
+(such as given by a set-user-ID program or the user is the superuser).
 A single exception is the signal
 .Dv SIGCONT ,
 which may always be sent
@@ -85,7 +85,7 @@ process has permission;
 this is a variant of
 .Xr killpg 3 .
 .It \&If Fa pid No \&is -1 :
-If the user has super-user privileges,
+If the user has superuser privileges,
 the signal is sent to all processes excluding
 system processes and the process sending the signal.
 If the user is not the super user, the signal is sent to all processes
@@ -134,7 +134,7 @@ No process can be found corresponding to that specified by
 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
+The sending process is not the superuser and its effective
 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.
diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2
index 1b6be37cd7b..7a14ba4bd9b 100644
--- a/lib/libc/sys/ktrace.2
+++ b/lib/libc/sys/ktrace.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ktrace.2,v 1.7 1999/06/29 14:10:04 aaron Exp $
+.\"	$OpenBSD: ktrace.2,v 1.8 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: ktrace.2,v 1.2 1995/02/27 12:33:58 cgd Exp $
 .\"
 .\" Copyright (c) 1993
@@ -52,7 +52,7 @@ The
 .Fn ktrace
 function enables or disables tracing of one or more processes.
 Users may only trace their own processes.
-Only the super-user can trace setuid or setgid programs.
+Only the superuser can trace setuid or setgid programs.
 .Pp
 .Fa tracefile
 gives the pathname of the file to be used for tracing.
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 23eefdccccf..a809afc7fbd 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: link.2,v 1.11 1999/07/04 18:59:43 aaron Exp $
+.\"	$OpenBSD: link.2,v 1.12 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: link.2,v 1.7 1995/02/27 12:34:01 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -127,7 +127,7 @@ does exist.
 The file named by
 .Fa name1
 is a directory and the effective
-user ID is not super-user,
+user ID is not superuser,
 or the file system containing the file does not permit the use of
 .Fn link
 on a directory.
diff --git a/lib/libc/sys/mknod.2 b/lib/libc/sys/mknod.2
index c8119f5b895..57bec168377 100644
--- a/lib/libc/sys/mknod.2
+++ b/lib/libc/sys/mknod.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mknod.2,v 1.7 1999/06/29 14:10:07 aaron Exp $
+.\"	$OpenBSD: mknod.2,v 1.8 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: mknod.2,v 1.6 1995/02/27 12:34:33 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -68,7 +68,7 @@ does not indicate a block special or character special device,
 is ignored.
 .Pp
 .Fn mknod
-requires super-user privileges.
+requires superuser privileges.
 .Sh RETURN VALUES
 Upon successful completion a value of 0 is returned.
 Otherwise, a value of \-1 is returned and
@@ -93,7 +93,7 @@ Search permission is denied for a component of the path prefix.
 .It Bq Er ELOOP
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EPERM
-The process's effective user ID is not super-user.
+The process's effective user ID is not superuser.
 .It Bq Er EIO
 An I/O error occurred while making the directory entry or allocating the inode.
 .It Bq Er ENOSPC
diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 252f0e5eb94..8bd86c5817f 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.2,v 1.17 1999/09/25 21:28:04 pjanzen Exp $
+.\"	$OpenBSD: mount.2,v 1.18 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: mount.2,v 1.12 1996/02/29 23:47:48 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1993
@@ -81,7 +81,7 @@ suppress default semantics which affect filesystem access.
 .Bl -tag -width MNT_SYNCHRONOUS
 .It Dv MNT_RDONLY
 The filesystem should be treated as read-only:
-even the super-user may not write to it.
+even the superuser may not write to it.
 .It Dv MNT_NOATIME
 Do not update the access time on files in the filesystem unless
 the modification or status change times are also being updated.
@@ -198,7 +198,7 @@ is set to indicate the error.
 will fail when one of the following occurs:
 .Bl -tag -width [ENAMETOOLONG]
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .It Bq Er ENAMETOOLONG
 A component of a pathname exceeded
 .Dv {NAME_MAX}
@@ -302,7 +302,7 @@ points outside the process's allocated address space.
 may fail with one of the following errors:
 .Bl -tag -width [ENAMETOOLONG]
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .It Bq Er ENOTDIR
 A component of the path is not a directory.
 .It Bq Er EINVAL
diff --git a/lib/libc/sys/msgctl.2 b/lib/libc/sys/msgctl.2
index dfacd93a7f8..5342bce468c 100644
--- a/lib/libc/sys/msgctl.2
+++ b/lib/libc/sys/msgctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: msgctl.2,v 1.9 1999/06/29 14:10:08 aaron Exp $
+.\"	$OpenBSD: msgctl.2,v 1.10 2000/04/15 11:46:03 aaron Exp $
 .\"	$NetBSD: msgctl.2,v 1.2 1997/03/27 08:20:35 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -116,7 +116,7 @@ fields in the structure associated with
 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
+This operation can only be executed by the superuser, or a process that
 has an effective user ID equal to either
 .Va msg_perm.cuid
 or
@@ -124,7 +124,7 @@ or
 in the data structure associated with the message queue.
 The value of
 .Va msg_qbytes
-can only be increased by the super-user. Values for
+can only be increased by the superuser. Values for
 .Va msg_qbytes
 that exceed the system limit
 .Pf ( Dv MSGMNB
@@ -135,7 +135,7 @@ are silently truncated to that limit.
 .It Dv IPC_RMID
 Remove the message queue specified by
 .Fa msqid
-and destroy the data associated with it. Only the super-user or a process
+and destroy the data associated with it. Only the superuser or a process
 with an effective UID equal to the
 .Va msg_perm.cuid
 or
@@ -176,7 +176,7 @@ is equal to
 .Dv IPC_SET
 or
 .Dv IPC_RMID
-and the caller is not the super-user, nor does
+and the caller is not the superuser, nor does
 the effective UID match either the
 .Va msg_perm.uid
 or
@@ -187,7 +187,7 @@ An attempt is made to increase the value of
 .Va msg_qbytes
 through
 .Dv IPC_SET
-but the caller is not the super-user.
+but the caller is not the superuser.
 .It Bq Er EACCES
 The command is
 .Dv IPC_STAT
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index 9354634bfc7..5f6eae1d82e 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nfssvc.2,v 1.11 2000/01/22 12:05:49 aaron Exp $
+.\"	$OpenBSD: nfssvc.2,v 1.12 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: nfssvc.2,v 1.6 1995/02/27 12:35:08 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -231,7 +231,7 @@ This special error value
 is really used for authentication support, particularly Kerberos,
 as explained above.
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .El
 .Sh SEE ALSO
 .Xr mount_nfs 8 ,
diff --git a/lib/libc/sys/quotactl.2 b/lib/libc/sys/quotactl.2
index 836eccb4622..e9c57363116 100644
--- a/lib/libc/sys/quotactl.2
+++ b/lib/libc/sys/quotactl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quotactl.2,v 1.6 1999/07/05 06:08:05 aaron Exp $
+.\"	$OpenBSD: quotactl.2,v 1.7 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: quotactl.2,v 1.8 1995/02/27 12:35:43 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
@@ -92,7 +92,7 @@ program.
 The
 .Fa id
 argument is unused.
-Only the super-user may turn quotas on.
+Only the superuser may turn quotas on.
 .It Dv Q_QUOTAOFF
 Disable disk quotas for the filesystem specified by
 .Fa path .
@@ -102,7 +102,7 @@ The
 and
 .Fa id
 arguments are unused.
-Only the super-user may turn quotas off.
+Only the superuser may turn quotas off.
 .It Dv Q_GETQUOTA
 Get disk quota limits and current usage for the user or group
 (as determined by the command type) with identifier
@@ -122,7 +122,7 @@ structure.
 The usage fields of
 .Li struct dqblk
 structure are ignored.
-This call is restricted to the super-user.
+This call is restricted to the superuser.
 .It Dv Q_SETUSE
 Set disk usage limits for the user or group
 (as determined by the command type) with identifier
@@ -132,7 +132,7 @@ is a pointer to a
 .Li struct dqblk
 structure.
 Only the usage fields are used.
-This call is restricted to the super-user.
+This call is restricted to the superuser.
 .It Dv Q_SYNC
 Update the on-disk copy of quota usages.
 The command type specifies which type of quotas are to be updated.
@@ -197,7 +197,7 @@ of the kernel.
 .Fa path
 points outside the process's allocated address space.
 .It Bq Er EPERM
-The call was privileged and the caller was not the super-user.
+The call was privileged and the caller was not the superuser.
 .El
 .Sh SEE ALSO
 .Xr quota 1 ,
diff --git a/lib/libc/sys/reboot.2 b/lib/libc/sys/reboot.2
index 74dc8924c6a..774f4da9652 100644
--- a/lib/libc/sys/reboot.2
+++ b/lib/libc/sys/reboot.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: reboot.2,v 1.6 1999/07/06 08:21:17 downsj Exp $
+.\"	$OpenBSD: reboot.2,v 1.7 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: reboot.2,v 1.5 1995/02/27 12:36:02 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -48,7 +48,7 @@
 .Sh DESCRIPTION
 .Fn reboot
 reboots the system.
-Only the super-user may reboot a machine on demand.
+Only the superuser may reboot a machine on demand.
 However, a reboot is invoked
 automatically in the event of unrecoverable system failures.
 .Pp
@@ -144,7 +144,7 @@ variable
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .El
 .Sh SEE ALSO
 .Xr kadb 4 ,
diff --git a/lib/libc/sys/semctl.2 b/lib/libc/sys/semctl.2
index c5da566a05b..7fa582ddb2b 100644
--- a/lib/libc/sys/semctl.2
+++ b/lib/libc/sys/semctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: semctl.2,v 1.10 1999/06/29 14:10:17 aaron Exp $
+.\"	$OpenBSD: semctl.2,v 1.11 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: semctl.2,v 1.2 1997/03/27 08:20:40 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -146,7 +146,7 @@ fields in the structure associated with the semaphore.
 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
+This operation can only be executed by the superuser, or a process that
 has an effective user ID equal to either
 .Va sem_perm.cuid
 or
@@ -156,7 +156,7 @@ in the data structure associated with the message queue.
 Remove the semaphores associated with
 .Fa semid
 from the system and destroy the data structures associated with it. Only the
-super-user or a process with an effective UID equal to the
+superuser or a process with an effective UID equal to the
 .Va sem_perm.cuid
 or
 .Va sem_perm.uid
@@ -204,7 +204,7 @@ is equal to
 .Dv IPC_SET
 or
 .Dv IPC_RMID
-and the caller is not the super-user, nor does
+and the caller is not the superuser, nor does
 the effective UID match either the
 .Va sem_perm.uid
 or
diff --git a/lib/libc/sys/setgroups.2 b/lib/libc/sys/setgroups.2
index 0ca2f089d87..89e9f5e412f 100644
--- a/lib/libc/sys/setgroups.2
+++ b/lib/libc/sys/setgroups.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setgroups.2,v 1.6 1999/06/29 14:10:18 aaron Exp $
+.\"	$OpenBSD: setgroups.2,v 1.7 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: setgroups.2,v 1.7 1995/02/27 12:36:49 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993, 1994
@@ -56,7 +56,7 @@ indicates the number of entries in the array and must be no
 more than
 .Dv {NGROUPS_MAX} .
 .Pp
-Only the super-user may set new groups.
+Only the superuser may set new groups.
 .Sh RETURN VALUES
 A 0 value is returned on success, \-1 on error, with
 an error code stored in
@@ -72,7 +72,7 @@ The value of
 is greater than
 .Dv {NGROUPS_MAX} .
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .It Bq Er EFAULT
 The address specified for
 .Fa gidset
diff --git a/lib/libc/sys/setpgid.2 b/lib/libc/sys/setpgid.2
index cca08b54f88..3408259db30 100644
--- a/lib/libc/sys/setpgid.2
+++ b/lib/libc/sys/setpgid.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: setpgid.2,v 1.7 1999/06/29 14:10:19 aaron Exp $
+.\"	$OpenBSD: setpgid.2,v 1.8 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: setpgid.2,v 1.8 1995/02/27 12:36:55 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -57,8 +57,8 @@ If
 .Ar pid
 is zero, then the call applies to the current process.
 .Pp
-If the invoker is not the super-user, then the affected process
-must have the same effective user-id as the invoker or be a descendant
+If the invoker is not the superuser, then the affected process
+must have the same effective user ID as the invoker or be a descendant
 of the invoking process.
 .Sh RETURN VALUES
 .Fn setpgid
diff --git a/lib/libc/sys/shmctl.2 b/lib/libc/sys/shmctl.2
index 02498ebf7a9..e99cac41bd9 100644
--- a/lib/libc/sys/shmctl.2
+++ b/lib/libc/sys/shmctl.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shmctl.2,v 1.10 1999/06/29 14:10:20 aaron Exp $
+.\"	$OpenBSD: shmctl.2,v 1.11 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: shmctl.2,v 1.3 1997/03/27 08:20:39 mikel Exp $
 .\"
 .\" Copyright (c) 1995 Frank van der Linden
@@ -115,7 +115,7 @@ fields in the structure associated with
 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
+This operation can only be executed by the superuser, or a process that
 has an effective user ID equal to either
 .Va shm_perm.cuid
 or
@@ -125,7 +125,7 @@ in the data structure associated with the shared memory segment.
 .It Dv IPC_RMID
 Remove the shared memory segment specified by
 .Fa shmid
-and destroy the data associated with it. Only the super-user or a process
+and destroy the data associated with it. Only the superuser or a process
 with an effective UID equal to the
 .Va shm_perm.cuid
 or
@@ -163,7 +163,7 @@ is equal to
 .Dv IPC_SET
 or
 .Dv IPC_RMID
-and the caller is not the super-user, nor does
+and the caller is not the superuser, nor does
 the effective UID match either the
 .Va shm_perm.uid
 or
@@ -174,7 +174,7 @@ An attempt is made to increase the value of
 .Va shm_qbytes
 through
 .Dv IPC_SET
-but the caller is not the super-user.
+but the caller is not the superuser.
 .It Bq Er EACCES
 The command is
 .Dv IPC_STAT
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index c849948e835..b771ac9a6fa 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: socket.2,v 1.15 2000/04/12 21:48:02 aaron Exp $
+.\"	$OpenBSD: socket.2,v 1.16 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: socket.2,v 1.5 1995/02/27 12:37:53 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -103,7 +103,7 @@ only for
 sockets provide access to internal network protocols and interfaces.
 The types
 .Dv SOCK_RAW ,
-which is available only to the super-user, and
+which is available only to the superuser, and
 .Dv SOCK_RDM ,
 which is planned,
 but not yet implemented, are not described here.
diff --git a/lib/libc/sys/stat.2 b/lib/libc/sys/stat.2
index 2643b3a700f..63e0177af78 100644
--- a/lib/libc/sys/stat.2
+++ b/lib/libc/sys/stat.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stat.2,v 1.11 1999/12/04 22:16:39 aaron Exp $
+.\"	$OpenBSD: stat.2,v 1.12 2000/04/15 11:46:04 aaron Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -100,8 +100,8 @@ struct stat {
     ino_t      st_ino;    /* inode's number */
     mode_t     st_mode;   /* inode protection mode */
     nlink_t    st_nlink;  /* number or hard links to the file */
-    uid_t      st_uid;    /* user-id of owner */
-    gid_t      st_gid;    /* group-id of owner */
+    uid_t      st_uid;    /* user ID of owner */
+    gid_t      st_gid;    /* group ID of owner */
     dev_t      st_rdev;   /* device type, for special file inode */
     struct timespec st_atimespec;  /* time of last access */
     struct timespec st_mtimespec;  /* time of last data modification */
@@ -247,7 +247,7 @@ An I/O error occurred while reading from or writing to the file system.
 .Sh CAVEATS
 The file generation number,
 .Fa st_gen ,
-is only available to the super-user.
+is only available to the superuser.
 .Pp
 The fields in the stat structure currently marked
 .Fa st_spare1 ,
diff --git a/lib/libc/sys/swapctl.2 b/lib/libc/sys/swapctl.2
index da598256174..ccb94d8af50 100644
--- a/lib/libc/sys/swapctl.2
+++ b/lib/libc/sys/swapctl.2
@@ -177,7 +177,7 @@ Search permission is denied for a component of the path prefix.
 .It Bq Er ELOOP
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .It Bq Er EBUSY
 The device specified by
 .Fa arg
diff --git a/lib/libc/sys/swapon.2 b/lib/libc/sys/swapon.2
index 218570bcf84..decae6e2bcb 100644
--- a/lib/libc/sys/swapon.2
+++ b/lib/libc/sys/swapon.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: swapon.2,v 1.7 1999/06/29 14:10:25 aaron Exp $
+.\"	$OpenBSD: swapon.2,v 1.8 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: swapon.2,v 1.7 1995/02/27 12:38:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -78,7 +78,7 @@ Search permission is denied for a component of the path prefix.
 .It Bq Er ELOOP
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EPERM
-The caller is not the super-user.
+The caller is not the superuser.
 .It Bq Er ENOTBLK
 .Fa special
 is not a block device.
diff --git a/lib/libc/sys/truncate.2 b/lib/libc/sys/truncate.2
index 5cee80f4347..5c7128553d0 100644
--- a/lib/libc/sys/truncate.2
+++ b/lib/libc/sys/truncate.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: truncate.2,v 1.6 1999/06/29 14:10:27 aaron Exp $
+.\"	$OpenBSD: truncate.2,v 1.7 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: truncate.2,v 1.7 1995/02/27 12:39:00 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -99,7 +99,7 @@ An I/O error occurred updating the inode.
 points outside the process's allocated address space.
 .It Bq Er EPERM
 The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user.
+the effective user ID is not the superuser.
 .El
 .Pp
 .Fn ftruncate
diff --git a/lib/libc/sys/unlink.2 b/lib/libc/sys/unlink.2
index c3089723f19..c175da13cf9 100644
--- a/lib/libc/sys/unlink.2
+++ b/lib/libc/sys/unlink.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unlink.2,v 1.8 1999/06/29 14:10:28 aaron Exp $
+.\"	$OpenBSD: unlink.2,v 1.9 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: unlink.2,v 1.7 1995/02/27 12:39:13 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -88,7 +88,7 @@ to be removed.
 Too many symbolic links were encountered in translating the pathname.
 .It Bq Er EPERM
 The named file is a directory and the effective user ID
-of the process is not the super-user, or the file system
+of the process is not the superuser, or the file system
 containing the file does not permit the use of
 .Fn unlink
 on a directory.
diff --git a/lib/libc/sys/utimes.2 b/lib/libc/sys/utimes.2
index 16c426e7076..19f1ca9f045 100644
--- a/lib/libc/sys/utimes.2
+++ b/lib/libc/sys/utimes.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utimes.2,v 1.6 1999/06/29 14:10:28 aaron Exp $
+.\"	$OpenBSD: utimes.2,v 1.7 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: utimes.2,v 1.9 1996/04/23 10:34:16 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -60,7 +60,7 @@ is
 .Dv NULL ,
 the access and modification times are set to the current time.
 The caller must be the owner of the file, have permission to
-write the file, or be the super-user.
+write the file, or be the superuser.
 .Pp
 If
 .Fa times
@@ -68,7 +68,7 @@ is non-null,
 it is assumed to point to an array of two timeval structures.
 The access time is set to the value of the first element, and the
 modification time is set to the value of the second element.
-The caller must be the owner of the file or be the super-user.
+The caller must be the owner of the file or be the superuser.
 .Pp
 In either case, the inode-change-time of the file is set to the current
 time.
@@ -88,7 +88,7 @@ or the
 argument is
 .Dv NULL
 and the effective user ID of the process does not
-match the owner of the file, and is not the super-user, and write
+match the owner of the file, and is not the superuser, and write
 access is denied.
 .It Bq Er EFAULT
 .Pa File
@@ -115,7 +115,7 @@ The
 argument is not
 .Dv NULL
 and the calling process's effective user ID
-does not match the owner of the file and is not the super-user.
+does not match the owner of the file and is not the superuser.
 .It Bq Er EROFS
 The file system containing the file is mounted read-only.
 .El
@@ -131,7 +131,7 @@ The
 argument is
 .Dv NULL
 and the effective user ID of the process does not
-match the owner of the file, and is not the super-user, and write
+match the owner of the file, and is not the superuser, and write
 access is denied.
 .It Bq Er EFAULT
 .Fa times
@@ -144,7 +144,7 @@ The
 argument is not
 .Dv NULL
 and the calling process's effective user ID
-does not match the owner of the file and is not the super-user.
+does not match the owner of the file and is not the superuser.
 .It Bq Er EROFS
 The file system containing the file is mounted read-only.
 .El
diff --git a/lib/libc/sys/write.2 b/lib/libc/sys/write.2
index c016f72b654..5503da85413 100644
--- a/lib/libc/sys/write.2
+++ b/lib/libc/sys/write.2
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: write.2,v 1.18 2000/04/12 21:48:02 aaron Exp $
+.\"	$OpenBSD: write.2,v 1.19 2000/04/15 11:46:04 aaron Exp $
 .\"	$NetBSD: write.2,v 1.6 1995/02/27 12:39:43 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -92,7 +92,7 @@ starts at a position
 given by the pointer associated with
 .Fa d
 (see
-.Xr lseek 2 . )
+.Xr lseek 2 ) .
 Upon return from
 .Fn write ,
 the pointer is incremented by the number of bytes which were written.
@@ -101,20 +101,20 @@ Objects that are not capable of seeking always write from the current
 position.  The value of the pointer associated with such an object
 is undefined.
 .Pp
-If the real user is not the super-user, then
+If the real user is not the superuser, then
 .Fn write
-clears the set-user-id bit on a file.
+clears the set-user-ID bit on a file.
 This prevents penetration of system security
 by a user who
 .Dq captures
-a writable set-user-id file
-owned by the super-user.
+a writable set-user-ID file
+owned by the superuser.
 .Pp
 If
 .Fn write
 succeeds it will update the st_ctime and st_mtime fields of the file's
 meta-data (see
-.Xr stat 2 . )
+.Xr stat 2 ) .
 .Pp
 When using non-blocking I/O on objects such as sockets that are subject
 to flow control,
diff --git a/lib/libcompat/4.1/vlimit.3 b/lib/libcompat/4.1/vlimit.3
index 9266d671b77..d18dfb877d0 100644
--- a/lib/libcompat/4.1/vlimit.3
+++ b/lib/libcompat/4.1/vlimit.3
@@ -60,7 +60,7 @@ The resources which are currently controllable are:
 .Bl -tag -width LIM_NORAISE
 .It Dv LIM_NORAISE
 A pseudo-limit; if set non-zero then the limits may not be raised.
-Only the super-user may remove the
+Only the superuser may remove the
 .Em noraise
 restriction.
 .It Dv LIM_CPU
diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index b33799e84c7..6ebb853ccc9 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftpd.8,v 1.28 2000/04/15 02:15:29 aaron Exp $
+.\"	$OpenBSD: ftpd.8,v 1.29 2000/04/15 11:46:05 aaron Exp $
 .\"	$NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -435,10 +435,10 @@ Log file for anonymous downloads.
 .Xr getusershell 3 ,
 .Xr syslogd 8
 .Sh BUGS
-The server must run as the super-user
+The server must run as the superuser
 to create sockets with privileged port numbers.  It maintains
 an effective user ID of the logged in user, reverting to
-the super-user only when binding addresses to sockets.  The
+the superuser only when binding addresses to sockets.  The
 possible security holes have been extensively
 scrutinized, but are possibly incomplete.
 .Sh HISTORY
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index d1035ab47f1..b3e98e55bb1 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: init.8,v 1.26 2000/03/18 22:55:58 aaron Exp $
+.\"	$OpenBSD: init.8,v 1.27 2000/04/15 11:45:57 aaron Exp $
 .\"	$NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -56,7 +56,7 @@ and if this succeeds, begins multi-user operation.
 If the reboot scripts fail,
 .Nm
 commences single-user operation by giving
-the super-user a shell on the console.
+the superuser a shell on the console.
 The
 .Nm
 program may be passed parameters
@@ -81,7 +81,7 @@ file does not contain the
 .Dq secure
 flag, then
 .Nm
-will require that the super-user password be
+will require that the superuser password be
 entered before the system will start a single-user shell.
 The password check is skipped if the
 .Ar console
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 10d83b8920c..28c2c0533ac 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount.8,v 1.20 2000/03/18 22:56:00 aaron Exp $
+.\"	$OpenBSD: mount.8,v 1.21 2000/04/15 11:45:57 aaron Exp $
 .\"	$NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
@@ -155,7 +155,7 @@ Do not allow set-user-identifier or set-group-identifier bits to take effect.
 .It rdonly
 The same as
 .Fl r ;
-mount the file system read-only (even the super-user may not write it).
+mount the file system read-only (even the superuser may not write it).
 .It sync
 All
 .Tn I/O
@@ -195,7 +195,7 @@ to execute the equivalent of:
 .Ed
 .It Fl r
 The file system is to be mounted read-only.
-Mount the file system read-only (even the super-user may not write it).
+Mount the file system read-only (even the superuser may not write it).
 The same as the
 .Dq rdonly
 argument to the
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 06c5d6aa839..4f02552a28a 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping.8,v 1.21 2000/03/23 09:08:13 hugh Exp $
+.\"	$OpenBSD: ping.8,v 1.22 2000/04/15 11:45:58 aaron Exp $
 .\"	$NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -102,7 +102,7 @@ is printed, while for every
 .Tn ECHO_REPLY
 received a backspace is printed.
 This provides a rapid display of how many packets are being dropped.
-Only the super-user may use this option.
+Only the superuser may use this option.
 .Bf -emphasis
 This can be very hard on a network and should be used with caution.
 .Ef
@@ -114,7 +114,7 @@ Wait
 .Ar wait
 seconds between sending each packet.
 The default is to wait for one second between each packet.
-The wait time may be fractional, but only the super-user may specify
+The wait time may be fractional, but only the superuser may specify
 a value less than one second.
 This option is incompatible with the
 .Fl f
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 8b4dd9966f8..ff1befc056f 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ping6.8,v 1.8 2000/04/12 21:47:59 aaron Exp $
+.\"	$OpenBSD: ping6.8,v 1.9 2000/04/15 11:45:58 aaron Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -129,7 +129,7 @@ is printed, while for every
 .Tn ECHO_REPLY
 received a backspace is printed.
 This provides a rapid display of how many packets are being dropped.
-Only the super-user may use this option.
+Only the superuser may use this option.
 .Bf -emphasis
 This can be very hard on a network and should be used with caution.
 .Ef
@@ -144,7 +144,7 @@ Wait
 .Ar wait
 seconds between sending each packet.
 The default is to wait for one second between each packet.
-The wait time may be fractional, but only the super-user may specify
+The wait time may be fractional, but only the superuser may specify
 a value less than one second.
 This option is incompatible with the
 .Fl f
@@ -156,7 +156,7 @@ is specified,
 .Nm ping
 sends that many packets as fast as possible before falling into its normal
 mode of behavior.
-Only the super-user may use this option.
+Only the superuser may use this option.
 .It Fl n
 Numeric output only.
 No attempt will be made to lookup symbolic names for host addresses.
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index e67c6a7aee7..550e67483d7 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: route.8,v 1.23 2000/04/15 02:15:17 aaron Exp $
+.\"	$OpenBSD: route.8,v 1.24 2000/04/15 11:45:58 aaron Exp $
 .\"	$NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -303,7 +303,7 @@ RTM_DELETE,
 RTM_GET,
 and
 RTM_CHANGE.
-As such, only the super-user may modify
+As such, only the superuser may modify
 the routing tables.
 .Sh DIAGNOSTICS
 .Bl -tag -width Ds
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 707983ad42a..d98667ad9b6 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shutdown.8,v 1.18 2000/04/12 21:48:00 aaron Exp $
+.\"	$OpenBSD: shutdown.8,v 1.19 2000/04/15 11:45:58 aaron Exp $
 .\"	$NetBSD: shutdown.8,v 1.6 1995/03/18 15:01:07 cgd Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
@@ -48,7 +48,7 @@
 .Op Ar warning-message ...
 .Sh DESCRIPTION
 .Nm
-provides an automated shutdown procedure for super-users
+provides an automated shutdown procedure for superusers
 to nicely notify users when the system is shutting down,
 saving them from system administrators, hackers, and gurus, who
 would otherwise not bother with such niceties.
@@ -78,7 +78,7 @@ The
 .Fl k
 option
 does not actually halt the system, but leaves the
-system multi-user with logins disabled (for all but super-user).
+system multi-user with logins disabled (for all but superuser).
 .It Fl n
 Prevent the normal
 .Xr sync 2
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index 5df718c1a60..38bdd581d91 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: slattach.8,v 1.10 2000/03/18 22:56:05 aaron Exp $
+.\"	$OpenBSD: slattach.8,v 1.11 2000/04/15 11:45:58 aaron Exp $
 .\"	$NetBSD: slattach.8,v 1.12 1995/03/18 15:01:12 cgd Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -90,7 +90,7 @@ compression of outgoing packets.
 Don't auto-enable compression.
 .El
 .Pp
-Only the super-user may attach a network interface.
+Only the superuser may attach a network interface.
 .Pp
 To detach the interface, use
 .Dq Li ifconfig interface-name down
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 605fab6af7a..82713bf1c4f 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ddb.4,v 1.17 1999/09/21 22:30:08 d Exp $
+.\"	$OpenBSD: ddb.4,v 1.18 2000/04/15 11:45:51 aaron Exp $
 .\"	$NetBSD: ddb.4,v 1.5 1994/11/30 16:22:09 jtc Exp $
 .\"
 .\" Mach Operating System
@@ -93,7 +93,7 @@ to be the same.
 An expression can be used in place of
 .Ar address
 (see
-.Sx EXPRESSIONS . )
+.Sx EXPRESSIONS ) .
 Omitting
 .Ar address
 in a command uses the last value of
diff --git a/share/man/man4/ns.4 b/share/man/man4/ns.4
index 6845eafd70f..714aeb1f85b 100644
--- a/share/man/man4/ns.4
+++ b/share/man/man4/ns.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ns.4,v 1.7 2000/02/19 14:41:11 deraadt Exp $
+.\"	$OpenBSD: ns.4,v 1.8 2000/04/15 11:45:51 aaron Exp $
 .\"	$NetBSD: ns.4,v 1.3 1994/11/30 16:22:26 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -124,7 +124,7 @@ call is restricted to be greater than
 (=3000, in
 .Aq Pa netns/ns.h )
 unless the creating process is running
-as the super-user, providing a space of protected port numbers.
+as the superuser, providing a space of protected port numbers.
 .Sh PROTOCOLS
 The
 .Tn NS
diff --git a/share/man/man4/nsip.4 b/share/man/man4/nsip.4
index ca886d0ade5..168ae643abe 100644
--- a/share/man/man4/nsip.4
+++ b/share/man/man4/nsip.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nsip.4,v 1.5 1999/07/09 13:35:47 aaron Exp $
+.\"	$OpenBSD: nsip.4,v 1.6 2000/04/15 11:45:51 aaron Exp $
 .\"	$NetBSD: nsip.4,v 1.3 1994/11/30 16:22:27 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -59,7 +59,7 @@ through the
 .Tn IP
 machinery.
 .Pp
-The super-user can advise the operating system of a willing partner
+The superuser can advise the operating system of a willing partner
 by naming an
 .Tn IP
 address to be associated with an
diff --git a/share/man/man4/tun.4 b/share/man/man4/tun.4
index 236ce089116..9ef07853875 100644
--- a/share/man/man4/tun.4
+++ b/share/man/man4/tun.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tun.4,v 1.12 1999/12/16 06:45:31 deraadt Exp $
+.\"	$OpenBSD: tun.4,v 1.13 2000/04/15 11:45:51 aaron Exp $
 .Dd March 10, 1996
 .Dt TUN 4
 .Os
@@ -63,7 +63,7 @@ There are two control interfaces.  The
 interface, normally
 .Pa /dev/tun Ns Sy N ,
 is exclusive-open (it cannot be opened if it is already open), is
-normally restricted to the super-user, and can
+normally restricted to the superuser, and can
 .Dq transmit
 and
 .Dq receive
@@ -94,7 +94,7 @@ packets, and perform control functions.  As mentioned above, this
 interface is exclusive-open; if the
 .Dv SUONLY
 bit is set (which it is by default), it cannot be opened at all except
-by the super-user.  By default, a
+by the superuser.  By default, a
 .Fn read
 call will return an error
 .Pf ( Er EHOSTDOWN )
@@ -199,7 +199,7 @@ error occurs.
 .\" X .It Dv TUN_BRDADDR Ta RO Ta "Broadcast address has been set."
 .\" X .It Dv TUN_PREPADDR Ta RW Ta "Prepend sent-to address for reads."
 .\" X .It Dv TUN_STAYUP Ta RW Ta "Don't take interface down on close."
-.\" X .It Dv TUN_SUONLY Ta RW Ta "Data control device is super-user only."
+.\" X .It Dv TUN_SUONLY Ta RW Ta "Data control device is superuser only."
 .\" X .It Dv TUN_RRWAIT Ta RW Ta "Wait for ready when reading."
 .\" X .El
 .\" X .It Dv TUNGFLAG
diff --git a/share/man/man5/acct.5 b/share/man/man5/acct.5
index f4858861d6e..35d93e43ea3 100644
--- a/share/man/man5/acct.5
+++ b/share/man/man5/acct.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: acct.5,v 1.6 2000/03/19 19:25:26 aaron Exp $
+.\"	$OpenBSD: acct.5,v 1.7 2000/04/15 11:45:52 aaron Exp $
 .\"	$NetBSD: acct.5,v 1.4 1995/10/22 01:40:10 ghudson Exp $
 .\"
 .\" Copyright (c) 1991, 1993
@@ -71,7 +71,7 @@ struct acct {
 	comp_t	ac_io;		/* count of IO blocks */
 	dev_t	ac_tty;		/* controlling tty */
 #define	AFORK	0x01		/* forked but not exec'ed */
-#define	ASU	0x02		/* used super-user permissions */
+#define	ASU	0x02		/* used superuser permissions */
 #define	ACOMPAT	0x04		/* used compatibility mode */
 #define	ACORE	0x08		/* dumped core */
 #define	AXSIG	0x10		/* killed by a signal */
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 53b26a7d6a8..02988a15658 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hier.7,v 1.16 2000/01/04 23:59:36 itojun Exp $
+.\"	$OpenBSD: hier.7,v 1.17 2000/04/15 11:45:52 aaron Exp $
 .\"	$NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -107,7 +107,7 @@ Default location for user home directories.
 Empty directory commonly used by
 system administrators as a temporary mount point.
 .It Li /root/
-Default home directory for the super-user.
+Default home directory for the superuser.
 .It Li /sbin/
 System programs and administration utilities
 fundamental to both single and multi-user environments.
diff --git a/share/man/man8/makedev.8 b/share/man/man8/makedev.8
index cba183047a9..20182321858 100644
--- a/share/man/man8/makedev.8
+++ b/share/man/man8/makedev.8
@@ -94,7 +94,7 @@ in this file.
 .Pp
 Since all devices are created using
 .Xr mknod 8 ,
-this shell script is useful only to the super-user.
+this shell script is useful only to the superuser.
 .Sh DIAGNOSTICS
 Either self-explanatory, or generated by one of the programs
 called from the script.  Use
diff --git a/share/man/man8/sticky.8 b/share/man/man8/sticky.8
index ae8152bc55c..1bdefd657ed 100644
--- a/share/man/man8/sticky.8
+++ b/share/man/man8/sticky.8
@@ -68,7 +68,7 @@ options of
 the loader
 .Xr ld 1 .
 .Pp
-Only the super-user can set the sticky bit
+Only the superuser can set the sticky bit
 on a sharable executable file.
 .Sh STICKY DIRECTORIES
 A directory whose `sticky bit' is set
@@ -77,7 +77,7 @@ a directory in which the deletion of files is restricted.
 A file in a sticky directory may only be removed or renamed
 by a user if the user has write permission for the directory and
 the user is the owner of the file, the owner of the directory,
-or the super-user.
+or the superuser.
 This feature is usefully applied to directories such as
 .Pa /tmp
 which must be publicly writable but
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 1d2ea58bde3..08b7c1ced32 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ar.1,v 1.8 2000/04/15 02:15:11 aaron Exp $
+.\"	$OpenBSD: ar.1,v 1.9 2000/04/15 11:45:54 aaron Exp $
 .\"	$NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -168,7 +168,7 @@ to the end of the archive.
 Set the access and modification times of extracted files to the
 modification time of the file when it was entered into the archive.
 This will fail if the user is not the owner of the extracted file
-or the super-user.
+or the superuser.
 .It Fl p
 Write the contents of the specified archive files to the standard output.
 If no files are specified, the contents of all the files in the archive
@@ -292,7 +292,7 @@ The file access and modification times are the time of the extraction
 option).
 The file permissions will be set to those of the file when it was entered
 into the archive; this will fail if the user is not the owner of the
-extracted file or the super-user.
+extracted file or the superuser.
 .El
 .Pp
 The
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 2ecad206b7b..7114042f674 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: calendar.1,v 1.13 2000/03/23 21:39:53 aaron Exp $
+.\"	$OpenBSD: calendar.1,v 1.14 2000/04/15 11:45:54 aaron Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
 .\"     The Regents of the University of California.  All rights reserved.
@@ -64,7 +64,7 @@ Process the
 .Dq calendar
 files of all users and mail the results
 to them.
-This requires super-user privileges.
+This requires superuser privileges.
 .It Fl A Ar num
 Print lines from today and next
 .Ar num
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index d334c1c8945..baf0e3c387e 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chflags.1,v 1.10 2000/03/05 20:09:20 aaron Exp $
+.\"	$OpenBSD: chflags.1,v 1.11 2000/04/15 11:45:54 aaron Exp $
 .\"	$NetBSD: chflags.1,v 1.4 1995/08/31 22:50:22 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
@@ -88,12 +88,12 @@ Flags are a comma separated list of keywords.
 The following keywords are currently defined:
 .Bd -literal -offset indent compact
 arch	set the archived flag
-opaque	set the opaque flag (owner or super-user only)
-nodump	set the nodump flag (owner or super-user only)
-sappnd	set the system append-only flag (super-user only)
-schg	set the system immutable flag (super-user only)
-uappnd	set the user append-only flag (owner or super-user only)
-uchg	set the user immutable flag (owner or super-user only)
+opaque	set the opaque flag (owner or superuser only)
+nodump	set the nodump flag (owner or superuser only)
+sappnd	set the system append-only flag (superuser only)
+schg	set the system immutable flag (superuser only)
+uappnd	set the user append-only flag (owner or superuser only)
+uchg	set the user immutable flag (owner or superuser only)
 .Ed
 .Pp
 An immutable file may not be changed, moved, or deleted.
@@ -136,7 +136,7 @@ option is specified.
 In addition, these options override each other and the
 command's actions are determined by the last one specified.
 .Pp
-Only the super-user can change the user flags on block and
+Only the superuser can change the user flags on block and
 character devices.
 .Pp
 You can use
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index b684b11a329..26e8035cf22 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chpass.1,v 1.17 2000/03/23 21:10:13 aaron Exp $
+.\"	$OpenBSD: chpass.1,v 1.18 2000/04/15 11:45:55 aaron Exp $
 .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
 .\"
 .\" Copyright (c) 1988, 1990, 1993
@@ -70,7 +70,7 @@ are synonyms for
 The options are as follows:
 .Bl -tag -width Ds
 .It Fl a Ar list
-The super-user is allowed to directly supply a user database
+The superuser is allowed to directly supply a user database
 entry, in the format specified by
 .Xr passwd 5 ,
 as an argument.
@@ -194,7 +194,7 @@ If the
 field is empty, the Bourne shell
 .Pq Pa /bin/sh
 is assumed.
-When altering a login shell, and not the super-user, the user
+When altering a login shell, and not the superuser, the user
 may not change from a non-standard shell or to a non-standard
 shell.
 Non-standard is defined as a shell not found in
@@ -222,7 +222,7 @@ is set to
 an alternate editor.
 When the editor terminates, the information is re-read and used to
 update the user database itself.
-Only the user, or the super-user, may edit the information associated
+Only the user, or the superuser, may edit the information associated
 with the user.
 .Sh FILES
 .Bl -tag -width /var/tmp/pw.XXXXXXXX -compact
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 969fae0dd15..36955858aab 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: nice.1,v 1.7 2000/03/10 19:07:22 aaron Exp $
+.\"	$OpenBSD: nice.1,v 1.8 2000/04/15 11:45:55 aaron Exp $
 .\"	$NetBSD: nice.1,v 1.6 1995/08/31 23:30:57 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -54,7 +54,7 @@ If an
 .Ar increment
 is given, it is used; otherwise
 an increment of 10 is assumed.
-The super-user can run utilities with priorities higher than normal by using
+The superuser can run utilities with priorities higher than normal by using
 a negative
 .Ar increment .
 The priority can be adjusted over a
@@ -118,4 +118,4 @@ The form
 nices to positive nice, and
 .Ql nice \-10
 can be used
-by the super-user to give a process more of the processor.
+by the superuser to give a process more of the processor.
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index ab704505158..0c585e6900c 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: passwd.1,v 1.10 2000/03/28 23:44:40 deraadt Exp $
+.\"	$OpenBSD: passwd.1,v 1.11 2000/04/15 11:45:55 aaron Exp $
 .\"
 .\" Copyright (c) 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -126,7 +126,7 @@ run
 .Xr kinit 1
 followed by
 .Xr passwd 1 .
-The super-user is not required to provide a user's current password
+The superuser is not required to provide a user's current password
 if only the local password is modified.
 .Pp
 Which type of cipher is used to encrypt the password information
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index dcdb6276eed..635648ede2c 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: quota.1,v 1.10 2000/03/10 20:17:49 aaron Exp $
+.\"	$OpenBSD: quota.1,v 1.11 2000/04/15 11:45:55 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -85,12 +85,12 @@ and
 displays both the user quotas and the group quotas (for
 the user).
 .Pp
-Only the super-user may use the
+Only the superuser may use the
 .Fl u
 flag and the optional
 .Ar user
 argument to view the limits of other users.
-Non-super-users can use the
+Non-superusers can use the
 .Fl g
 flag and optional
 .Ar group
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 9a8ce764511..699011b1482 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: renice.8,v 1.10 2000/03/10 20:17:50 aaron Exp $
+.\"	$OpenBSD: renice.8,v 1.11 2000/04/15 11:45:55 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -56,8 +56,7 @@
 .Oc
 .Sh DESCRIPTION
 .Nm
-alters the
-scheduling
+alters the scheduling
 .Ar priority
 (an integer) of one or more running processes.
 The following
@@ -97,7 +96,7 @@ renice +1 987 -u daemon root -p 32
 would change the priority of process IDs 987 and 32, and
 all processes owned by users daemon and root.
 .Pp
-Users other than the super-user may only alter the priority of
+Users other than the superuser may only alter the priority of
 processes they own,
 and can only monotonically increase their
 .Dq nice value
@@ -105,7 +104,7 @@ within the range 0 to
 .Dv PRIO_MAX
 (20).
 (This prevents overriding administrative fiats.)
-The super-user
+The superuser
 may alter the priority of any process
 and set the priority to any value in the range
 .Dv PRIO_MIN
@@ -129,7 +128,7 @@ for mapping user names to user IDs
 .Xr getpriority 2 ,
 .Xr setpriority 2
 .Sh BUGS
-Non-super-users cannot increase scheduling priorities of their own processes,
+Non-superusers cannot increase scheduling priorities of their own processes,
 even if they were the ones that decreased the priorities in the first place.
 .Sh HISTORY
 The
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 61942a10434..81f326c14df 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpcinfo.8,v 1.5 2000/03/10 20:17:50 aaron Exp $
+.\"	$OpenBSD: rpcinfo.8,v 1.6 2000/04/15 11:45:56 aaron Exp $
 .\"	from: @(#)rpcinfo.8c	2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
 .\"
 .Dd December 17, 1987
@@ -92,7 +92,7 @@ service of the specified
 .Ar program
 and
 .Ar version .
-This option can be exercised only by the super-user.
+This option can be exercised only by the superuser.
 .El
 .Pp
 The
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 12963a0b863..3951653a55c 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnet.1,v 1.24 2000/04/15 02:15:13 aaron Exp $
+.\"	$OpenBSD: telnet.1,v 1.25 2000/04/15 11:45:56 aaron Exp $
 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -1351,7 +1351,7 @@ only sends carriage return, but never line feeds.
 The initial value for this toggle is
 .Dv FALSE .
 .It Ic debug
-Toggles socket level debugging (useful only to the super-user).
+Toggles socket level debugging (useful only to the superuser).
 The initial value for this toggle is
 .Dv FALSE .
 .It Ic encdebug
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index 8975da8b2c5..52343b55ed0 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tn3270.1,v 1.8 2000/03/11 21:40:05 aaron Exp $
+.\"	$OpenBSD: tn3270.1,v 1.9 2000/04/15 11:45:57 aaron Exp $
 .\"
 .\" Copyright (c) 1986, 1990 The Regents of the University of California.
 .\" All rights reserved.
@@ -79,7 +79,7 @@ raw 3270 control streams.
 The options are as follows:
 .Bl -tag -width Fl
 .It Fl d
-Turn on socket-level tracing (for super-user only).
+Turn on socket-level tracing (for superuser only).
 .It Fl n Ns Ar filename
 Specify a file to receive network trace data
 output (from commands
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 602ac8b09db..ab991896331 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: wall.1,v 1.6 2000/03/14 14:58:25 aaron Exp $
+.\"	$OpenBSD: wall.1,v 1.7 2000/04/15 11:45:57 aaron Exp $
 .\"	$NetBSD: wall.1,v 1.3 1994/11/17 07:17:57 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -51,7 +51,7 @@ displays the contents of
 or, by default, its standard input, on the terminals of all
 currently logged in users.
 .Pp
-Only the super-user can write on the
+Only the superuser can write on the
 terminals of users who have chosen
 to deny messages or are using a program which
 automatically denies messages.
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8
index 3ff9027159c..223fa5c11b1 100644
--- a/usr.sbin/arp/arp.8
+++ b/usr.sbin/arp/arp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: arp.8,v 1.9 2000/04/12 21:47:52 aaron Exp $
+.\"	$OpenBSD: arp.8,v 1.10 2000/04/15 11:45:59 aaron Exp $
 .\"	$NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $
 .\"
 .\" Copyright (c) 1985, 1991, 1993
@@ -75,7 +75,7 @@ The program displays all of the current
 .Tn ARP
 entries.
 .It Fl d
-A super-user may delete an entry for the host called
+A superuser may delete an entry for the host called
 .Ar hostname
 with the
 .Fl d
diff --git a/usr.sbin/chown/chgrp.1 b/usr.sbin/chown/chgrp.1
index f3a86724c5c..ad880761130 100644
--- a/usr.sbin/chown/chgrp.1
+++ b/usr.sbin/chown/chgrp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chgrp.1,v 1.5 2000/03/19 17:57:02 aaron Exp $
+.\"	$OpenBSD: chgrp.1,v 1.6 2000/04/15 11:45:59 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -107,7 +107,7 @@ group name.
 The user invoking
 .Nm chgrp
 must belong to the specified group and be the owner of the file,
-or be the super-user.
+or be the superuser.
 .Pp
 The
 .Nm chgrp
diff --git a/usr.sbin/chown/chown.8 b/usr.sbin/chown/chown.8
index e2c985bbf63..20d4a7e7446 100644
--- a/usr.sbin/chown/chown.8
+++ b/usr.sbin/chown/chown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chown.8,v 1.5 2000/03/19 17:57:02 aaron Exp $
+.\"	$OpenBSD: chown.8,v 1.6 2000/04/15 11:45:59 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -125,7 +125,7 @@ may be either a numeric group ID or a group name.
 If a group name is also a numeric group ID, the operand is used as a
 group name.
 .Pp
-The ownership of a file may only be altered by a super-user for
+The ownership of a file may only be altered by a superuser for
 obvious security reasons.
 .Pp
 The
diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8
index 2a7db52218e..95a72b94b31 100644
--- a/usr.sbin/edquota/edquota.8
+++ b/usr.sbin/edquota/edquota.8
@@ -1,3 +1,5 @@
+.\"	$OpenBSD: edquota.8,v 1.5 2000/04/15 11:45:59 aaron Exp $
+.\"
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -33,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)edquota.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: edquota.8,v 1.4 1999/06/05 22:16:46 aaron Exp $
+.\"	$Id: edquota.8,v 1.5 2000/04/15 11:45:59 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt EDQUOTA 8
@@ -151,7 +153,7 @@ grace period should be imposed.
 Setting a grace period to one second indicates that no
 grace period should be granted.
 .Pp
-Only the super-user may edit quotas.
+Only the superuser may edit quotas.
 .Sh FILES
 .Bl -tag -width quota.group -compact
 .It Pa quota.user
diff --git a/usr.sbin/lpr/lpc/lpc.8 b/usr.sbin/lpr/lpc/lpc.8
index ad9f714a552..74754f3d334 100644
--- a/usr.sbin/lpr/lpc/lpc.8
+++ b/usr.sbin/lpr/lpc/lpc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lpc.8,v 1.8 2000/03/19 17:57:06 aaron Exp $
+.\"	$OpenBSD: lpc.8,v 1.9 2000/04/15 11:45:59 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -130,7 +130,7 @@ This is useful when some abnormal condition causes the daemon to
 die unexpectedly, leaving jobs in the queue.
 .Xr Lpq
 will report that there is no daemon present when this condition occurs.
-If the user is the super-user,
+If the user is the superuser,
 try to abort the current daemon first (i.e., kill and restart a stuck daemon).
 .Pp
 .It Ic start  No {\ all\ |\ printer\ }
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.1 b/usr.sbin/mopd/mopa.out/mopa.out.1
index 6827b74a2c7..5a0ac91e2f3 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.1
+++ b/usr.sbin/mopd/mopa.out/mopa.out.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopa.out.1,v 1.7 2000/03/23 21:39:57 aaron Exp $
+.\"	$OpenBSD: mopa.out.1,v 1.8 2000/04/15 11:46:00 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: mopa.out.1,v 1.7 2000/03/23 21:39:57 aaron Exp $
+.\" @(#) $OpenBSD: mopa.out.1,v 1.8 2000/04/15 11:46:00 aaron Exp $
 .\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
@@ -45,12 +45,12 @@ is used to convert an a.out file to a MOP-image.
 .Pp
 This program will check if
 .Xr a.out 5
-machine-id is recognized.
+machine ID is recognized.
 If not it will try to swap the
 .Xr a.out 5
 header, and try again.
 .Sh BUGS
-This program just supports the VAX machine-id for now.
+This program just supports the VAX machine ID for now.
 .Sh SEE ALSO
 .Xr mopchk 1 ,
 .Xr mopprobe 1 ,
diff --git a/usr.sbin/pppd/pppd.8 b/usr.sbin/pppd/pppd.8
index 69119bbbd53..eb33f20571d 100644
--- a/usr.sbin/pppd/pppd.8
+++ b/usr.sbin/pppd/pppd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pppd.8,v 1.20 2000/03/14 21:31:38 aaron Exp $
+.\" $OpenBSD: pppd.8,v 1.21 2000/04/15 11:46:00 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
@@ -964,7 +964,7 @@ Pppd invokes scripts at various stages in its processing which can be
 used to perform site-specific ancillary processing.  These scripts are
 usually shell scripts, but could be executable code files instead.
 Pppd does not wait for the scripts to finish.  The scripts are
-executed as root (with the real and effective user-id set to 0), so
+executed as root (with the real and effective user ID set to 0), so
 that they can do things such as update routing tables or run
 privileged daemons.  Be careful that the contents of these scripts do
 not compromise your system's security.  Pppd runs the scripts with
@@ -995,7 +995,7 @@ authenticates itself.
 The baud rate of the tty device.
 .TP
 .B UID
-The real user-id of the user who invoked pppd.
+The real user ID of the user who invoked pppd.
 .P
 Pppd invokes the following scripts, if they exist.  It is not an error
 if they don't exist.
diff --git a/usr.sbin/repquota/repquota.8 b/usr.sbin/repquota/repquota.8
index 109fec1929e..f7621c21048 100644
--- a/usr.sbin/repquota/repquota.8
+++ b/usr.sbin/repquota/repquota.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: repquota.8,v 1.4 2000/03/19 17:57:13 aaron Exp $
+.\"	$OpenBSD: repquota.8,v 1.5 2000/04/15 11:46:00 aaron Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)repquota.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: repquota.8,v 1.4 2000/03/19 17:57:13 aaron Exp $
+.\"	$Id: repquota.8,v 1.5 2000/04/15 11:46:00 aaron Exp $
 .\"
 .Dd June 6, 1993
 .Dt REPQUOTA 8
@@ -79,7 +79,7 @@ number files and amount of space (in kilobytes) is
 printed, along with any quotas created with
 .Xr edquota 8 .
 .Pp
-Only members of the operator group or the super-user may
+Only members of the operator group or the superuser may
 use this command.
 .Sh FILES
 .Bl -tag -width quota.group -compact
diff --git a/usr.sbin/rpc.pcnfsd/pcnfsd.8 b/usr.sbin/rpc.pcnfsd/pcnfsd.8
index ff5d643097c..cd96c6c7f2d 100644
--- a/usr.sbin/rpc.pcnfsd/pcnfsd.8
+++ b/usr.sbin/rpc.pcnfsd/pcnfsd.8
@@ -103,7 +103,7 @@ request.
 handles this, and most other print-related requests, by
 constructing a command based on the printing services of
 the server operating system and executing the command using the
-identity of the PC user. Since this involves set-user-id privileges,
+identity of the PC user. Since this involves set-user-ID privileges,
 .B pcnfsd
 must be run as root.
 .LP
diff --git a/usr.sbin/ssio/reset_scanner.1 b/usr.sbin/ssio/reset_scanner.1
index afa873b7f05..36db4051f08 100644
--- a/usr.sbin/ssio/reset_scanner.1
+++ b/usr.sbin/ssio/reset_scanner.1
@@ -1,4 +1,4 @@
-.\" $Id: reset_scanner.1,v 1.1 1997/03/11 03:23:14 kstailey Exp $
+.\" $Id: reset_scanner.1,v 1.2 2000/04/15 11:46:01 aaron Exp $
 .\" PINT Pint Is Not TWAIN - common scanner driver interface for UN*X
 .\" Copyright (C) 1994 Kenneth Stailey kstailey@leidecker.gsfc.nasa.gov
 .\"
@@ -25,7 +25,7 @@ reset-scanner - clear error conditions on the scanner
 .SH DESCRIPTION
 If the scanner gets stuck and the error lights go on and you wish that
 you could push the reset button on it but there isn't one, run this (as
-the super-user) instead and it will send a Bus Device Reset (BDR) to the
+the superuser) instead and it will send a Bus Device Reset (BDR) to the
 scanner.
 .SH AUTHOR
 .nf