From: Kurt Zeilenga Date: Fri, 3 Jun 2005 21:05:01 +0000 (+0000) Subject: Sync with HEAD X-Git-Tag: OPENLDAP_REL_ENG_2_3_4~19 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e4f3cd711e259f4ed205654757ff4f7c49ba074a;p=openldap Sync with HEAD --- diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf index 3acdc2a7cd..52d7898755 100644 --- 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 78633c8a6e..50fbcbd6b8 100644 --- a/doc/guide/admin/slapdconfig.sdf +++ b/doc/guide/admin/slapdconfig.sdf @@ -958,7 +958,7 @@ attribute and various {{EX:}} 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