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

Modified Files:
	locking.sgml slonik_ref.sgml 
Log Message:
Add some caveats about locking.  There's some locking that shouldn't
normally be visible, except when it is ;-).   Or rather, except when
someone runs a database-wide vacuum or something like that which hits
Slony-I-specific objects.


Index: slonik_ref.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/slonik_ref.sgml,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** slonik_ref.sgml	27 Jun 2008 20:17:17 -0000	1.88
--- slonik_ref.sgml	1 Aug 2008 19:25:41 -0000	1.89
***************
*** 1287,1294 ****
      <variablelist>
       <varlistentry><term><literal> ID = ival </literal></term>
!       <listitem><para> Unique ID of the set to contain the union of the two separate sets.</para></listitem>
       </varlistentry>
       <varlistentry><term><literal> ADD ID = ival </literal></term>
!       <listitem><para> Unique ID of the set whose objects should be transferred.  </para></listitem>
       </varlistentry>
       <varlistentry><term><literal> ORIGIN = ival </literal></term>
--- 1287,1294 ----
      <variablelist>
       <varlistentry><term><literal> ID = ival </literal></term>
!       <listitem><para> Unique ID of the set to contain the union of the two formerly separate sets.</para></listitem>
       </varlistentry>
       <varlistentry><term><literal> ADD ID = ival </literal></term>
!       <listitem><para> Unique ID of the set whose objects should be transferred into the above set.  </para></listitem>
       </varlistentry>
       <varlistentry><term><literal> ORIGIN = ival </literal></term>

Index: locking.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/locking.sgml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** locking.sgml	2 Aug 2006 18:34:59 -0000	1.10
--- locking.sgml	1 Aug 2008 19:25:41 -0000	1.11
***************
*** 14,18 ****
  can access <quote>old tuples.</quote> Most of the time, this allows
  the gentle user of &postgres; to not need to worry very much about
! locks. </para>
  
  <para> Unfortunately, there are several sorts of &slony1; events that
--- 14,21 ----
  can access <quote>old tuples.</quote> Most of the time, this allows
  the gentle user of &postgres; to not need to worry very much about
! locks.  &slony1; configuration events normally grab locks on an
! internal table, <envar>sl_config_lock</envar>, which should not be
! visible to applications unless they are performing actions on &slony1;
! components.  </para>
  
  <para> Unfortunately, there are several sorts of &slony1; events that