From: aaron <aaron@openbsd.org>
Date: Sat, 4 Mar 2000 22:19:22 +0000 (+0000)
Subject: In Unix land we prefer "whitespace" to "white space" or "white-space". At
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3f78588edacf4583d6405f016b29d85dcaf084c5;p=openbsd

In Unix land we prefer "whitespace" to "white space" or "white-space". At
least, this is the impression I get from looking at a lot of Perl docs.
---

diff --git a/lib/libc/gen/getcap.3 b/lib/libc/gen/getcap.3
index 4c9fbf99cb2..8bf8754eef0 100644
--- a/lib/libc/gen/getcap.3
+++ b/lib/libc/gen/getcap.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getcap.3,v 1.16 1999/07/09 13:35:16 aaron Exp $
+.\"	$OpenBSD: getcap.3,v 1.17 2000/03/04 22:19:30 aaron Exp $
 .\"
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -272,7 +272,7 @@ lines by ending each line except the last with a
 Capability databases consist of a series of records, one per logical
 line.  Each record contains a variable number of
 colon-separated fields
-(capabilities).  Empty fields consisting entirely of white space
+(capabilities).  Empty fields consisting entirely of whitespace
 characters (spaces and tabs) are ignored.
 .Pp
 The first capability of each record specifies its names, separated by
diff --git a/lib/libc/gen/isspace.3 b/lib/libc/gen/isspace.3
index d80ea80dbab..5ce6692cc81 100644
--- a/lib/libc/gen/isspace.3
+++ b/lib/libc/gen/isspace.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: isspace.3,v 1.6 1999/07/09 13:35:18 aaron Exp $
+.\"	$OpenBSD: isspace.3,v 1.7 2000/03/04 22:19:31 aaron Exp $
 .\"
 .\" Copyright (c) 1991 The Regents of the University of California.
 .\" All rights reserved.
@@ -40,7 +40,7 @@
 .Os
 .Sh NAME
 .Nm isspace
-.Nd white-space character test
+.Nd whitespace character test
 .Sh SYNOPSIS
 .Fd #include <ctype.h>
 .Ft int
@@ -48,13 +48,13 @@
 .Sh DESCRIPTION
 The
 .Fn isspace
-function tests for the standard white-space characters
+function tests for the standard whitespace characters
 .\" or for any
 .\" of an implementation-defined set of characters
 for which
 .Xr isalnum 3
 is false.
-The standard white-space characters are the following:
+The standard whitespace characters are the following:
 .Pp
 .Bl -tag -width xxxxx -offset indent -compact
 .It Sq \0
@@ -73,7 +73,7 @@ And vertical tab.
 .Pp
 In the C locale,
 .Fn isspace
-returns true only for the standard white-space characters.
+returns true only for the standard whitespace characters.
 .Sh RETURN VALUES
 The
 .Fn isspace
diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3
index e316a158c1a..e4603b2e4cf 100644
--- a/lib/libc/stdio/scanf.3
+++ b/lib/libc/stdio/scanf.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scanf.3,v 1.4 1999/07/02 20:58:00 aaron Exp $
+.\"	$OpenBSD: scanf.3,v 1.5 2000/03/04 22:19:31 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -120,7 +120,7 @@ string
 may also contain other characters.
 White space (such as blanks, tabs, or newlines) in the
 .Fa format
-string match any amount of white space, including none, in the input.
+string match any amount of whitespace, including none, in the input.
 Everything else
 matches only itself.
 Scanning stops
