From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 3 Jun 2005 17:06:58 +0000 (+0000)
Subject: remove reference to multi-master replication (dead) experimental code
X-Git-Tag: OPENLDAP_AC_BP~579
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b0ad896f5e4fd72395be0aaa0f5ba95f69434dea;p=openldap

remove reference to multi-master replication (dead) experimental code
---

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.