From 8052f36d6cf5b22901f6c95360782e54e248bc4d Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 10 Nov 2008 20:42:17 +0000
Subject: [PATCH] ITS#5759
---
CHANGES | 1 +
doc/guide/admin/appendix-common-errors.sdf | 2 +-
doc/guide/admin/slapdconf2.sdf | 2 +-
doc/guide/admin/slapdconfig.sdf | 4 ++--
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CHANGES b/CHANGES
index fdcdb4add4..a946f336cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,7 @@ OpenLDAP 2.4.13 Engineering
Added slapo-deref overlay (ITS#5768)
Documentation
admin24 added olcLimits to example (ITS#5746)
+ admin24 consolidated on whitespace (ITS#5759)
OpenLDAP 2.4.12 Release (2008/10/12)
Fixed libldap ldap_utf8_strchar arguments (ITS#5720)
diff --git a/doc/guide/admin/appendix-common-errors.sdf b/doc/guide/admin/appendix-common-errors.sdf
index 3f4cb7dba9..1c053fd68e 100644
--- a/doc/guide/admin/appendix-common-errors.sdf
+++ b/doc/guide/admin/appendix-common-errors.sdf
@@ -162,7 +162,7 @@ values (the server will only report the first error it finds).
Common causes include:
-* extraneous white space (especially trailing white space)
+* extraneous whitespace (especially trailing whitespace)
* improperly encoded characters (LDAPv3 uses UTF-8 encoded Unicode)
* empty values (few syntaxes allow empty values)
diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 52a70e40df..35b61362d0 100644
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -125,7 +125,7 @@ keywords, using the keyword as the attribute name, with the "olc"
prefix attached.
A configuration directive may take arguments. If so, the arguments are
-separated by white space. If an argument contains white space,
+separated by whitespace. If an argument contains whitespace,
the argument should be enclosed in double quotes {{EX:"like this"}}.
In the descriptions that follow, arguments that should be replaced
by actual text are shown in brackets {{EX:<>}}.
diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 93efea090c..c4741ff280 100644
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -27,7 +27,7 @@ be overridden in backend and/or database directives, and backend directives
can be overridden by database directives.
Blank lines and comment lines beginning with a '{{EX:#}}' character
-are ignored. If a line begins with white space, it is considered a
+are ignored. If a line begins with whitespace, it is considered a
continuation of the previous line (even if the previous line is a
comment).
@@ -56,7 +56,7 @@ The general format of slapd.conf is as follows:
> ...
A configuration directive may take arguments. If so, they are
-separated by white space. If an argument contains white space,
+separated by whitespace. If an argument contains whitespace,
the argument should be enclosed in double quotes {{EX:"like this"}}. If
an argument contains a double quote or a backslash character `{{EX:\}}',
the character should be preceded by a backslash character `{{EX:\}}'.
--
GitLab