More backend info updates: MDB, NDB

diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index e900d2c493e69b9bdda77683f2dd27c9337d12e9..96959a9651437c621e6b3186825c395fa624ba4e 100644 (file)
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -1088,7 +1088,8 @@ value "oid.xx" will be used.
 
 .SH GENERAL BACKEND OPTIONS
 Options in these entries only apply to the configuration of a single
-type of backend. All backends may support this class of options.
+type of backend. All backends may support this class of options, but
+currently none do.
 The entry must be named
 .B olcBackend=<databasetype>,cn=config
 and must have the olcBackendConfig objectClass.
@@ -1100,8 +1101,10 @@ should be one of
 .BR hdb ,
 .BR ldap ,
 .BR ldif ,
+.BR mdb ,
 .BR meta ,
 .BR monitor ,
+.BR ndb ,
 .BR null ,
 .BR passwd ,
 .BR perl ,
@@ -1109,7 +1112,8 @@ should be one of
 .BR shell ,
 or
 .BR sql .
-At present, no backend implements any options of this type.
+At present, no backend implements any options of this type, so this
+entry should not be used.
 
 .SH DATABASE OPTIONS
 Database options are set in entries named

diff --git a/doc/man/man5/slapd.backends.5 b/doc/man/man5/slapd.backends.5
index 95a727ff362200aff310ceb177aab74f109e8bab..7c63454bcead606d4b96f7e3fece7e4cf5b5ff1f 100644 (file)
--- a/doc/man/man5/slapd.backends.5
+++ b/doc/man/man5/slapd.backends.5
@@ -53,7 +53,6 @@ This layout stores entry DNs more efficiently than the
 backend,
 using less space and requiring less work to create, delete, and rename
 entries. It is also one of the few backends to support subtree renames.
-.BR
 .TP
 .B ldap
 This backend acts as a proxy to forward incoming requests to another
@@ -65,6 +64,16 @@ of the database, using plain ascii files to store data.
 Its usage should be limited to very simple databases, where performance
 is not a requirement. This backend also supports subtree renames.
 .TP
+.B mdb
+This will soon be the recommended primary backend, superseding
+.BR hdb .
+This backend uses OpenLDAP's own MDB transactional database
+library. It is extremely compact and extremely efficient, delivering
+much higher performance than the Berkeley DB backends while using
+significantly less memory.  Also, unlike Berkeley DB, MDB is crash proof,
+and requires no special tuning or maintenance.
+This backend also supports subtree renames.
+.TP
 .B meta
 This backend performs basic LDAP proxying with respect to a set of
 remote LDAP servers. It is an enhancement of the
@@ -80,7 +89,8 @@ backend may be defined.
 .B ndb
 This backend is experimental.
 It uses the transactional database interface of the MySQL Cluster Engine
-(NDB) to store data.
+(NDB) to store data. Note that Oracle, which now owns MySQL, has withdrawn
+support for NDB and this backend is unlikely to be developed any further.
 .TP
 .B null
 Operations in this backend succeed but do nothing.
@@ -131,8 +141,10 @@ default slapd configuration directory
 .BR slapd\-hdb (5),
 .BR slapd\-ldap (5),
 .BR slapd\-ldif (5),
+.BR slapd\-mdb (5),
 .BR slapd\-meta (5),
 .BR slapd\-monitor (5),
+.BR slapd\-ndb (5),
 .BR slapd\-null (5),
 .BR slapd\-passwd (5),
 .BR slapd\-perl (5),