- For consistency, `super-user' -> `superuser' in all cases.

- Some punctuation fixes.
- Some `id' -> `ID'.

7 files changed, 20 insertions, 20 deletions

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