From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 5 Nov 2013 23:57:43 +0000 (-0800)
Subject: ITS#7700
X-Git-Tag: OPENLDAP_REL_ENG_2_4_45~40
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=0d7a0dc0874586ca1a912ec3da94b30d5565ddc8

ITS#7700
Update sections 6.2.2.1, 6.2.3.3
---

diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf
index 3b599ab80c..200abaa9de 100644
--- a/doc/guide/admin/slapdconf2.sdf
+++ b/doc/guide/admin/slapdconf2.sdf
@@ -364,12 +364,13 @@ supported backend types listed in Table 5.2.
 !block table; align=Center; coltags="EX,N"; \
 	title="Table 5.2: Database Backends"
 Types	Description
-bdb	Berkeley DB transactional backend
+bdb	Berkeley DB transactional backend (deprecated)
 config	Slapd configuration backend
 dnssrv	DNS SRV backend
-hdb	Hierarchical variant of bdb backend
+hdb	Hierarchical variant of bdb backend (deprecated)
 ldap	Lightweight Directory Access Protocol (Proxy) backend
 ldif	Lightweight Data Interchange Format backend
+mdb	Memory-Mapped DB backend
 meta	Meta Directory backend
 monitor	Monitor backend
 passwd	Provides read-only access to {{passwd}}(5)
@@ -449,7 +450,8 @@ H4: olcReadonly { TRUE | FALSE }
 
 This directive puts the database into "read-only" mode. Any
 attempts to modify the database will return an "unwilling to
-perform" error.
+perform" error.  If set on a consumer, modifications sent by
+syncrepl will still occur.
 
 \Default:
 
diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 6950da97b4..53b1c2c6ee 100644
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -264,10 +264,11 @@ supported backend types listed in Table 6.2.
 !block table; align=Center; coltags="EX,N"; \
 	title="Table 6.2: Database Backends"
 Types	Description
-bdb	Berkeley DB transactional backend
+bdb	Berkeley DB transactional backend (deprecated)
 dnssrv	DNS SRV backend
-hdb	Hierarchical variant of bdb backend
+hdb	Hierarchical variant of bdb backend (deprecated)
 ldap	Lightweight Directory Access Protocol (Proxy) backend
+mdb	Memory-Mapped DB backend
 meta	Meta Directory backend
 monitor	Monitor backend
 passwd	Provides read-only access to {{passwd}}(5)
@@ -316,7 +317,8 @@ H4: readonly { on | off }
 
 This directive puts the database into "read-only" mode. Any
 attempts to modify the database will return an "unwilling to
-perform" error.
+perform" error.  If set on a consumer, modifications sent by
+syncrepl will still occur.
 
 \Default: