From: Howard Chu <hyc@openldap.org>
Date: Mon, 30 Jun 2014 10:21:38 +0000 (-0700)
Subject: ITS#7887 doc tweaks
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40~117
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0d592a378735ff9a79be3eae6f279504cec905b3;p=openldap

ITS#7887 doc tweaks

MDB is the name of the backend, LMDB is the name of the DB engine.
Also update some BerkeleyDB info.
---

diff --git a/doc/guide/admin/appendix-recommended-versions.sdf b/doc/guide/admin/appendix-recommended-versions.sdf
index dd100ffa9c..b016801dc1 100644
--- a/doc/guide/admin/appendix-recommended-versions.sdf
+++ b/doc/guide/admin/appendix-recommended-versions.sdf
@@ -22,14 +22,7 @@ Feature|Software|Version
 {{TERM[expand]Kerberos}}:
 |{{PRD:Heimdal}}|Version
 |{{PRD:MIT Kerberos}}|Version
-Database Software|{{PRD:Berkeley DB}}:|
-||4.4
-||4.5
-||4.6
-||4.7
-||4.8
-||5.0
-||5.1
+Database Software|{{PRD:Berkeley DB}}:|5.3
 ||Note: It is highly recommended to apply the patches from Oracle for a given release.
 Threads:
 |POSIX {{pthreads}}|Version
diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index 259a13ce87..36a5ebca79 100644
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -114,7 +114,11 @@ Kerberos, is highly recommended.
 
 H3: Database Software
 
-OpenLDAP's {{slapd}}(8) {{TERM:BDB}} and {{TERM:HDB}} primary database backends
+OpenLDAP's {{slapd}}(8) {{TERM:MDB}} primary database backend uses the {{TERM:LMDB}}
+software included with the OpenLDAP source.  There is no need to download any
+additional software to have {{MDB}} support.
+
+OpenLDAP's {{slapd}}(8) {{TERM:BDB}} and {{TERM:HDB}} deprecated database backends
 require {{ORG[expand]Oracle}} {{PRD:Berkeley DB}}.
 If not available at configure time, you will not be able to build
 {{slapd}}(8) with these primary database backends.
@@ -130,7 +134,10 @@ download page
 
 There are several versions available. Generally, the most recent
 release (with published patches) is recommended. This package is required
-if you wish to use the {{TERM:BDB}} or {{TERM:HDB}} database backends.
+if you wish to use the deprecated {{TERM:BDB}} or {{TERM:HDB}} database backends.
+
+Note: Berkeley DB version 6.0.20 and later uses a software license that is
+incompatible with LDAP technology and should not be used with OpenLDAP.
 
 Note: Please see {{SECT:Recommended OpenLDAP Software Dependency Versions}} for
 more information.
diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 3ee8020f55..0a5373b886 100644
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -225,6 +225,7 @@ LDAPv3|LDAP, version 3
 LDIF|LDAP Data Interchange Format
 LMDB|Lightning Memory-Mapped Database
 MD5|Message Digest 5
+MDB|Memory-Mapped Database (Backend)
 MIB|Management Information Base
 MODDN|Modify DN
 MODRDN|Modify RDN