@@ -190,8 +190,8 @@ a default of `infinity' is used (with one exception, below);
 otherwise at most this many characters are scanned
 in processing the conversion.
 Before conversion begins,
-most conversions skip white space;
-this white space is not counted against the field width.
+most conversions skip whitespace;
+this whitespace is not counted against the field width.
 .Pp
 The following conversions are available:
 .Bl -tag -width XXXX
@@ -257,14 +257,14 @@ Equivalent to
 Equivalent to
 .Cm f .
 .It Cm s
-Matches a sequence of non-white-space characters;
+Matches a sequence of non-whitespace characters;
 the next pointer must be a pointer to
 .Em char ,
 and the array must be large enough to accept all the sequence and the
 terminating
 .Dv NUL
 character.
-The input string stops at white space
+The input string stops at whitespace
 or at the maximum field width, whichever occurs first.
 .It Cm c
 Matches a sequence of
@@ -277,8 +277,8 @@ and there must be enough room for all the characters
 (no terminating
 .Dv NUL
 is added).
-The usual skip of leading white space is suppressed.
-To skip white space first, use an explicit space in the format.
+The usual skip of leading whitespace is suppressed.
+To skip whitespace first, use an explicit space in the format.
 .It Cm \&[
 Matches a nonempty sequence of characters from the specified set
 of accepted characters;
@@ -288,7 +288,7 @@ and there must be enough room for all the characters in the string,
 plus a terminating
 .Dv NUL
 character.
-The usual skip of leading white space is suppressed.
+The usual skip of leading whitespace is suppressed.
 The string is to be made up of characters in
 (or not in)
 a particular set;
diff --git a/lib/libc/stdlib/getopt.3 b/lib/libc/stdlib/getopt.3
index c83cede88b6..637a81f1f0f 100644
--- a/lib/libc/stdlib/getopt.3
+++ b/lib/libc/stdlib/getopt.3
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: getopt.3,v 1.11 2000/01/25 23:28:55 deraadt Exp $
+.\"	$OpenBSD: getopt.3,v 1.12 2000/03/04 22:19:31 aaron Exp $
 .\"
 .Dd April 19, 1994
 .Dt GETOPT 3
@@ -74,7 +74,7 @@ recognizes an option and argument
 .Dq Fl x Ar argument .
 It does not matter to
 .Fn getopt
-if a following argument has leading white space.
+if a following argument has leading whitespace.
 .Pp
 On return from
 .Fn getopt ,
diff --git a/lib/libc/stdlib/strtod.3 b/lib/libc/stdlib/strtod.3
index ef618039107..143fea34dca 100644
--- a/lib/libc/stdlib/strtod.3
+++ b/lib/libc/stdlib/strtod.3
@@ -33,7 +33,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strtod.3,v 1.5 2000/01/22 12:05:49 aaron Exp $
+.\"	$OpenBSD: strtod.3,v 1.6 2000/03/04 22:19:31 aaron Exp $
 .\"
 .Dd June 29, 1991
 .Dt STRTOD 3
@@ -63,7 +63,7 @@ a decimal-point character, optionally followed by an exponent.
 An exponent consists of an ``E'' or ``e'', followed by an optional plus
 or minus sign, followed by a sequence of digits.
 .Pp
-Leading white-space characters in the string (as defined by the
+Leading whitespace characters in the string (as defined by the
 .Xr isspace 3
 function) are skipped.
 .Sh RETURN VALUES
diff --git a/lib/libc/stdlib/strtol.3 b/lib/libc/stdlib/strtol.3
index 3e0d5e67c7c..df696b7b859 100644
--- a/lib/libc/stdlib/strtol.3
+++ b/lib/libc/stdlib/strtol.3
@@ -33,7 +33,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strtol.3,v 1.6 1999/09/14 03:59:55 pjanzen Exp $
+.\"	$OpenBSD: strtol.3,v 1.7 2000/03/04 22:19:31 aaron Exp $
 .\"
 .Dd June 25, 1992
 .Dt STRTOL 3
@@ -74,7 +74,7 @@ The conversion is done according to the given
 which must be a number between 2 and 36 inclusive
 or the special value 0.
 .Pp
-The string may begin with an arbitrary amount of white space
+The string may begin with an arbitrary amount of whitespace
 (as determined by
 .Xr isspace 3 )
 followed by a single optional
diff --git a/lib/libc/stdlib/strtoul.3 b/lib/libc/stdlib/strtoul.3
index 80eb0378447..572658bf7fe 100644
--- a/lib/libc/stdlib/strtoul.3
+++ b/lib/libc/stdlib/strtoul.3
@@ -33,7 +33,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: strtoul.3,v 1.5 1999/09/14 03:59:55 pjanzen Exp $
+.\"	$OpenBSD: strtoul.3,v 1.6 2000/03/04 22:19:31 aaron Exp $
 .\"
 .Dd June 25, 1992
 .Dt STRTOUL 3
@@ -74,7 +74,7 @@ The conversion is done according to the given
 which must be a number between 2 and 36 inclusive
 or the special value 0.
 .Pp
-The string may begin with an arbitrary amount of white space
+The string may begin with an arbitrary amount of whitespace
 (as determined by
 .Xr isspace 3 )
 followed by a single optional
diff --git a/lib/libc/string/strsep.3 b/lib/libc/string/strsep.3
index 5d0f4072692..9f44a22d9bc 100644
--- a/lib/libc/string/strsep.3
+++ b/lib/libc/string/strsep.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strsep.3,v 1.6 1999/07/04 15:59:50 aaron Exp $
+.\" $OpenBSD: strsep.3,v 1.7 2000/03/04 22:19:32 aaron Exp $
 .\"
 .\" Copyright (c) 1990, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -85,7 +85,7 @@ returns
 .Sh EXAMPLES
 The following uses
 .Fn strsep
-to parse a string, containing tokens delimited by white space, into an
+to parse a string, containing tokens delimited by whitespace, into an
 argument vector:
 .Bd -literal -offset indent
 char **ap, *argv[10], *inputstring;
diff --git a/lib/libc/time/strptime.3 b/lib/libc/time/strptime.3
index 74ab569c673..ac055129b88 100644
--- a/lib/libc/time/strptime.3
+++ b/lib/libc/time/strptime.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: strptime.3,v 1.5 1999/07/07 10:50:04 aaron Exp $
+.\"	$OpenBSD: strptime.3,v 1.6 2000/03/04 22:19:32 aaron Exp $
 .\"
 .\" Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -56,12 +56,12 @@ using the format specified by
 The
 .Fa format
 string consists of zero or more directives. A directive is composed
-of either one or more white-space as defined by
+of either one or more whitespace as defined by
 .Fn isspace ,
-an ordinary character (neither `%' nor a white-space), or a conversion
+an ordinary character (neither `%' nor a whitespace), or a conversion
 specification. A conversion specification consists of a percent sign `%'
 followed by one or two conversion characters which specify the
-replacement required.  There must be white-space or other
+replacement required.  There must be whitespace or other
 non-alphanumeric characters between any two conversion specifications.
 .Pp
 The LC_TIME category defines the locale values for the conversion
@@ -118,7 +118,7 @@ leading zeros are permitted but not required.
 the minute [0,59];
 leading zeros are permitted but not required.
 .It Cm \&%n
-any white-space
+any whitespace
 .It Cm \&%p
 the locale's equivalent of a.m. or p.m..
 .It Cm \&%r
@@ -129,7 +129,7 @@ the time as %H:%M.
 the seconds [0,61];
 leading zeros are permitted but not required.
 .It Cm \&%t
-any white-space
+any whitespace
 .It Cm \&%T
 the time as %H:%M:%S.
 .It Cm \&%U
diff --git a/lib/libc/time/zic.8 b/lib/libc/time/zic.8
index 2cbc3356ccf..958e6bd3854 100644
--- a/lib/libc/time/zic.8
+++ b/lib/libc/time/zic.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: zic.8,v 1.9 1999/07/09 13:35:21 aaron Exp $
+.\"	$OpenBSD: zic.8,v 1.10 2000/03/04 22:19:32 aaron Exp $
 .Dd May 23, 1999
 .Dt ZIC 8
 .Os
@@ -67,8 +67,8 @@ when checking year types (see below).
 .El
 .Pp
 Input lines are made up of fields.
-Fields are separated from one another by any number of white space characters.
-Leading and trailing white space on input lines is ignored.
+Fields are separated from one another by any number of whitespace characters.
+Leading and trailing whitespace on input lines is ignored.
 An unquoted sharp character (#) in the input introduces a comment which extends
 to the end of the line the sharp character appears on.
 White space characters and sharp characters may be enclosed in double quotes
diff --git a/lib/libutil/scsi.3 b/lib/libutil/scsi.3
index 3d1b927495b..8fe440497f7 100644
--- a/lib/libutil/scsi.3
+++ b/lib/libutil/scsi.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: scsi.3,v 1.3 1999/05/16 19:56:05 alex Exp $
+.\"	$OpenBSD: scsi.3,v 1.4 2000/03/04 22:19:32 aaron Exp $
 .\" Copyright (c) 1994 HD Associates (hd@world.std.com)
 .\" All rights reserved.
 .\"
@@ -191,7 +191,7 @@ The second one bit field is the constant value 0 and the first
 one bit field and the six bit field are taken from the variable
 argument list.
 Multi byte fields are swapped into the SCSI byte order in the
-CDB and white space is ignored.
+CDB and whitespace is ignored.
 .Pp
 When the field is a hex value or the letter v, (e.g.,
 .Fr "1A"
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index 9389c2fc391..3addee5c29e 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mount_umap.8,v 1.12 1999/07/21 01:07:56 deraadt Exp $
+.\"	$OpenBSD: mount_umap.8,v 1.13 2000/03/04 22:19:30 aaron Exp $
 .\"	$NetBSD: mount_umap.8,v 1.4 1996/03/05 02:36:42 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994
@@ -99,7 +99,7 @@ Briefly, the format of these files is a count of the number of
 mappings on the first line, with each subsequent line containing
 a single mapping.  Each of these mappings consists of an ID from
 the original environment and the corresponding ID in the local environment,
-separated by white space.
+separated by whitespace.
 .Em uid-mapfile
 should contain all UID
 mappings, and
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index facce1324c5..6cada58a68c 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: exports.5,v 1.8 1998/12/15 01:20:39 aaron Exp $
+.\"	$OpenBSD: exports.5,v 1.9 2000/03/04 22:19:30 aaron Exp $
 .\"	$NetBSD: exports.5,v 1.9 1996/02/18 11:57:50 fvdl Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
@@ -167,7 +167,7 @@ in an effort to be backward compatible with older export file formats.
 .Pp
 The third component of a line specifies the host set to which the line applies.
 The set may be specified in three ways.
-The first way is to list the host name(s) separated by white space.
+The first way is to list the host name(s) separated by whitespace.
 (Standard internet
 .Dq dot
 addresses may be used in place of names.)
diff --git a/share/man/man7/hostname.7 b/share/man/man7/hostname.7
index 5524a09a911..ff009ebf124 100644
--- a/share/man/man7/hostname.7
+++ b/share/man/man7/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.4 1999/05/23 14:11:09 aaron Exp $
+.\"	$OpenBSD: hostname.7,v 1.5 2000/03/04 22:19:33 aaron Exp $
 .\"	$NetBSD: hostname.7,v 1.4 1994/11/30 19:07:14 jtc Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -61,7 +61,7 @@ and if the environment variable
 .Ev HOSTALIASES
 is set to the name of a file,
 that file is searched for any string matching the input hostname.
-The file should consist of lines made up of two white-space separated strings,
+The file should consist of lines made up of two whitespace separated strings,
 the first of which is the hostname alias,
 and the second of which is the complete hostname
 to be substituted for that alias.
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index e92f669b891..3a1cb145a47 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.12 1999/09/02 17:42:27 aaron Exp $
+.\"	$OpenBSD: mdoc.7,v 1.13 2000/03/04 22:19:33 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -264,8 +264,8 @@ punctuation characters are only recognized as such if they are presented
 one at a time.
 The string
 .Ql "),"
-is not recognized as punctuation and will be output with a leading white
-space and in whatever font the calling macro uses.
+is not recognized as punctuation and will be output with a leading whitespace
+and in whatever font the calling macro uses.
 The
 argument list
 .Ql "] ) ,"
diff --git a/share/man/man7/mdoc.samples.7 b/share/man/man7/mdoc.samples.7
index dca6a3a9a8c..09b47367691 100644
--- a/share/man/man7/mdoc.samples.7
+++ b/share/man/man7/mdoc.samples.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.samples.7,v 1.20 2000/01/01 23:43:23 millert Exp $
+.\"	$OpenBSD: mdoc.samples.7,v 1.21 2000/03/04 22:19:33 aaron Exp $
 .\"	$NetBSD: mdoc.samples.7,v 1.5 1996/04/03 20:17:34 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -759,7 +759,7 @@ The result is:
 .Pp
 The punctuation is not recognized and all is output in the
 literal font. If the punctuation is separated by a leading
-white space:
+whitespace:
 .Pp
 .Dl \&.Li "sptr , ptr ) ,"
 .Pp
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index ed85fd591d7..3bcfb41ac69 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ctags.1,v 1.7 1999/07/21 01:25:43 deraadt Exp $
+.\"	$OpenBSD: ctags.1,v 1.8 2000/03/04 22:19:22 aaron Exp $
 .\"	$NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
 .\"
 .\" Copyright (c) 1987, 1990, 1993
@@ -56,7 +56,7 @@ lex, and lisp sources.
 A tags file gives the locations of specified objects in a group of files.
 Each line of the tags file contains the object name, the file in which it
 is defined, and a search pattern for the object definition, separated by
-white-space.
+whitespace.
 Using the
 .Ar tags
 file,
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 109f3d02c58..af7b5a4c98e 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: file.1,v 1.6 1999/06/05 01:21:24 aaron Exp $
+.\" $OpenBSD: file.1,v 1.7 2000/03/04 22:19:23 aaron Exp $
 .TH FILE 1 "Copyrighted but distributable"
 .SH NAME
 file
@@ -158,7 +158,7 @@ different (albeit more accurate) output in many cases.
 .PP
 The one significant difference
 between this version and System V
-is that this version treats any white space
+is that this version treats any whitespace
 as a delimiter, so that spaces in pattern strings must be escaped.
 For example,
 .br
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 556eed95d11..374ceb174d1 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: getopt.1,v 1.4 1999/07/04 11:53:54 aaron Exp $	-*- nroff -*-
+.\"	$OpenBSD: getopt.1,v 1.5 2000/03/04 22:19:23 aaron Exp $	-*- nroff -*-
 .Dd June 21, 1993
 .Dt GETOPT 1
 .Os
@@ -17,7 +17,7 @@ is a string of recognized option letters (see
 );
 if a letter is followed by a colon, the option
 is expected to have an argument which may or may not be
-separated from it by white space.
+separated from it by whitespace.
 The special option
 .Dq \-\-
 is used to delimit the end of the options.
@@ -87,7 +87,7 @@ Whatever
 .Xr getopt 3
 has.
 .Pp
-Arguments containing white space or embedded shell metacharacters
+Arguments containing whitespace or embedded shell metacharacters
 generally will not survive intact;  this looks easy to fix but isn't.
 .Pp
 The error message for an invalid option is identified as coming
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index b9ed42fb45a..c849c14960b 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: id.1,v 1.7 1999/07/04 11:53:55 aaron Exp $
+.\"	$OpenBSD: id.1,v 1.8 2000/03/04 22:19:23 aaron Exp $
 .\"	$NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
 .\"
 .\" Copyright (c) 1991, 1993, 1994
@@ -75,7 +75,7 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl G
 Display the different group IDs (effective, real and supplementary)
-as white-space separated numbers, in no particular order.
+as whitespace separated numbers, in no particular order.
 .It Fl g
 Display the effective group ID as a number.
 .It Fl n
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index 15bbb8ac652..e462a8fe590 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -181,7 +181,7 @@ in both file 1 and file 2.
 (To distinguish between this and
 .Fl a Ar file_number ,
 .Nm
-currently requires that the latter not include any white space.)
+currently requires that the latter not include any whitespace.)
 .It Fl j1 Ar field
 Join on the
 .Ar field Ns 'th
diff --git a/usr.bin/lex/flex.1 b/usr.bin/lex/flex.1
index 7002a4f3a75..8cf0029bb7c 100644
--- a/usr.bin/lex/flex.1
+++ b/usr.bin/lex/flex.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: flex.1,v 1.7 1999/06/05 01:21:30 aaron Exp $
+.\"	$OpenBSD: flex.1,v 1.8 2000/03/04 22:19:24 aaron Exp $
 .\"
 .TH FLEX 1 "April 1995" "Version 2.5"
 .SH NAME
@@ -259,7 +259,7 @@ Name definitions have the form:
 .fi
 The "name" is a word beginning with a letter or an underscore ('_')
 followed by zero or more letters, digits, '_', or '-' (dash).
-The definition is taken to begin at the first non-white-space character
+The definition is taken to begin at the first non-whitespace character
 following the name and continuing to the end of the line.
 The definition can subsequently be referred to using "{name}", which
 will expand to "(definition)".  For example,
diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index 566b7732bf8..8297b613f48 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: oldrdist.1,v 1.5 1999/06/05 01:21:35 aaron Exp $
+.\"	$OpenBSD: oldrdist.1,v 1.6 2000/03/04 22:19:25 aaron Exp $
 .\" Copyright (c) 1985, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -223,7 +223,7 @@ The source and destination lists have the following format:
 .Ed
 or
 .Bd -literal -offset indent -compact
-`(' <zero or more names separated by white-space> `)'
+`(' <zero or more names separated by whitespace> `)'
 .Ed
 .Pp
 The shell meta-characters `[', `]', `{', `}', `*', and `?'
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 7342ebcc059..37afa652f6e 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdist.1,v 1.9 1999/06/05 04:16:04 aaron Exp $
+.\"	$OpenBSD: rdist.1,v 1.10 2000/03/04 22:19:26 aaron Exp $
 .\"
 .\" Copyright (c) 1983 Regents of the University of California.
 .\" All rights reserved.
