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

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

12 files changed, 38 insertions, 39 deletions

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.