Update of /home/cvsd/slony1/slony1-engine/doc/adminguide
In directory main.slony.info:/tmp/cvs-serv25852/doc/adminguide

Modified Files:
	slonik_ref.sgml 
Log Message:
Clean up WAIT FOR EVENT example


Index: slonik_ref.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/slonik_ref.sgml,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** slonik_ref.sgml	6 Nov 2008 21:40:42 -0000	1.91
--- slonik_ref.sgml	17 Nov 2008 22:41:21 -0000	1.92
***************
*** 1361,1366 ****
        </varlistentry>
        <varlistentry><term><literal> ORIGIN = ival </literal></term>
!        <listitem><para> Origin node for the set.  A future version of <application>slonik</application>
! 	 might figure out this information by itself.</para></listitem>
        </varlistentry>
        <varlistentry><term><literal> ID = ival </literal></term>
--- 1361,1366 ----
        </varlistentry>
        <varlistentry><term><literal> ORIGIN = ival </literal></term>
!        <listitem><para> Origin node for the set.  We might imagine a future version of <application>slonik</application>
! 	 figuring out this information by itself, but there do lie race conditions, there.</para></listitem>
        </varlistentry>
        <varlistentry><term><literal> ID = ival </literal></term>
***************
*** 2909,2917 ****
       # Assuming that set 1 has direct subscribers 2 and 3
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 2);
!      SYNC (ID=1);
!      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = 2, WAIT ON=1);
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 3);
       SYNC (ID=1);
!      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = 3, WAIT ON=1);
       MERGE SET ( ID = 1, ADD ID = 999, ORIGIN = 1 );
      </programlisting>
--- 2909,2917 ----
       # Assuming that set 1 has direct subscribers 2 and 3
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 2);
!      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = ALL, WAIT ON=1);
       SUBSCRIBE SET (ID = 999, PROVIDER = 1, RECEIVER = 3);
+      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = ALL, WAIT ON=1);
       SYNC (ID=1);
!      WAIT FOR EVENT (ORIGIN = 1, CONFIRMED = ALL, WAIT ON=1);
       MERGE SET ( ID = 1, ADD ID = 999, ORIGIN = 1 );
      </programlisting>