@@ -641,7 +641,7 @@ The source and destination lists have the following format:
 <name>
 or
 .ti +.5i
-`(' <zero or more names separated by white-space> `)'
+`(' <zero or more names separated by whitespace> `)'
 
 .fi
 These simple lists can be modified by using one level of set addition,
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 0a81c444243..013b6631e1c 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sed.1,v 1.8 1999/07/04 12:00:04 aaron Exp $
+.\"	$OpenBSD: sed.1,v 1.9 2000/03/04 22:19:26 aaron Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -215,7 +215,7 @@ The
 and
 .Sq w
 functions take an optional file parameter, which should be separated
-from the function letter by white space.
+from the function letter by whitespace.
 Each file given as an argument to
 .Nm
 is created (or its contents truncated) before any input processing begins.
@@ -232,7 +232,7 @@ and
 .Ql \&:
 functions all accept additional arguments.
 The following synopses indicate which arguments have to be separated from
-the function letters by white space characters.
+the function letters by whitespace characters.
 .Pp
 Two of the functions take a function-list.
 This is a list of
@@ -248,11 +248,11 @@ functions separated by newlines, as follows:
 .Pp
 The
 .Ql {
-can be preceded by white space and can be followed by white space.
-The function can be preceded by white space.
+can be preceded or followed by whitespace.
+The function can be preceded by whitespace as well.
 The terminating
 .Ql }
-must be preceded by a newline or optional white space.
+must be preceded by a newline or optional whitespace.
 .sp
 .Bl -tag -width "XXXXXX" -compact
 .It [2addr] function-list
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 4fc389c485a..db2c283bd31 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnet.1,v 1.20 1999/12/11 09:08:09 itojun Exp $
+.\"	$OpenBSD: telnet.1,v 1.21 2000/03/04 22:19:26 aaron Exp $
 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -612,10 +612,10 @@ After establishing a connection, the file
 in the
 user's home directory is opened.  Lines beginning with a ``#'' are
 comment lines.  Blank lines are ignored.  Lines that begin
-without white space are the start of a machine entry.  The
+without whitespace are the start of a machine entry.  The
 first thing on the line is the name of the machine that is
 being connected to.  The rest of the line, and successive
-lines that begin with white space are assumed to be
+lines that begin with whitespace are assumed to be
 .Nm telnet
 commands and are processed as if they had been typed
 in manually to the
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index 469d6f8e203..d71147f37f1 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tsort.1,v 1.4 1998/10/30 00:24:40 aaron Exp $
+.\"	$OpenBSD: tsort.1,v 1.5 2000/03/04 22:19:27 aaron Exp $
 .\"	$NetBSD: tsort.1,v 1.6 1996/01/17 20:37:49 mycroft Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -57,7 +57,7 @@ Input is taken from the named
 or from standard input if no file
 is given.
 .Pp
