LDBM updates

diff --git a/doc/man/man5/slapd-bdb.5 b/doc/man/man5/slapd-bdb.5
index 85d3b890f396d560345f8dac9210162144bd4def..052b25f57accf725c9ca7ae36870067afca79842 100644 (file)
--- a/doc/man/man5/slapd-bdb.5
+++ b/doc/man/man5/slapd-bdb.5
@@ -9,11 +9,9 @@
 .SH DESCRIPTION
 The \fBbdb\fP backend to
 .BR slapd (8)
-is the recommended backend for a normal 
+is the recommended primary backend for a normal 
 .B slapd 
 database.
-However, it takes more care than with the LDBM backend to configure
-it properly.
 It uses the Sleepycat Berkeley DB (BDB) package to store data.
 It makes extensive use of indexing and caching to speed data access.
 .LP

diff --git a/doc/man/man5/slapd-ldbm.5 b/doc/man/man5/slapd-ldbm.5
index b761528d3a20a1727f14d6f249531e34d6ccc7bd..43f8148b4a7ca930a66b622eeabf1673896a785b 100644 (file)
--- a/doc/man/man5/slapd-ldbm.5
+++ b/doc/man/man5/slapd-ldbm.5
@@ -9,11 +9,12 @@ ETCDIR/slapd.conf
 .SH DESCRIPTION
 The LDBM backend to
 .BR slapd (8)
-is the database backend which is easiest to configure.
-However, it does not offer the data durability features of the BDB
-backend.
-It uses Berkeley DB or GDBM to store data.
-It makes extensive use of indexing and caching to speed data access.
+is an easy\-to\-configure but obsolete database backend.  It does not
+offer the data durability features of the BDB and HDB backends and
+hence is considered deprecated in favor of these robust backends.
+LDBM uses lightweight non\-transactional data interfaces, such as those
+provided by GDBM or Berkeley DB, to store data.  It makes extensive
+use of indexing and caching to speed data access.
 .SH CONFIGURATION
 These
 .B slapd.conf

diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5
index 723aaa038402f5a8c74afe20b4cfc2748cf1f4e3..cdd08fa715f62dfbd0f513889f99063dcd4b3bdb 100644 (file)
--- a/doc/man/man5/slapd.access.5
+++ b/doc/man/man5/slapd.access.5
@@ -829,7 +829,7 @@ identity, control is passed straight to the subsequent rules.
 .SH OPERATION REQUIREMENTS
 Operations require different privileges on different portions of entries.
 The following summary applies to primary database backends such as
-the LDBM, BDB, and HDB backends.   Requirements for other backends may
+the BDB and HDB backends.   Requirements for other backends may
 (and often do) differ.
 .LP
 The
@@ -952,9 +952,8 @@ so it is fully honored by all backends; for all other operations
 and for the discovery phase of the search operation,
 full ACL semantics is only supported by the primary backends, i.e.
 .BR back-bdb (5),
-.BR back-hdb (5),
 and
-.BR back-ldbm (5).
+.BR back-hdb (5).
 
 Some other backend, like
 .BR back-sql (5),

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 09e269c514b9abe9ecf4a34a5a9b249469332a02..323f338e09caa7374ad0abe3ddc53f0b678d0a44 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -1665,10 +1665,10 @@ They are documented in the
 manual pages.
 .TP
 .B bdb
-This is the recommended backend for a normal slapd database.
-However, it takes more care than with the LDBM backend to configure
-it properly.
-It uses the Sleepycat Berkeley DB (BDB) package to store data.
+This is the recommended primary backend for a normal slapd database.
+It takes care to configure it properly.
+It uses the transactional database interface of the Sleepycat Berkeley
+DB (BDB) package to store data.
 .TP
 .B config
 This backend is used to manage the configuration of slapd run-time.
@@ -1687,10 +1687,11 @@ This backend acts as a proxy to forward incoming requests to another
 LDAP server.
 .TP
 .B ldbm
-This is the database backend which is easiest to configure.
-However, it does not offer the data durability features of the BDB
-backend.
-It uses Berkeley DB or GDBM to store data.
+This is an easy-to-configure but obsolete database backend. It
+does not offer the data durability features of the BDB and HDB
+backends and hence is deprecated in favor of these robust backends.
+LDBM uses lightweight non-transactional DB interfaces,
+such as those providing by GDBM or Berkeley DB, to store data.
 .TP
 .B ldif
 This database uses the filesystem to build the tree structure