Apply ITS#4350 changes except slapdconfig.sdf. The BDB text in slapdconf2.sdf

is more accurate; slapdconfig.sdf should eventually be dropped.

diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index 0552916a1a7694837ea89163d28787442d9f770f..b7a897a8ff2b9622d22eff6db05063fafb3c34c0 100644 (file)
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -128,11 +128,6 @@ 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.
 
-OpenLDAP's {{slapd}}(8) LDBM backend supports a variety of data
-base managers including {{PRD:Berkeley DB}} and {{PRD:GDBM}}.
-{{PRD:GDBM}} is available from {{ORG:FSF}}'s download site {{URL:
-ftp://ftp.gnu.org/pub/gnu/gdbm/}}.
-
 
 H3: Threads
 

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index 67d803e1c7d23b7698df37bbdccde60c57e15008..26722e1e1409636de5dbb91d3de4aec5c71e9b21 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -250,12 +250,11 @@ tags.
 {{B:Choice of database backends}}: {{slapd}} comes with a variety
 of different database backends you can choose from. They include
 {{TERM:BDB}}, a high-performance transactional database backend;
-{{TERM:HDB}}, a hierarchical high-performance transactional backend;
-{{TERM:LDBM}}, a lightweight DBM based backend; {{SHELL}}, a backend
-interface to arbitrary shell scripts; and PASSWD, a simple backend
-interface to the {{passwd}}(5) file.  The BDB and HDB backends
-utilize {{ORG:Sleepycat}} {{PRD:Berkeley DB}}.  The LDBM utilizes
-either {{PRD:Berkeley DB}} or {{PRD:GDBM}}.
+{{TERM:HDB}}, a hierarchical high-performance transactional
+backend; {{SHELL}}, a backend interface to arbitrary shell scripts;
+and PASSWD, a simple backend interface to the {{passwd}}(5) file.
+The BDB and HDB backends utilize {{ORG:Sleepycat}} {{PRD:Berkeley
+DB}}.
 
 {{B:Multiple database instances}}: {{slapd}} can be configured to
 serve multiple databases at the same time. This means that a single

diff --git a/doc/guide/admin/proxycache.sdf b/doc/guide/admin/proxycache.sdf
index a6fcab2ce426e97a7c23531bbacf51647e3f4f7e..d510dd3b75a1ef7cb1eade65494070e22c1cfc84 100644 (file)
--- a/doc/guide/admin/proxycache.sdf
+++ b/doc/guide/admin/proxycache.sdf
@@ -63,15 +63,15 @@ H3: Setting cache parameters
 
 > proxyCache <DB> <maxentries> <nattrsets> <entrylimit> <period>
 
-This directive enables proxy caching and sets general cache parameters.
-The <DB> parameter specifies which underlying database is to be
-used to hold cached entries.  It should be set to {{EX:bdb}},
-{{EX:hdb}}, or {{EX:ldbm}}.  The <maxentries> parameter specifies
-the total number of entries which may be held in the cache.  The
+This directive enables proxy caching and sets general cache
+parameters.  The <DB> parameter specifies which underlying database
+is to be used to hold cached entries.  It should be set to
+{{EX:bdb}} or {{EX:hdb}}.  The <maxentries> parameter specifies the
+total number of entries which may be held in the cache.  The
 <nattrsets> parameter specifies the total number of attribute sets
-(as specified by the {{EX:proxyAttrSet}} directive) that may be defined.
-The <entrylimit> parameter specifies the maximum number of entries
-in a cachable query.  The <period> specifies the consistency
+(as specified by the {{EX:proxyAttrSet}} directive) that may be
+defined.  The <entrylimit> parameter specifies the maximum number of
+entries in a cachable query.  The <period> specifies the consistency
 check period (in seconds).  In each period, queries with expired
 TTLs are removed.
 

diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf
index 3ae57ba9e69ff27a757b1ac0cc51a4d4e8eb0568..afd16ebef8e86a8877bc7edcfb7bc39ff0ee1978 100644 (file)
--- a/doc/guide/admin/replication.sdf
+++ b/doc/guide/admin/replication.sdf
@@ -221,8 +221,8 @@ attempt to modify data.
 
 H3: Copy the master slapd's database to the slave
 
-Copy the master's database(s) to the slave. For an {{TERM:BDB}} and
-{{TERM:LDBM}} databases, you must copy all database files located
+Copy the master's database(s) to the slave. For {{TERM:BDB}} and
+{{TERM:HDB}} databases, you must copy all database files located
 in the database {{EX:directory}} specified in {{slapd.conf}}(5).
 In general, you should copy each file found in the database {{EX:
 directory}} unless you know it is not used by {{slapd}}(8).

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 1869a052281b5d92c3725ed68ce44defeee30ccb..0758be66d877f87f597817c2a4c42761bb37d7dd 100644 (file)
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -377,7 +377,6 @@ config      Slapd configuration backend
 dnssrv DNS SRV backend
 hdb    Hierarchical variant of bdb backend
 ldap   Lightweight Directory Access Protocol (Proxy) backend
-ldbm   Lightweight DBM backend
 ldif   Lightweight Data Interchange Format backend
 meta   Meta Directory backend
 monitor        Monitor backend
@@ -727,7 +726,7 @@ mechanisms authenticate the identity within. The {{EX:secprops}}
 parameter specifies Cyrus SASL security properties.
 
 The syncrepl replication mechanism is supported by the
-three native backends: back-bdb, back-hdb, and back-ldbm.
+two native backends: back-bdb and back-hdb.
 
 See the {{SECT:LDAP Sync Replication}} chapter of the admin guide
 for more information on how to use this directive.

diff --git a/doc/guide/admin/syncrepl.sdf b/doc/guide/admin/syncrepl.sdf
index b9c63e3fd26b8467cc9f349e4eba966306423582..6755ea788a29647dbb43a20bd7c48e7879ca87e3 100644 (file)
--- a/doc/guide/admin/syncrepl.sdf
+++ b/doc/guide/admin/syncrepl.sdf
@@ -191,9 +191,7 @@ in the replication context.
 The syncrepl engine, which is a consumer-side replication engine,
 can work with any backends. The LDAP Sync provider can be configured
 as an overlay on any backend, but works best with the {{back-bdb}}
-or {{back-hdb}} backend. The provider can not support refreshAndPersist
-mode on {{back-ldbm}} due to limits in that backend's locking
-architecture.
+or {{back-hdb}} backend.
 
 The LDAP Sync provider maintains a {{EX:contextCSN}} for each
 database as the current synchronization state indicator of the

diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 7041e52169b1c17b665eabfca4b625d77f7542b2..98b784ab553989a2e72e47e29858b85642b98cf0 100644 (file)
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -177,7 +177,6 @@ Kerberos|Kerberos Authentication Service
 LBER|Lightweight BER
 LDAP|Lightweight Directory Access Protocol
 LDIF|LDAP Data Interchange Format
-LDBM|LDAP Database Manager
 MIB|Management Information Base
 OID|Object Identifier
 OSI|Open Systems Interconnect

diff --git a/doc/guide/release/install.sdf b/doc/guide/release/install.sdf
index fda321b50335cc19baf220c690473b6f2cfc669e..50a27b825c877d653bd50eb11f7b8d3a6d6da0f1 100644 (file)
--- a/doc/guide/release/install.sdf
+++ b/doc/guide/release/install.sdf
@@ -80,7 +80,7 @@ if you have not done so already.
 + Test the standalone system
 
 .This step requires the standalone LDAP server, {{slapd}}(8),
-with {{HDB}}, {{BDB}}, and/or {{LDBM}} support.
+with {{HDB}} and/or {{BDB}} support.
 
 E:     % make test