From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 26 Sep 2007 18:18:24 +0000 (+0000)
Subject: ITS#5134
X-Git-Tag: OPENLDAP_REL_ENG_2_3_39~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21b68f1260642d14b175dc651d2359deabf013d7;p=thirdparty%2Fopenldap.git

ITS#5134
---

diff --git a/CHANGES b/CHANGES
index 0eabd91365..376174688f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ OpenLDAP 2.3.39 Engineering
 		Added max-depth/return-error to slapo-chain(5)
 		Fixed Admin Guide URL in README (ITS#5107)
 		slapcat note about using against running slapd (ITS#5028)
+		Fixed slapd-bdb(5) note about dbconfig directives (ITS#5134)
 
 OpenLDAP 2.3.38 Release (2007/08/20)
 	Fixed slapadd check for ';binary' when required (ITS#5071)
diff --git a/doc/man/man5/slapd-bdb.5 b/doc/man/man5/slapd-bdb.5
index f24ef11f83..0fb7be0f00 100644
--- a/doc/man/man5/slapd-bdb.5
+++ b/doc/man/man5/slapd-bdb.5
@@ -71,7 +71,8 @@ to allow all necessary configuration to be set in the
 file.
 The options set using this directive will only be written to the 
 .B DB_CONFIG
-file if no such file existed at server startup time. This allows one
+file if no such file existed at server startup time, otherwise
+they are completely ignored. This allows one
 to set initial values without overwriting/destroying a 
 .B DB_CONFIG 
 file that was already customized through other means.