Sync with HEAD

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index 3acdc2a7cd4fccf0896b21e4714580cc0ac53bbf..52d78987550963843925fbc9ad9ee263789ea280 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -284,10 +284,8 @@ required while providing high performance.
 copies of directory information.  This {{single-master/multiple-slave}}
 replication scheme is vital in high-volume environments where a
 single {{slapd}} just doesn't provide the necessary availability
-or reliability.  {{slapd}} also includes experimental support for
-{{multi-master}} replication (for use where strong ACID properties
-are not required).  {{slapd}} supports two replication methods:
-{{LDAP Sync}}-based and {{slurpd}}(8)-based replication .
+or reliability. {{slapd}} supports two replication methods: {{LDAP
+Sync}}-based and {{slurpd}}(8)-based replication.
 
 {{B:Proxy Cache}}: {{slapd}} can be configured as a caching
 LDAP proxy service.

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 78633c8a6e4ab7740f9651f2808ff2e7fb6fd295..50fbcbd6b8d4f98ca72e38621add2b6b215ccb56 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -958,7 +958,7 @@ attribute and various {{EX:<who>}} selectors.
 
 >      access to dn.subtree="dc=example,dc=com" attr=homePhone
 >              by self write
->              by dn.children=dc=example,dc=com" search
+>              by dn.children="dc=example,dc=com" search
 >              by peername.regex=IP:10\..+ read
 >      access to dn.subtree="dc=example,dc=com"
 >              by self write