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.

10 files changed, 35 insertions, 35 deletions

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