-Node names in the input are separated by white space and there must
+Node names in the input are separated by whitespace and there must
 be an even number of node pairs.
 .Pp
 Presence of a node in a graph can be represented by an arc from the node
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index c30238c26b8..561867b822f 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: whois.1,v 1.11 2000/01/22 02:17:49 aaron Exp $
+.\"	$OpenBSD: whois.1,v 1.12 2000/03/04 22:19:27 aaron Exp $
 .\"	$NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
 .\"
 .\" Copyright (c) 1985, 1990, 1993
@@ -133,7 +133,7 @@ for subdomains of
 .Pp
 The operands specified to
 .Nm whois
-are concatenated together (separated by white-space) and presented to
+are concatenated together (separated by whitespace) and presented to
 the
 .Nm whois
 server.
diff --git a/usr.sbin/ipsend/ipsend/ipsend.5 b/usr.sbin/ipsend/ipsend/ipsend.5
index d7d9a082902..f5ccbe905aa 100644
--- a/usr.sbin/ipsend/ipsend/ipsend.5
+++ b/usr.sbin/ipsend/ipsend/ipsend.5
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ipsend.5,v 1.3 1999/09/23 04:12:11 alex Exp $
+.\"     $OpenBSD: ipsend.5,v 1.4 2000/03/04 22:19:28 aaron Exp $
 .TH IPSEND 5
 .SH NAME
 ipsend \- IP packet description language
