Log Message:
-----------
Improve description of MERGE SET; it didn't make it clear that the
set that gets merged in, well, disappears...

Modified Files:
--------------
    slony1-engine/doc/adminguide:
        slonik_ref.sgml (r1.40 -> r1.41)

-------------- next part --------------
Index: slonik_ref.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slonik_ref.sgml,v
retrieving revision 1.40
retrieving revision 1.41
diff -Ldoc/adminguide/slonik_ref.sgml -Ldoc/adminguide/slonik_ref.sgml -u -w -r1.40 -r1.41
--- doc/adminguide/slonik_ref.sgml
+++ doc/adminguide/slonik_ref.sgml
@@ -1220,11 +1220,14 @@
      to add tables/sequences to already-subscribed sets. One may create
      a temporary set, add the new objects to that, subscribe all nodes
      currently subscribed to the other set to this new one, and then
-     merge the two together.
+    merge the two together, eliminating the set ID that was being
+    added.
     </para>
+
     <para>
-     This request will fail if the two sets do not have
-     <emphasis>exactly</emphasis> the same set of subscribers.  </para>
+     This operation will refuse to be run if the two sets do not have
+     <emphasis>exactly</emphasis> the same set of subscribers.
+     </para>
     
     <variablelist>
      <varlistentry><term><literal> ID = ival </literal></term>