From 29ad832dba35445a3f904cd934c581f94f75fcd5 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 17 Nov 2008 18:55:14 +0000
Subject: [PATCH] Document that Bucardo is an example of mulit-master
 replication with conflict resolution.

---
 doc/src/sgml/high-availability.sgml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 4d1abbccf0..51e4c72e8f 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.32 2008/01/30 10:49:55 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.33 2008/11/17 18:55:14 momjian Exp $ -->
 
 <chapter id="high-availability">
  <title>High Availability, Load Balancing, and Replication</title>
@@ -212,6 +212,7 @@ protocol to make nodes agree on a serializable transactional order.
      server works independently, and periodically communicates with
      the other servers to identify conflicting transactions.  The
      conflicts can be resolved by users or conflict resolution rules.
+     Bucardo is an example of this type of replication.
     </para>
    </listitem>
   </varlistentry>
-- 
2.11.0