@@ -314,7 +314,7 @@ bytes with any particular data).
 .B value <string>
 indicates that the string provided should be added to the current packet as
 data.  A string may be a consecutive list of characters and numbers (with
-no white spaces) or bounded by "'s (may not contain them, even if \\'d).
+no whitespace) or bounded by "'s (may not contain them, even if \\'d).
 The \\ character is recognised with the appropriate C escaped values, including
 octal numbers.
 .TP
diff --git a/usr.sbin/named/man/dig.1 b/usr.sbin/named/man/dig.1
index 8da9d68e113..6d7d51b5808 100644
--- a/usr.sbin/named/man/dig.1
+++ b/usr.sbin/named/man/dig.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dig.1,v 1.15 1999/07/09 13:35:54 aaron Exp $
+.\"	$OpenBSD: dig.1,v 1.16 2000/03/04 22:19:28 aaron Exp $
 .\" $From: dig.1,v 8.2 1997/06/01 20:34:33 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
@@ -402,7 +402,7 @@ of these are the same parameters accepted by
 Most keywords can be abbreviated. Parsing of the
 .Dq Li "+"
 options is very simplistic \(em a value must not be
-separated from its keyword by white space. The following
+separated from its keyword by whitespace. The following
 .Ar keyword Ns
 s are currently available:
 .sp 1
diff --git a/usr.sbin/named/man/host.1 b/usr.sbin/named/man/host.1
index 299dc8fe7d5..c33b9f0445d 100644
--- a/usr.sbin/named/man/host.1
+++ b/usr.sbin/named/man/host.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: host.1,v 1.3 1999/06/05 22:17:37 aaron Exp $
+.\"	$OpenBSD: host.1,v 1.4 2000/03/04 22:19:28 aaron Exp $
 .\"
 .\"	@(#)host.1              e07@nikhef.nl (Eric Wassenaar) 961010
 .\"
@@ -785,7 +785,7 @@ by defining it in the environment variable \fILOCALDOMAIN\fP.
 .fw HOSTALIASES
 In addition, the user can supply his own single-word abbreviations
 for host names. They should be in a file consisting of one line per
-abbreviation. Each line contains an abbreviation, white space, and
+abbreviation. Each line contains an abbreviation, whitespace, and
 then the fully qualified host name. The name of this file must be
 specified in the environment variable \fIHOSTALIASES\fP.
 .SH "SPECIAL CONSIDERATIONS"
diff --git a/usr.sbin/named/man/hostname.7 b/usr.sbin/named/man/hostname.7
index f86dc6ff391..1d1d13b05f3 100644
--- a/usr.sbin/named/man/hostname.7
+++ b/usr.sbin/named/man/hostname.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.7,v 1.3 1999/06/05 22:17:38 aaron Exp $
+.\"	$OpenBSD: hostname.7,v 1.4 2000/03/04 22:19:28 aaron Exp $
 .\" Copyright (c) 1987 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -44,7 +44,7 @@ The default method (using \s-1RFC\s+1 1535 guidelines) follows:
 If the name consists of a single component, i.e. contains no dot, and if the
 environment variable ``\s-1HOSTALIASES\s+1'' is set to the name of a file,
 that file is searched for a string matching the input hostname.  The file
-should consist of lines made up of two strings separated by white-space, the
+should consist of lines made up of two strings separated by whitespace, the
 first of which is the hostname alias, and the second of which is the complete
 hostname to be substituted for that alias.  If a case-insensitive match is
 found between the hostname to be resolved and the first field of a line in
diff --git a/usr.sbin/named/man/resolver.5 b/usr.sbin/named/man/resolver.5
index 2691ce61f42..0a63fbf8e7b 100644
--- a/usr.sbin/named/man/resolver.5
+++ b/usr.sbin/named/man/resolver.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolver.5,v 1.2 1997/03/12 10:42:19 downsj Exp $
+.\"	$OpenBSD: resolver.5,v 1.3 2000/03/04 22:19:28 aaron Exp $
 .\" Copyright (c) 1986 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -125,7 +125,7 @@ as explained above under \fBoptions\fP.
 .LP
 The keyword and value must appear on a single line, and the keyword
 (e.g. \fBnameserver\fP) must start the line.  The value follows
-the keyword, separated by white space.
+the keyword, separated by whitespace.
 .SH FILES
 .I /etc/resolv.conf
 .SH SEE ALSO
diff --git a/usr.sbin/rbootd/rbootd.8 b/usr.sbin/rbootd/rbootd.8
index aee286bf3e5..02e78a7e32e 100644
--- a/usr.sbin/rbootd/rbootd.8
+++ b/usr.sbin/rbootd/rbootd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rbootd.8,v 1.5 1999/07/02 20:11:48 aaron Exp $
+.\"	$OpenBSD: rbootd.8,v 1.6 2000/03/04 22:19:29 aaron Exp $
 .\"	$NetBSD: rbootd.8,v 1.3 1995/08/21 17:05:16 thorpej Exp $
 .\"
 .\" Copyright (c) 1988, 1992 The University of Utah and the Center
@@ -101,7 +101,7 @@ list of boot file names.
 An Ethernet address is specified in hexadecimal with each of its six octets
 separated by a colon.
 The boot file names come from the boot file directory.
-The Ethernet address and boot file(s) must be separated by white-space
+The Ethernet address and boot file(s) must be separated by whitespace
 and/or comma characters.
 A pound sign causes the remainder of a line to be ignored.
 .Pp
diff --git a/usr.sbin/sendmail/makemap/makemap.8 b/usr.sbin/sendmail/makemap/makemap.8
index a1d86a323f2..21556ecf7e4 100644
--- a/usr.sbin/sendmail/makemap/makemap.8
+++ b/usr.sbin/sendmail/makemap/makemap.8
@@ -62,7 +62,7 @@ library.
 In all cases,
 .Nm
 reads lines from the standard input consisting of two
-words separated by white space.
+words separated by whitespace.
 The first is the database key,
 the second is the value.
 The value may contain
diff --git a/usr.sbin/sendmail/src/aliases.5 b/usr.sbin/sendmail/src/aliases.5
index 825f17093c7..c3be93085ec 100644
--- a/usr.sbin/sendmail/src/aliases.5
+++ b/usr.sbin/sendmail/src/aliases.5
@@ -36,7 +36,7 @@ The
 is the name to alias, and the
 .Em name_n
 are the aliases for that name.
-Lines beginning with white space are continuation lines.
+Lines beginning with whitespace are continuation lines.
 Lines beginning with
 .Ql #
 are comments.
diff --git a/usr.sbin/sliplogin/sliplogin.8 b/usr.sbin/sliplogin/sliplogin.8
index bbffb885c12..463ea89dcf5 100644
--- a/usr.sbin/sliplogin/sliplogin.8
+++ b/usr.sbin/sliplogin/sliplogin.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sliplogin.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
+.\"	$OpenBSD: sliplogin.8,v 1.4 2000/03/04 22:19:30 aaron Exp $
 .\" Copyright (c) 1990, 1991 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)sliplogin.8	5.4 (Berkeley) 8/5/91
-.\"	$Id: sliplogin.8,v 1.3 1999/04/02 15:12:21 aaron Exp $
+.\"	$Id: sliplogin.8,v 1.4 2000/03/04 22:19:30 aaron Exp $
 .\"
 .Dd August 5, 1991
 .Dt SLIPLOGIN 8
@@ -102,7 +102,7 @@ Other lines must start with a
 but the remaining arguments can be whatever is appropriate for the
 .Pa  slip.login
 file that will be executed for that name.
-Arguments are separated by white space and follow normal
+Arguments are separated by whitespace and follow normal
 .Xr sh 1
 quoting conventions (however,
 .Ar loginname
diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index e3e598f1021..e33893c06aa 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     from: @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\"     $OpenBSD: syslog.conf.5,v 1.5 1999/06/05 22:18:15 aaron Exp $
+.\"     $OpenBSD: syslog.conf.5,v 1.6 2000/03/04 22:19:29 aaron Exp $
 .\"	$NetBSD: syslog.conf.5,v 1.4 1996/01/02 17:41:46 perry Exp $
 .\"
 .Dd June 9, 1993
@@ -70,7 +70,7 @@ are encoded as a
 .Em facility ,
 a period (``.''), and a
 .Em level ,
-with no intervening white-space.
+with no intervening whitespace.
 Both the
 .Em facility
 and the