diff --git a/CHANGES b/CHANGES
index fdcdb4add4797d9e96222b8b6859260d5e6c1b63..a946f336cc5a7147e22130a94b953808e4b81608 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 3f4cb7dba95b72c7cc1f6102467a69363c5163d0..1c053fd68eb4f3c3b6f5db3ca4d26fef45ea2c59 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 52a70e40df713abfe379f2b0a8f3d7b7a207e219..35b61362d00d4adf318adac267145b01b0deb980 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 93efea090c81a08732b30141f2d28c2dd4e6df2b..c4741ff280b4be3f61535b54f8620fc7d381a14b 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:\}}'.