CVS User Account cvsuser
Wed Dec 22 23:10:20 PST 2004
Log Message:
-----------
Building of schemadoc.xml now removes the local schema name, (allow for better portability between developers), update the embeded references in faq to make use of this convention. add Id tages to all the sgml files.

Modified Files:
--------------
    slony1-engine/doc/adminguide:
        Makefile (r1.7 -> r1.8)
        addthings.sgml (r1.5 -> r1.6)
        adminscripts.sgml (r1.9 -> r1.10)
        app-slon.html (r1.1 -> r1.2)
        app-slonik.html (r1.1 -> r1.2)
        bookindex.sgml (r1.2 -> r1.3)
        cluster.html (r1.3 -> r1.4)
        cluster.sgml (r1.6 -> r1.7)
        concepts.html (r1.3 -> r1.4)
        concepts.sgml (r1.6 -> r1.7)
        ddlchanges.sgml (r1.5 -> r1.6)
        defineset.sgml (r1.7 -> r1.8)
        definingsets.html (r1.1 -> r1.2)
        dropthings.sgml (r1.6 -> r1.7)
        failover.sgml (r1.6 -> r1.7)
        faq.html (r1.3 -> r1.4)
        faq.sgml (r1.7 -> r1.8)
        firstdb.sgml (r1.6 -> r1.7)
        help.sgml (r1.6 -> r1.7)
        installation.html (r1.3 -> r1.4)
        installation.sgml (r1.6 -> r1.7)
        intro.sgml (r1.4 -> r1.5)
        legal.sgml (r1.3 -> r1.4)
        listenpaths.sgml (r1.7 -> r1.8)
        maintenance.sgml (r1.6 -> r1.7)
        monitoring.sgml (r1.6 -> r1.7)
        prerequisites.sgml (r1.6 -> r1.7)
        reference.sgml (r1.4 -> r1.5)
        requirements.html (r1.3 -> r1.4)
        reshape.sgml (r1.6 -> r1.7)
        schemadoc.xml (r1.2 -> r1.3)
        slon.sgml (r1.3 -> r1.4)
        slonik.sgml (r1.6 -> r1.7)
        slonik_ref.sgml (r1.6 -> r1.7)
        slony.sgml (r1.7 -> r1.8)
        slonyadmin.html (r1.1 -> r1.2)
        slonyintro.html (r1.1 -> r1.2)
        startslons.sgml (r1.5 -> r1.6)
        subscribenodes.sgml (r1.6 -> r1.7)

-------------- next part --------------
Index: requirements.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/requirements.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/requirements.html -Ldoc/adminguide/requirements.html -u -w -r1.3 -r1.4
--- doc/adminguide/requirements.html
+++ doc/adminguide/requirements.html
@@ -1,34 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
-> Requirements</TITLE
+>System Requirements</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="UP"
+TITLE="Slony-I Introduction"
 HREF="slonyintro.html"><LINK
 REL="PREVIOUS"
-HREF="slonyintro.html"><LINK
+TITLE=" Slony-I Communications
+Costs"
+HREF="slonylistenercosts.html"><LINK
 REL="NEXT"
 TITLE=" Slony-I Installation"
 HREF="installation.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
-CLASS="SECT1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
+CLASS="ARTICLE"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -39,29 +40,49 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="slonyintro.html"
+HREF="slonylistenercosts.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="introduction.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Fast Forward</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
 ><A
 HREF="installation.html"
 ACCESSKEY="N"
@@ -73,19 +94,31 @@
 ALIGN="LEFT"
 WIDTH="100%"></DIV
 ><DIV
+CLASS="ARTICLE"
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+><A
+NAME="REQUIREMENTS"
+>System Requirements</A
+></H1
+><HR></DIV
+><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="REQUIREMENTS"
->2. Requirements</A
+NAME="AEN113"
+>1. System Requirements</A
 ></H1
 ><P
->Any platform that can run PostgreSQL should be able to run
+>Any platform that can run
+PostgreSQL should be able to run
 <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
->.&#13;</P
+>.</P
 ><P
 >The platforms that have received specific testing at the time of
 this release are FreeBSD-4X-i368, FreeBSD-5X-i386, FreeBSD-5X-alpha,
@@ -97,7 +130,7 @@
 CLASS="TRADEMARK"
 >Solaris</SPAN
 >&#8482;-2.9-SPARC, AIX 5.1
-and OpenBSD-3.5-sparc64.&#13;</P
+and OpenBSD-3.5-sparc64.</P
 ><P
 >There have been reports of success at running
 <SPAN
@@ -118,48 +151,48 @@
 >e.g.</I
 ></SPAN
 > -
-<B
+<SPAN
 CLASS="APPLICATION"
 ><A
 HREF="app-slonik.html#SLONIK"
 > slonik </A
-></B
+></SPAN
 >,
-<B
+<SPAN
 CLASS="APPLICATION"
 ><A
 HREF="app-slon.html#SLON"
 > slon </A
-></B
+></SPAN
 >) do not
 run on <SPAN
 CLASS="TRADEMARK"
 >Windows</SPAN
->&#8482;, but a <B
+>&#8482;, but a <SPAN
 CLASS="APPLICATION"
 ><A
 HREF="app-slon.html#SLON"
 > slon </A
-></B
+></SPAN
 > running on one of the
 Unix-like systems has no reason to have difficulty connect to a
 PostgreSQL instance running on <SPAN
 CLASS="TRADEMARK"
 >Windows</SPAN
->&#8482;.&#13;</P
+>&#8482;.</P
 ><P
-> It ought to be possible to port <B
+> It ought to be possible to port <SPAN
 CLASS="APPLICATION"
 ><A
 HREF="app-slon.html#SLON"
 > slon </A
-></B
-> and <B
+></SPAN
+> and <SPAN
 CLASS="APPLICATION"
 ><A
 HREF="app-slonik.html#SLONIK"
 > slonik </A
-></B
+></SPAN
 > to run on
 <SPAN
 CLASS="TRADEMARK"
@@ -169,12 +202,12 @@
 CLASS="FILENAME"
 >pthreads</TT
 > implementation for
-<B
+<SPAN
 CLASS="APPLICATION"
 ><A
 HREF="app-slon.html#SLON"
 > slon </A
-></B
+></SPAN
 >, as it
 uses that to have multiple threads of execution.  There are reports of
 there being a <TT
@@ -191,13 +224,13 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN117"
->2.1. Software needed</A
+NAME="AEN144"
+>1.1. Software needed</A
 ></H2
 ><P
 ><P
 ></P
-><UL
+></P><UL
 ><LI
 ><P
 > GNU make.  Other make programs will not work.  GNU
@@ -215,15 +248,15 @@
 CLASS="COMMAND"
 >make version</TT
 >.  Version 3.76 or later
-will suffice; previous versions may not.&#13;</P
+will suffice; previous versions may not.</P
 ></LI
 ><LI
 ><P
 > You need an ISO/ANSI C compiler.  Recent versions of
-<B
+<SPAN
 CLASS="APPLICATION"
->GCC</B
-> work.&#13;</P
+>GCC</SPAN
+> work.</P
 ></LI
 ><LI
 ><P
@@ -238,7 +271,7 @@
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
 >
-depends on namespace support so you must have version 7.3.3 or newer
+depends on namespace support so you must have PostgreSQL version 7.3.3 or newer
 to be able to build and use <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
@@ -253,14 +286,14 @@
 > that works with version 7.2; if you
 desperately need that, look for him on the PostgreSQL Hackers mailing
 list.  It is not anticipated that 7.2 will be supported by any
-official <B
+official <SPAN
 CLASS="APPLICATION"
 ><SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
-></B
+></SPAN
 >
-release.&#13;</P
+release.</P
 ></LI
 ><LI
 ><P
@@ -274,7 +307,7 @@
 HREF="ftp://ftp.gnu.org/gnu"
 TARGET="_top"
 > ftp://ftp.gnu.org/gnu </A
-> .)&#13;</P
+> .)</P
 ></LI
 ><LI
 ><P
@@ -286,23 +319,22 @@
 > for a list.</P
 ></LI
 ></UL
->&#13;</P
+><P></P
 ><P
 >Also check to make sure you have sufficient disk space.  You
 will need approximately 5MB for the source tree during build and
-installation.&#13;</P
+installation.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN146"
->2.2. Getting <SPAN
+NAME="AEN173"
+>1.2. Getting <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
->
-Source</A
+>Source</A
 ></H2
 ><P
 >You can get the <SPAN
@@ -320,8 +352,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN152"
->2.3. Time Synchronization</A
+NAME="AEN179"
+>1.3. Time Synchronization</A
 ></H2
 ><P
 > All the servers used within the replication cluster need to
@@ -332,7 +364,7 @@
 CLASS="QUOTE"
 >"master"</SPAN
 >
-provider node as their time server.&#13;</P
+provider node as their time server.</P
 ><P
 > It is possible for <SPAN
 CLASS="PRODUCTNAME"
@@ -343,22 +375,22 @@
 CLASS="QUOTE"
 >"in sync"</SPAN
 > is usually pretty important for
-distributed applications.&#13;</P
+distributed applications.</P
 ><P
 > See <A
 HREF="http://www.ntp.org/"
 TARGET="_top"
 > www.ntp.org </A
 > for
-more details about NTP (Network Time Protocol).&#13;</P
+more details about NTP (Network Time Protocol).</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN161"
->2.4. Network Connectivity</A
+NAME="AEN188"
+>1.4. Network Connectivity</A
 ></H2
 ><P
 >It is necessary that the hosts that are to replicate between one
@@ -377,7 +409,7 @@
 >Slony-I</SPAN
 > cluster allow this sort of
 bidirection communications from any node in the cluster to any other
-node in the cluster.&#13;</P
+node in the cluster.</P
 ><P
 >Note that the network addresses need to be consistent across all
 of the nodes.  Thus, if there is any need to use a
@@ -394,33 +426,33 @@
 >Slony-I</SPAN
 >
 cluster, as the address is propagated throughout the cluster in table
-<CODE
+<TT
 CLASS="ENVAR"
->sl_path</CODE
->.&#13;</P
+>sl_path</TT
+>.</P
 ><P
 >A possible workaround for this, in environments where firewall
 rules are particularly difficult to implement, may be to establish SSH
 Tunnels that are created on each host that allow remote access through
-IP address 127.0.0.1, with a different port for each destination.&#13;</P
+IP address 127.0.0.1, with a different port for each destination.</P
 ><P
-> Note that <B
+> Note that <SPAN
 CLASS="APPLICATION"
->slonik</B
+>slonik</SPAN
 > and the
-<B
+<SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 > instances need no special connections
 or protocols to communicate with one another; they just need to be
-able to get access to the <B
+able to get access to the <SPAN
 CLASS="APPLICATION"
->PostgreSQL</B
+>PostgreSQL</SPAN
 >
 databases, connecting as a <SPAN
 CLASS="QUOTE"
 >"superuser"</SPAN
->.&#13;</P
+>.</P
 ><P
 > An implication of the communications model is that the entire
 extended network in which a <SPAN
@@ -451,7 +483,7 @@
 >Slony-I</SPAN
 > node at a branch
 location that can't be kept secure compromises security for the
-cluster.&#13;</P
+cluster.</P
 ><P
 >In the future plans is a feature whereby updates for a
 particular replication set would be serialized via a scheme called
@@ -481,6 +513,7 @@
 > nodes.</P
 ></DIV
 ></DIV
+></DIV
 ><DIV
 CLASS="NAVFOOTER"
 ><HR
@@ -497,7 +530,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="slonyintro.html"
+HREF="slonylistenercosts.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -506,7 +539,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -525,7 +558,11 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
-></TD
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Communications
+Costs</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
Index: defineset.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/defineset.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ldoc/adminguide/defineset.sgml -Ldoc/adminguide/defineset.sgml -u -w -r1.7 -r1.8
--- doc/adminguide/defineset.sgml
+++ doc/adminguide/defineset.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <sect1 id="definingsets">
 <title>Defining Slony-I Replication Sets</title>
 
Index: adminscripts.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/adminscripts.sgml,v
retrieving revision 1.9
retrieving revision 1.10
diff -Ldoc/adminguide/adminscripts.sgml -Ldoc/adminguide/adminscripts.sgml -u -w -r1.9 -r1.10
--- doc/adminguide/adminscripts.sgml
+++ doc/adminguide/adminscripts.sgml
@@ -1,4 +1,5 @@
-<!-- $Id -->
+<!-- $Id$ -->
+<article>
 <sect1 id="altperl">
 <title>Slony-I Administration Scripts</title>
 
@@ -221,6 +222,7 @@
 works.</para>
 </sect2>
 </sect1>
+</article>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode:sgml
Index: slonyintro.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slonyintro.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldoc/adminguide/slonyintro.html -Ldoc/adminguide/slonyintro.html -u -w -r1.1 -r1.2
--- doc/adminguide/slonyintro.html
+++ doc/adminguide/slonyintro.html
@@ -1,33 +1,31 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >Slony-I Introduction</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="NEXT"
-TITLE=" Requirements"
-HREF="requirements.html"><LINK
+TITLE="Introduction to Slony-I"
+HREF="introduction.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
-CLASS="ARTICLE"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
+CLASS="PART"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -38,31 +36,51 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="index.html#AEN4"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="requirements.html"
+HREF="commandreferencec.html"
+>Fast Forward</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="introduction.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -72,16 +90,18 @@
 ALIGN="LEFT"
 WIDTH="100%"></DIV
 ><DIV
-CLASS="ARTICLE"
+CLASS="PART"
+><A
+NAME="SLONYINTRO"
+></A
 ><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
-><A
-NAME="SLONYINTRO"
->Slony-I Introduction</A
-></H1
-><HR></DIV
+>I. <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Introduction</H1
 ><DIV
 CLASS="TOC"
 ><DL
@@ -90,295 +110,132 @@
 >Table of Contents</B
 ></DT
 ><DT
+><A
+HREF="introduction.html"
+>Introduction to <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+></A
+></DT
+><DD
+><DL
+><DT
 >1. <A
-HREF="slonyintro.html#INTRODUCTION"
->Introduction to Slony-I</A
+HREF="introduction.html#AEN31"
+>Why yet another replication system?</A
 ></DT
 ><DT
 >2. <A
-HREF="requirements.html"
->Requirements</A
+HREF="x35.html"
+>What <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> is</A
 ></DT
 ><DT
 >3. <A
+HREF="x51.html"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> is not</A
+></DT
+><DT
+>4. <A
+HREF="x64.html"
+>Why doesn't <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> do automatic fail-over/promotion?</A
+></DT
+><DT
+>5. <A
+HREF="x72.html"
+>Current Limitations</A
+></DT
+><DT
+>6. <A
+HREF="slonylistenercosts.html"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Communications
+Costs</A
+></DT
+></DL
+></DD
+><DT
+><A
+HREF="requirements.html"
+>System Requirements</A
+></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="requirements.html#AEN113"
+>System Requirements</A
+></DT
+></DL
+></DD
+><DT
+><A
 HREF="installation.html"
 >Slony-I Installation</A
 ></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="installation.html#AEN218"
+>Slony-I Installation</A
+></DT
+><DT
+>2. <A
+HREF="x225.html"
+>Short Version</A
+></DT
+><DT
+>3. <A
+HREF="x229.html"
+>Configuration</A
+></DT
 ><DT
 >4. <A
-HREF="concepts.html"
->Slony-I Concepts</A
+HREF="x238.html"
+>Example</A
 ></DT
 ><DT
 >5. <A
+HREF="x244.html"
+>Build</A
+></DT
+><DT
+>6. <A
+HREF="x253.html"
+>Installing Slony-I</A
+></DT
+><DT
+>7. <A
+HREF="concepts.html"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Concepts</A
+></DT
+><DT
+>8. <A
 HREF="cluster.html"
 >Defining Slony-I Clusters</A
 ></DT
 ><DT
->6. <A
+>9. <A
 HREF="definingsets.html"
->Defining Slony-I Replication
-Sets</A
+>Defining Slony-I Replication Sets</A
 ></DT
 ></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="INTRODUCTION"
->1. Introduction to Slony-I</A
-></H1
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN28"
->1.1. Why yet another replication system?</A
-></H2
-><P
->Slony-I was born from an idea to create a replication system that was not tied
-to a specific version of PostgreSQL, which is allowed to be started and stopped on
-an existing database with out the need for a dump/reload cycle.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN31"
->1.2. What Slony-I is</A
-></H2
-><P
->Slony-I is a <SPAN
-CLASS="QUOTE"
->"master to multiple slaves"</SPAN
-> replication
-system supporting cascading and slave promotion.  The big picture for
-the development of Slony-I is as a master-slave system that includes
-all features and capabilities needed to replicate large databases to a
-reasonably limited number of slave systems.  <SPAN
-CLASS="QUOTE"
->"Reasonable,"</SPAN
-> in this
-context, is probably no more than a few dozen servers.  If the number
-of servers grows beyond that, the cost of communications becomes
-prohibitively high.</P
-><P
-> See also <A
-HREF="slonyintro.html#SLONYLISTENERCOSTS"
-> SlonyListenerCosts</A
-> for a further analysis.</P
-><P
-> Slony-I is a system intended for data centers and backup sites,
-where the normal mode of operation is that all nodes are available all
-the time, and where all nodes can be secured.  If you have nodes that
-are likely to regularly drop onto and off of the network, or have
-nodes that cannot be kept secure, Slony-I may not be the ideal
-replication solution for you.</P
-><P
-> There are plans for a <SPAN
-CLASS="QUOTE"
->"file-based log shipping"</SPAN
->
-extension where updates would be serialized into files.  Given that,
-log files could be distributed by any means desired without any need
-of feedback between the provider node and those nodes subscribing via
-<SPAN
-CLASS="QUOTE"
->"log shipping."</SPAN
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN42"
->1.3. Slony-I is not</A
-></H2
-><P
->Slony-I is not a network management system.</P
-><P
-> Slony-I does not have any functionality within it to detect a
-node failure, or automatically promote a node to a master or other
-data origin.</P
-><P
->Slony-I is not multi-master; it's not a connection broker, and
-it doesn't make you coffee and toast in the morning.</P
-><P
->(That being said, the plan is for a subsequent system, Slony-II,
-to provide "multimaster" capabilities, and be "bootstrapped" using
-Slony-I.  But that is a separate project, and expectations for Slony-I
-should not be based on hopes for future projects.)</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN48"
->1.4. Why doesn't Slony-I do automatic fail-over/promotion?</A
-></H2
-><P
->This is the job of network monitoring software, not Slony.
-Every site's configuration and fail-over path is different.  For
-example, keep-alive monitoring with redundant NIC's and intelligent HA
-switches that guarantee race-condition-free takeover of a network
-address and disconnecting the <SPAN
-CLASS="QUOTE"
->"failed"</SPAN
-> node vary in every
-network setup, vendor choice, hardware/software combination.  This is
-clearly the realm of network management software and not
-Slony-I.</P
-><P
->Let Slony-I do what it does best: provide database replication.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN53"
->1.5. Current Limitations</A
-></H2
-><P
->Slony-I does not automatically propagate schema changes, nor
-does it have any ability to replicate large objects.  There is a
-single common reason for these limitations, namely that Slony-I
-operates using triggers, and neither schema changes nor large object
-operations can raise triggers suitable to tell Slony-I when those
-kinds of changes take place.</P
-><P
->There is a capability for Slony-I to propagate DDL changes if
-you submit them as scripts via the <B
-CLASS="APPLICATION"
->slonik</B
->
-<TT
-CLASS="COMMAND"
->EXECUTE SCRIPT</TT
-> operation.  That is not
-<SPAN
-CLASS="QUOTE"
->"automatic;"</SPAN
-> you have to construct an SQL DDL script and submit
-it.</P
-><P
->If you have those sorts of requirements, it may be worth
-exploring the use of <B
-CLASS="APPLICATION"
->PostgreSQL</B
-> 8.0 PITR (Point In Time
-Recovery), where <ACRONYM
-CLASS="ACRONYM"
->WAL</ACRONYM
-> logs are replicated to remote
-nodes.  Unfortunately, that has two attendant limitations:
-
-<P
-></P
-><UL
-><LI
-><P
-> PITR replicates <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all</I
-></SPAN
-> changes in
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all</I
-></SPAN
-> databases; you cannot exclude data that isn't
-relevant;</P
-></LI
-><LI
-><P
-> A PITR replica remains dormant until you apply logs
-and start up the database.  You cannot use the database and apply
-updates simultaneously.  It is like having a <SPAN
-CLASS="QUOTE"
->"standby
-server"</SPAN
-> which cannot be used without it ceasing to be
-<SPAN
-CLASS="QUOTE"
->"standby."</SPAN
-></P
-></LI
-></UL
-></P
-><P
->There are a number of distinct models for database replication;
-it is impossible for one replication system to be all things to all
-people.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="SLONYLISTENERCOSTS"
->1.6. Slony-I Communications
-Costs</A
-></H2
-><P
->The cost of communications grows in a quadratic fashion in
-several directions as the number of replication nodes in a cluster
-increases.  Note the following relationships:
-
-<P
-></P
-><UL
-><LI
-><P
-> It is necessary to have a sl_path entry allowing
-connection from each node to every other node.  Most will normally not
-need to be used for a given replication configuration, but this means
-that there needs to be n(n-1) paths.  It is probable that there will
-be considerable repetition of entries, since the path to "node n" is
-likely to be the same from everywherein the network.</P
-></LI
-><LI
-><P
-> It is similarly necessary to have a sl_listen entry
-indicating how data flows from every node to every other node.  This
-again requires configuring n(n-1) "listener paths."</P
-></LI
-><LI
-><P
-> Each SYNC applied needs to be reported back to all of
-the other nodes participating in the set so that the nodes all know
-that it is safe to purge sl_log_1 and sl_log_2 data, as any
-<SPAN
-CLASS="QUOTE"
->"forwarding"</SPAN
-> node could potentially take over as <SPAN
-CLASS="QUOTE"
->"master"</SPAN
->
-at any time.  One might expect SYNC messages to need to travel through
-n/2 nodes to get propagated to their destinations; this means that
-each SYNC is expected to get transmitted n(n/2) times.  Again, this
-points to a quadratic growth in communications costs as the number of
-nodes increases.</P
-></LI
-></UL
-></P
-><P
->This points to it being a bad idea to have the large
-communications network resulting from the number of nodes being large.
-Up to a half dozen nodes seems pretty reasonable; every time the
-number of nodes doubles, this can be expected to quadruple
-communications overheads.</P
+></DD
+></DL
 ></DIV
 ></DIV
 ></DIV
@@ -398,7 +255,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -407,7 +264,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -416,7 +273,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="requirements.html"
+HREF="introduction.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -426,7 +283,10 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Slony-I 1.1 Administration</TD
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -436,7 +296,10 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Requirements</TD
+>Introduction to <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+></TD
 ></TR
 ></TABLE
 ></DIV
Index: maintenance.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/maintenance.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/maintenance.sgml -Ldoc/adminguide/maintenance.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/maintenance.sgml
+++ doc/adminguide/maintenance.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="maintenance"> <title>Slony-I Maintenance</title>
 
Index: firstdb.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/firstdb.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/firstdb.sgml -Ldoc/adminguide/firstdb.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/firstdb.sgml
+++ doc/adminguide/firstdb.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="firstdb"><title>Replicating Your First Database</title>
 
Index: bookindex.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/bookindex.sgml,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldoc/adminguide/bookindex.sgml -Ldoc/adminguide/bookindex.sgml -u -w -r1.2 -r1.3
--- doc/adminguide/bookindex.sgml
+++ doc/adminguide/bookindex.sgml
@@ -1,6 +1,37 @@
-<!-- $Id -->
-<index>
+<index id='bookindex'>
 
 <!-- This file was produced by collateindex.pl.         -->
 <!-- Remove this comment if you edit this file by hand! -->
+<!-- ULINK is abused here.
+
+      The URL attribute holds the URL that points from the index entry
+      back to the appropriate place in the output produced by the HTML
+      stylesheet. (It's much easier to calculate this URL in the first
+      pass.)
+
+      The Role attribute holds the ID (either real or manufactured) of
+      the corresponding INDEXTERM.  This is used by the print backends
+      to produce page numbers.
+
+      The entries below are sorted and collated into the correct order.
+      Duplicates may be removed in the HTML backend, but in the print
+      backends, it is impossible to suppress duplicate pages or coalesce
+      sequences of pages into a range.
+-->
+
+<indexdiv><title>S</title>
+
+<indexentry>
+  <primaryie>slon,
+    <ulink url="app-slon.html" role="app-slon">slon</ulink>
+  </primaryie>
+</indexentry>
+
+<indexentry>
+  <primaryie>slonik,
+    <ulink url="app-slonik.html" role="app-slonik">slonik</ulink>
+  </primaryie>
+</indexentry>
+
+</indexdiv>
 </index>
Index: app-slon.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/app-slon.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldoc/adminguide/app-slon.html -Ldoc/adminguide/app-slon.html -u -w -r1.1 -r1.2
--- doc/adminguide/app-slon.html
+++ doc/adminguide/app-slon.html
@@ -1,36 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >slon</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="UP"
-TITLE="Slony-I Commands"
-HREF="slony-commands.html"><LINK
+TITLE="Slony-I binaries"
+HREF="c383.html"><LINK
 REL="PREVIOUS"
-TITLE="Slony-I Commands"
-HREF="slony-commands.html"><LINK
+TITLE="Slony-I binaries"
+HREF="c383.html"><LINK
 REL="NEXT"
 TITLE="slonik"
 HREF="app-slonik.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
 CLASS="REFENTRY"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -41,29 +39,49 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="slony-commands.html"
+HREF="c383.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="c383.html#AEN383"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
+><A
+HREF="app-slonik.html"
+>Fast Forward</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
 ><A
 HREF="app-slonik.html"
 ACCESSKEY="N"
@@ -78,29 +96,32 @@
 ><A
 NAME="APP-SLON"
 ></A
-><B
+><SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 ></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN343"
+NAME="AEN392"
 ></A
 ><H2
 >Name</H2
-><B
+><SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 >&nbsp;--&nbsp;      <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
 > daemon
     </DIV
+><A
+NAME="AEN397"
+></A
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN350"
+NAME="AEN399"
 ></A
 ><H2
 >Synopsis</H2
@@ -108,35 +129,28 @@
 ><TT
 CLASS="COMMAND"
 >slon</TT
-> [<TT
+> [<VAR
 CLASS="REPLACEABLE"
-><I
->option</I
-></TT
->...] [<TT
+>option</VAR
+>...] [<VAR
 CLASS="REPLACEABLE"
-><I
->clustername</I
-></TT
->
-    [<TT
+>clustername</VAR
+>] [<VAR
 CLASS="REPLACEABLE"
-><I
->conninfo</I
-></TT
->]]</P
+>conninfo</VAR
+>]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN359"
+NAME="AEN408"
 ></A
 ><H2
 >Description</H2
 ><P
->     <B
+>			<SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 > is the daemon application that
      <SPAN
 CLASS="QUOTE"
@@ -145,9 +159,9 @@
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
 >
-     replication.  A <B
+			replication.  A <SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 > instance must be
      run for each node in a <SPAN
 CLASS="PRODUCTNAME"
@@ -169,20 +183,18 @@
 CLASS="VARIABLELIST"
 ><DL
 ><DT
-><CODE
+><TT
 CLASS="OPTION"
->-d <TT
+>-d</TT
+><VAR
 CLASS="REPLACEABLE"
-><I
->debuglevel</I
-></TT
-></CODE
-></DT
+>debuglevel</VAR
+>&#60;//arg&#62;</DT
 ><DD
 ><P
->      Specifies the level of verbosity that <B
+>						Specifies the level of verbosity that <SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 > should
       use when logging its activity.
       </P
@@ -190,75 +202,65 @@
 >The eight levels of logging are:
       <P
 ></P
-><UL
+></P><UL
 ><LI
 ><P
->Error
-       </P
+>Error</P
 ></LI
 ><LI
 ><P
->Warn
-       </P
+>Warn</P
 ></LI
 ><LI
 ><P
->Config
-       </P
+>Config</P
 ></LI
 ><LI
 ><P
->Info
-       </P
+>Info</P
 ></LI
 ><LI
 ><P
->Debug1
-       </P
+>Debug1</P
 ></LI
 ><LI
 ><P
->Debug2
-       </P
+>Debug2</P
 ></LI
 ><LI
 ><P
->Debug3
-       </P
+>Debug3</P
 ></LI
 ><LI
 ><P
->Debug4
-      </P
+>Debug4</P
 ></LI
 ></UL
->
+><P>
     </P
 ></DD
 ><DT
-><CODE
+><TT
 CLASS="OPTION"
->-s <TT
+>-s</TT
+><VAR
 CLASS="REPLACEABLE"
-><I
->SYNC check interval</I
-></TT
-></CODE
-></DT
+>SYNC check interval</VAR
+>&#60;//arg&#62;</DT
 ><DD
 ><P
 >      Specifies the interval, in milliseconds, in which
-      <B
+						<SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 > should add a SYNC even if none has been
       mandated by data creation.  Default is 10000 ms.
      </P
 ><P
 >Short sync times keep the master on a <SPAN
 CLASS="QUOTE"
->"short leash,"</SPAN
->
+>"short leash"</SPAN
+>,
       updating the slaves more frequently.  If you have replicated
       sequences that are frequently updated <SPAN
 CLASS="emphasis"
@@ -275,34 +277,30 @@
 >no</I
 ></SPAN
 >
-      syncs take place.
+						syncs take place
     </P
 ></DD
 ><DT
-><CODE
+><TT
 CLASS="OPTION"
->-t <TT
+>-t</TT
+><VAR
 CLASS="REPLACEABLE"
-><I
->SYNC interval timeout</I
-></TT
-></CODE
-></DT
+>SYNC interval timeout</VAR
+>&#60;//arg&#62;</DT
 ><DD
 ><P
 >      Default is 60000 ms.
       </P
 ></DD
 ><DT
-><CODE
+><TT
 CLASS="OPTION"
->-g <TT
+>-g</TT
+><VAR
 CLASS="REPLACEABLE"
-><I
->group size</I
-></TT
-></CODE
-></DT
+>group size</VAR
+>&#60;//arg&#62;</DT
 ><DD
 ><P
 >      Maximum SYNC group size; defaults to 6.  Thus, if a particular
@@ -319,22 +317,22 @@
       have plenty of memory, it would be reasonable to increase this,
       as it will increase the amount of work done in each transaction,
       and will allow a subscriber that is behind by a lot to catch up
-      more quickly.</P
+						more quickly.
+					</P
 ><P
 >Slon processes usually stay pretty small; even with large
       value for this option, slon would be expected to only grow to a
-      few MB in size.</P
+						few MB in size.
+					</P
 ></DD
 ><DT
-><CODE
+><TT
 CLASS="OPTION"
->-c <TT
+>-c</TT
+><VAR
 CLASS="REPLACEABLE"
-><I
->cleanup cycles</I
-></TT
-></CODE
-></DT
+>cleanup cycles</VAR
+>&#60;//arg&#62;</DT
 ><DD
 ><P
 >      How often to <TT
@@ -344,52 +342,47 @@
      </P
 ><P
 >Set this to zero to disable slon-initiated vacuuming.  If
-      you are using something like
-      <B
+						you are using something like <SPAN
 CLASS="APPLICATION"
->pg_autovacuum</B
-> to initiate vacuums, you
-      may not need for slon to initiate vacuums itself.  If you are
-      not, there are some tables Slony-I uses that collect a
+>pg_autovacuum</SPAN
+>
+						to initiate vacuums, you may not need for slon to initiate vacuums itself.
+						If you are not, there are some tables Slony-I uses that collect a
       <SPAN
 CLASS="emphasis"
 ><I
 CLASS="EMPHASIS"
 >lot</I
 ></SPAN
-> of dead tuples that should be vacuumed
-      frequently.</P
+> of dead tuples that should be vacuumed frequently.
+					</P
 ></DD
 ><DT
-><CODE
+><TT
 CLASS="OPTION"
->-p <TT
+>-p</TT
+><VAR
 CLASS="REPLACEABLE"
-><I
->PID filename</I
-></TT
-></CODE
-></DT
+>PID filename</VAR
+>&#60;//arg&#62;</DT
 ><DD
 ><P
 >      PID filename.
       </P
 ></DD
 ><DT
-><CODE
+><TT
 CLASS="OPTION"
->-f <TT
+>-f</TT
+><VAR
 CLASS="REPLACEABLE"
-><I
->config file</I
-></TT
-></CODE
-></DT
+>config file</VAR
+>&#60;//arg&#62;</DT
 ><DD
 ><P
->      File containing <B
+>						File containing <SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 > configuration.
       </P
 ></DD
@@ -399,14 +392,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN444"
+NAME="AEN493"
 ></A
 ><H2
 >Exit Status</H2
 ><P
->   <B
+>			<SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 > returns 0 to the shell if it
    finished normally.  It returns -1 if it encounters any fatal error.
   </P
@@ -427,7 +420,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="slony-commands.html"
+HREF="c383.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -436,7 +429,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -455,13 +448,16 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Slony-I Commands</TD
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> binaries</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony-commands.html"
+HREF="c383.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
@@ -469,9 +465,9 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
-><B
+><SPAN
 CLASS="APPLICATION"
->slonik</B
+>slonik</SPAN
 ></TD
 ></TR
 ></TABLE
Index: prerequisites.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/prerequisites.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/prerequisites.sgml -Ldoc/adminguide/prerequisites.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/prerequisites.sgml
+++ doc/adminguide/prerequisites.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article id="requirements">
 <title>System Requirements</title>
 
Index: concepts.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/concepts.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/concepts.html -Ldoc/adminguide/concepts.html -u -w -r1.3 -r1.4
--- doc/adminguide/concepts.html
+++ doc/adminguide/concepts.html
@@ -1,35 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >Slony-I Concepts</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="UP"
-HREF="slonyintro.html"><LINK
-REL="PREVIOUS"
 TITLE=" Slony-I Installation"
 HREF="installation.html"><LINK
+REL="PREVIOUS"
+TITLE=" Installing Slony-I"
+HREF="x253.html"><LINK
 REL="NEXT"
 TITLE="Defining Slony-I Clusters"
 HREF="cluster.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
 CLASS="SECT1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -40,29 +39,49 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="installation.html"
+HREF="x253.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
+>Slony-I Installation</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Fast Forward</A
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
 ><A
 HREF="cluster.html"
 ACCESSKEY="N"
@@ -79,147 +98,149 @@
 CLASS="SECT1"
 ><A
 NAME="CONCEPTS"
->4. Slony-I Concepts</A
+>7. <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Concepts</A
 ></H1
 ><P
->In order to set up a set of Slony-I replicas, it is necessary to
-understand the following major abstractions that it uses:
-
-<P
+>In order to set up a set of <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> replicas, it is necessary to
+understand the following major abstractions that it uses:</P
+><P
 ></P
 ><UL
 ><LI
 ><P
-> Cluster
-	</P
+>Cluster</P
 ></LI
 ><LI
 ><P
-> Node
-	</P
+>Node</P
 ></LI
 ><LI
 ><P
-> Replication Set
-	</P
+>Replication Set</P
 ></LI
 ><LI
 ><P
 > Origin, Providers and Subscribers</P
 ></LI
 ></UL
->&#13;</P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN241"
->4.1. Cluster</A
+NAME="AEN273"
+>7.1. Cluster</A
 ></H2
 ><P
->In Slony-I terms, a Cluster is a named set of PostgreSQL
-database instances; replication takes place between those databases.&#13;</P
+>In <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> terms, a Cluster is a named set of PostgreSQL
+database instances; replication takes place between those databases.</P
 ><P
->The cluster name is specified in each and every Slonik script via the directive:
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
+>The cluster name is specified in each and every Slonik script via the directive:</P
 ><PRE
 CLASS="PROGRAMLISTING"
 >    cluster name = 'something';</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
 ><P
->If the Cluster name is <CODE
+>If the Cluster name is <TT
 CLASS="ENVAR"
->something</CODE
->, then Slony-I will
-create, in each database instance in the cluster, the namespace/schema
-<CODE
+>something</TT
+>, then <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> will
+create, in each database instance in the cluster, the namespace/schema <TT
 CLASS="ENVAR"
->_something</CODE
->.&#13;</P
+>_something.</TT
+></P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN249"
->4.2. Node</A
+NAME="AEN283"
+>7.2. Node</A
 ></H2
 ><P
->A Slony-I Node is a named PostgreSQL database that will be participating in replication.  &#13;</P
+>A <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Node is a named PostgreSQL database that will be participating in replication.</P
 ><P
->It is defined, near the beginning of each Slonik script, using the directive:
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
+>It is defined, near the beginning of each Slonik script, using the directive:</P
 ><PRE
 CLASS="PROGRAMLISTING"
 >     NODE 1 ADMIN CONNINFO = 'dbname=testdb host=server1 user=slony';</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
 ><P
->The CONNINFO information indicates a string argument that will
-ultimately be passed to the <CODE
+>The <A
+HREF="admconninfo.html"
+><TT
+CLASS="COMMAND"
+>CONNINFO</TT
+></A
+>
+information indicates a string argument that will ultimately be passed
+to the <CODE
 CLASS="FUNCTION"
 >PQconnectdb()</CODE
-> libpq
-function.&#13;</P
+> libpq function.</P
+><P
+>Thus, a <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> cluster consists of:</P
 ><P
->Thus, a Slony-I cluster consists of:
-<P
 ></P
 ><UL
 ><LI
 ><P
-> A cluster name
-	</P
+> A cluster name</P
 ></LI
 ><LI
 ><P
-> A set of Slony-I nodes, each of which has a namespace based on that cluster name</P
+> A set of <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> nodes, each of which has a namespace based on that cluster name</P
 ></LI
 ></UL
->&#13;</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN262"
->4.3. Replication Set</A
+NAME="AEN301"
+>7.3. Replication Set</A
 ></H2
 ><P
 >A replication set is defined as a set of tables and sequences
-that are to be replicated between nodes in a Slony-I cluster.&#13;</P
+that are to be replicated between nodes in a <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> cluster.</P
 ><P
 >You may have several sets, and the <SPAN
 CLASS="QUOTE"
 >"flow"</SPAN
 > of replication does
-not need to be identical between those sets.&#13;</P
+not need to be identical between those sets.</P
 ></DIV
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN267"
->4.4. Origin, Providers and Subscribers</A
+NAME="AEN307"
+>7.4. Origin, Providers and Subscribers</A
 ></H2
 ><P
 >Each replication set has some origin node, which is the
@@ -235,22 +256,25 @@
 CLASS="QUOTE"
 >"master provider"</SPAN
 >; it is the main place from
-which data is provided.&#13;</P
+which data is provided.</P
 ><P
 >Other nodes in the cluster will subscribe to the replication
-set, indicating that they want to receive the data.&#13;</P
+set, indicating that they want to receive the data.</P
 ><P
 >The origin node will never be considered a <SPAN
 CLASS="QUOTE"
 >"subscriber."</SPAN
 >
 (Ignoring the case where the cluster is reshaped, and the origin is
-moved to another node.)  But Slony-I supports the notion of cascaded
+moved to another node.)  But <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> supports the notion of cascaded
 subscriptions, that is, a node that is subscribed to the origin may
 also behave as a <SPAN
 CLASS="QUOTE"
 >"provider"</SPAN
-> to other nodes in the cluster.&#13;</P
+> to other nodes in the cluster.</P
 ></DIV
 ></DIV
 ><DIV
@@ -269,7 +293,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="installation.html"
+HREF="x253.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -278,7 +302,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -297,13 +321,13 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Slony-I Installation</TD
+>Installing Slony-I</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slonyintro.html"
+HREF="installation.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
Index: slonyadmin.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slonyadmin.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldoc/adminguide/slonyadmin.html -Ldoc/adminguide/slonyadmin.html -u -w -r1.1 -r1.2
--- doc/adminguide/slonyadmin.html
+++ doc/adminguide/slonyadmin.html
@@ -1,33 +1,30 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 > Slony-I Administration </TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE="slonik"
-HREF="app-slonik.html"><LINK
+TITLE="WAIT FOR EVENT"
+HREF="stmtwaitevent.html"><LINK
 REL="NEXT"
-TITLE="Slon daemons"
-HREF="slonstart.html"><LINK
+HREF="t1741.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
-CLASS="ARTICLE"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
+CLASS="PART"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -38,31 +35,51 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="app-slonik.html"
+HREF="stmtwaitevent.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="commandreferencec.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
+><A
+HREF="faq.html"
+>Fast Forward</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
 ><A
-HREF="slonstart.html"
+HREF="t1741.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -72,16 +89,18 @@
 ALIGN="LEFT"
 WIDTH="100%"></DIV
 ><DIV
-CLASS="ARTICLE"
+CLASS="PART"
+><A
+NAME="SLONYADMIN"
+></A
 ><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
-><A
-NAME="SLONYADMIN"
->Slony-I Administration</A
-></H1
-><HR></DIV
+>III. <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Administration</H1
 ><DIV
 CLASS="TOC"
 ><DL
@@ -90,599 +109,191 @@
 >Table of Contents</B
 ></DT
 ><DT
+><A
+HREF="t1741.html"
+></A
+></DT
+><DD
+><DL
+><DT
 >1. <A
-HREF="slonyadmin.html#ALTPERL"
+HREF="t1741.html#ALTPERL"
 >Slony-I Administration Scripts</A
 ></DT
+></DL
+></DD
 ><DT
->2. <A
-HREF="slonstart.html"
+><A
+HREF="t1898.html"
+></A
+></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="t1898.html#SLONSTART"
 >Slon daemons</A
 ></DT
+></DL
+></DD
 ><DT
->3. <A
-HREF="subscribenodes.html"
+><A
+HREF="t1949.html"
+></A
+></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="t1949.html#SUBSCRIBENODES"
 >Subscribing Nodes</A
 ></DT
+></DL
+></DD
+><DT
+><A
+HREF="t1980.html"
+></A
+></DT
+><DD
+><DL
 ><DT
->4. <A
-HREF="monitoring.html"
+>1. <A
+HREF="t1980.html#MONITORING"
 >Monitoring</A
 ></DT
+></DL
+></DD
+><DT
+><A
+HREF="t2015.html"
+></A
+></DT
+><DD
+><DL
 ><DT
->5. <A
-HREF="maintenance.html"
+>1. <A
+HREF="t2015.html#MAINTENANCE"
 >Slony-I Maintenance</A
 ></DT
+></DL
+></DD
+><DT
+><A
+HREF="t2071.html"
+></A
+></DT
+><DD
+><DL
 ><DT
->6. <A
-HREF="reshape.html"
+>1. <A
+HREF="t2071.html#RESHAPE"
 >Reshaping a Cluster</A
 ></DT
+></DL
+></DD
 ><DT
->7. <A
-HREF="failover.html"
+><A
+HREF="t2103.html"
+></A
+></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="t2103.html#FAILOVER"
 >Doing switchover and failover with Slony-I</A
 ></DT
+></DL
+></DD
+><DT
+><A
+HREF="t2185.html"
+></A
+></DT
+><DD
+><DL
 ><DT
->8. <A
-HREF="listenpaths.html"
->Slony Listen Paths</A
+>1. <A
+HREF="t2185.html#LISTENPATHS"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> listen paths</A
 ></DT
+></DL
+></DD
 ><DT
->9. <A
-HREF="addthings.html"
+><A
+HREF="t2287.html"
+></A
+></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="t2287.html#ADDTHINGS"
 >Adding Things to Replication</A
 ></DT
+></DL
+></DD
 ><DT
->10. <A
-HREF="dropthings.html"
+><A
+HREF="t2313.html"
+></A
+></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="t2313.html#DROPTHINGS"
 >Dropping things from Slony Replication</A
 ></DT
+></DL
+></DD
+><DT
+><A
+HREF="t2409.html"
+></A
+></DT
+><DD
+><DL
 ><DT
->11. <A
-HREF="ddlchanges.html"
+>1. <A
+HREF="t2409.html#DDLCHANGES"
 >Database Schema Changes (DDL)</A
 ></DT
+></DL
+></DD
 ><DT
->12. <A
-HREF="firstdb.html"
->Replicating Your First Database</A
+><A
+HREF="t2447.html"
+></A
 ></DT
+><DD
+><DL
 ><DT
->13. <A
-HREF="help.html"
->More Slony-I Help</A
+>1. <A
+HREF="t2447.html#FIRSTDB"
+>Replicating Your First Database</A
 ></DT
 ></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
+></DD
+><DT
 ><A
-NAME="ALTPERL"
->1. Slony-I Administration Scripts</A
-></H1
-><P
->In the <TT
-CLASS="FILENAME"
->altperl</TT
-> directory in the <B
-CLASS="APPLICATION"
->CVS</B
->
-tree, there is a sizable set of <B
-CLASS="APPLICATION"
->Perl</B
-> scripts that may be
-used to administer a set of <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> instances, which
-support having arbitrary numbers of nodes.&#13;</P
-><P
->Most of them generate Slonik scripts that are then to be passed
-on to the <A
-HREF="app-slonik.html#SLONIK"
-> <B
-CLASS="APPLICATION"
->slonik</B
+HREF="t2563.html"
 > </A
-> utility
-to be submitted to all of the <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> nodes in a
-particular cluster.  At one time, this embedded running <A
-HREF="app-slonik.html#SLONIK"
-> slonik </A
-> on the slonik scripts.
-Unfortunately, this turned out to be a pretty large calibre
-<SPAN
-CLASS="QUOTE"
->"foot gun,"</SPAN
-> as minor typos on the command line led, on a couple
-of occasions, to pretty calamitous actions, so the behaviour has been
-changed so that the scripts simply submit output to standard output.
-An administrator should review the script <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->before</I
-></SPAN
-> submitting
-it to <A
-HREF="app-slonik.html#SLONIK"
-> slonik </A
->.&#13;</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN508"
->1.1. Node/Cluster Configuration - cluster.nodes</A
-></H2
-><P
->The UNIX environment variable <CODE
-CLASS="ENVAR"
->SLONYNODES</CODE
-> is used to
-determine what Perl configuration file will be used to control the
-shape of the nodes in a <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> cluster.&#13;</P
-><P
->What variables are set up...
-<P
-></P
-><UL
-><LI
-><P
-> <CODE
-CLASS="ENVAR"
->$SETNAME</CODE
->=orglogs;	# What is the name of the replication set?&#13;</P
-></LI
-><LI
-><P
-> <CODE
-CLASS="ENVAR"
->$LOGDIR</CODE
->='/opt/OXRS/log/LOGDBS';  # What is the base directory for logs?&#13;</P
-></LI
-><LI
-><P
-> <CODE
-CLASS="ENVAR"
->$SLON_BIN_PATH</CODE
->='/opt/dbs/pgsql74/bin';  # Where to look for slony binaries&#13;</P
-></LI
-><LI
-><P
-> <CODE
-CLASS="ENVAR"
->$APACHE_ROTATOR</CODE
->="/opt/twcsds004/OXRS/apache/rotatelogs";  # If set, where to find Apache log rotator</P
-></LI
-></UL
->&#13;</P
-><P
->You then define the set of nodes that are to be replicated using
-a set of calls to <CODE
-CLASS="FUNCTION"
->add_node()</CODE
->.&#13;</P
-><P
-><TT
-CLASS="COMMAND"
->  add_node (host =&#62; '10.20.30.40', dbname =&#62; 'orglogs', port =&#62; 5437,
-			  user =&#62; 'postgres', node =&#62; 4, parent =&#62; 1);</TT
-></P
-><P
->The set of parameters for <CODE
-CLASS="FUNCTION"
->add_node()</CODE
-> are thus:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->    my %PARAMS =   (host=&#62; undef,		# Host name
-    	   	dbname =&#62; 'template1',	# database name
-    		port =&#62; 5432,		# Port number
-    		user =&#62; 'postgres',	# user to connect as
-    		node =&#62; undef,		# node number
-    		password =&#62; undef,	# password for user
-    		parent =&#62; 1,		# which node is parent to this node
-    		noforward =&#62; undef	# shall this node be set up to forward results?
-    );</PRE
-></TD
-></TR
-></TABLE
->
-     </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN534"
->1.2. Set configuration - cluster.set1, cluster.set2</A
-></H2
-><P
->The UNIX environment variable <CODE
-CLASS="ENVAR"
->SLONYSET</CODE
-> is used to
-determine what Perl configuration file will be used to determine what
-objects will be contained in a particular replication set.&#13;</P
-><P
->Unlike <CODE
-CLASS="ENVAR"
->SLONYNODES</CODE
->, which is essential for
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->all</I
-></SPAN
-> of the <A
-HREF="app-slonik.html#SLONIK"
-> slonik</A
->-generating scripts, this only needs to be set when running
-<TT
-CLASS="FILENAME"
->create_set.pl</TT
->, as that is the only script used to
-control what tables will be in a particular replication set.</P
-><P
->What variables are set up...
-<P
-></P
-><UL
-><LI
-><P
-> $TABLE_ID = 44;	 </P
-><P
-> Each table must be identified by a unique number; this variable controls where numbering starts</P
-></LI
-><LI
-><P
-> @PKEYEDTABLES		&#13;</P
-><P
-> An array of names of tables to be replicated that have a
-defined primary key so that Slony-I can automatically select its key&#13;</P
-></LI
-><LI
-><P
-> %KEYEDTABLES&#13;</P
-><P
-> A hash table of tables to be replicated, where the hash index
-is the table name, and the hash value is the name of a unique not null
-index suitable as a "candidate primary key."&#13;</P
-></LI
-><LI
-><P
-> @SERIALTABLES&#13;</P
-><P
-> An array of names of tables to be replicated that have no
-candidate for primary key.  Slony-I will add a key field based on a
-sequence that Slony-I generates&#13;</P
-></LI
-><LI
-><P
-> @SEQUENCES&#13;</P
-><P
-> An array of names of sequences that are to be replicated&#13;</P
-></LI
-></UL
->&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN560"
->1.3. build_env.pl</A
-></H2
-><P
->Queries a database, generating output hopefully suitable for
-<TT
-CLASS="FILENAME"
->slon.env</TT
-> consisting of:
-<P
-></P
-><UL
-><LI
-><P
-> a set of <CODE
-CLASS="FUNCTION"
->add_node()</CODE
-> calls to configure the cluster</P
-></LI
-><LI
-><P
-> The arrays <CODE
-CLASS="ENVAR"
->@KEYEDTABLES</CODE
->, <CODE
-CLASS="ENVAR"
->@SERIALTABLES</CODE
->, and <CODE
-CLASS="ENVAR"
->@SEQUENCES</CODE
-></P
-></LI
-></UL
->&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN573"
->1.4. create_set.pl</A
-></H2
-><P
->This requires <CODE
-CLASS="ENVAR"
->SLONYSET</CODE
-> to be set as well as
-<CODE
-CLASS="ENVAR"
->SLONYNODES</CODE
->; it is used to generate the Slonik script to set up
-a replication set consisting of a set of tables and sequences that are
-to be replicated.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN578"
->1.5. drop_node.pl</A
-></H2
-><P
->Generates Slonik script to drop a node from a Slony-I cluster.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN581"
->1.6. drop_set.pl</A
-></H2
-><P
->Generates Slonik script to drop a replication set (<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->e.g.</I
-></SPAN
-> - set of tables and sequences) from a Slony-I cluster.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN585"
->1.7. failover.pl</A
-></H2
-><P
->Generates Slonik script to request failover from a dead node to some new origin&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN588"
->1.8. init_cluster.pl</A
-></H2
-><P
->Generates Slonik script to initialize a whole Slony-I cluster,
-including setting up the nodes, communications paths, and the listener
-routing.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN591"
->1.9. merge_sets.pl</A
-></H2
-><P
->Generates Slonik script to merge two replication sets together.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN594"
->1.10. move_set.pl</A
-></H2
-><P
->Generates Slonik script to move the origin of a particular set to a different node.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN597"
->1.11. replication_test.pl</A
-></H2
-><P
->Script to test whether Slony-I is successfully replicating data.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN600"
->1.12. restart_node.pl</A
-></H2
-><P
->Generates Slonik script to request the restart of a node.  This was
-particularly useful pre-1.0.5 when nodes could get snarled up when
-slon daemons died.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN603"
->1.13. restart_nodes.pl</A
-></H2
-><P
->Generates Slonik script to restart all nodes in the cluster.  Not
-particularly useful...&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN606"
->1.14. show_configuration.pl</A
-></H2
-><P
->Displays an overview of how the environment (e.g. - <CODE
-CLASS="ENVAR"
->SLONYNODES</CODE
->) is set
-to configure things.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN610"
->1.15. slon_kill.pl</A
-></H2
-><P
->Kills slony watchdog and all slon daemons for the specified set.  It
-only works if those processes are running on the local host, of
-course!&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN613"
->1.16. slon_pushsql.pl</A
-></H2
-><P
->Generates Slonik script to push DDL changes to a replication set.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN616"
->1.17. slon_start.pl</A
-></H2
-><P
->This starts a slon daemon for the specified cluster and node, and uses
-slon_watchdog.pl to keep it running.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN619"
->1.18. slon_watchdog.pl</A
-></H2
-><P
->Used by slon_start.pl...&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN622"
->1.19. slon_watchdog2.pl</A
-></H2
-><P
->This is a somewhat smarter watchdog; it monitors a particular Slony-I
-node, and restarts the slon process if it hasn't seen updates go in in
-20 minutes or more.&#13;</P
-><P
->This is helpful if there is an unreliable network connection such that
-the slon sometimes stops working without becoming aware of it...&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN626"
->1.20. subscribe_set.pl</A
-></H2
-><P
->Generates Slonik script to subscribe a particular node to a particular replication set.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN629"
->1.21. uninstall_nodes.pl</A
-></H2
-><P
->This goes through and drops the Slony-I schema from each node; use
-this if you want to destroy replication throughout a cluster.  This is
-a VERY unsafe script!&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN632"
->1.22. unsubscribe_set.pl</A
-></H2
-><P
->Generates Slonik script to unsubscribe a node from a replication set.&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN635"
->1.23. update_nodes.pl</A
-></H2
-><P
->Generates Slonik script to tell all the nodes to update the Slony-I
-functions.  This will typically be needed when you upgrade from one
-version of Slony-I to another.&#13;</P
+></DT
+><DD
+><DL
+><DT
+>1. <A
+HREF="t2563.html#HELP"
+>More Slony-I Help</A
+></DT
+></DL
+></DD
+></DL
 ></DIV
 ></DIV
 ></DIV
@@ -702,7 +313,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="app-slonik.html"
+HREF="stmtwaitevent.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -711,7 +322,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -720,7 +331,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="slonstart.html"
+HREF="t1741.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -730,10 +341,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
-><B
-CLASS="APPLICATION"
->slonik</B
-></TD
+>WAIT FOR EVENT</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -743,7 +351,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Slon daemons</TD
+></TD
 ></TR
 ></TABLE
 ></DIV
Index: faq.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/faq.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ldoc/adminguide/faq.sgml -Ldoc/adminguide/faq.sgml -u -w -r1.7 -r1.8
--- doc/adminguide/faq.sgml
+++ doc/adminguide/faq.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <qandaset>
 
 <qandaentry>
@@ -787,14 +787,14 @@
 Slonik command.  </para>
 
 <para> The function <link
-linkend="t1.function.altertableforreplication-integer">
+linkend="function.altertableforreplication-integer">
 altertableforreplication(table id) </link> prepares each table for
 replication.
 
 <itemizedlist>
 
 <listitem><para> On the origin node, this involves adding a trigger
-that uses the <link linkend="t1.function.logtrigger">
+that uses the <link linkend="function.logtrigger">
 <function>logTrigger</function>() </link> function to the
 table.</para>
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.7 -r1.8
--- doc/adminguide/Makefile
+++ doc/adminguide/Makefile
@@ -216,6 +216,9 @@
 	echo "drop schema $(TEMPSCHEMA);create schema $(TEMPSCHEMA);" | $(pgbindir)/psql $(TEMPDB) && \
 	cat $(XIDSQL) $(BASEFUNS) $(BASESQL) |  sed -e "s/@NAMESPACE@/$(TEMPSCHEMA)/g"  -e "s/@CLUSTERNAME@/$(TEMPSCHEMA)/g" | $(pgbindir)/psql $(TEMPDB) && \
 	$(PGAUTODOC) -d $(TEMPDB) -s $(TEMPSCHEMA) -t xml -f schemadoc ;\
+	sed -i.bak -e "s/$(TEMPSCHEMA)\.//g" \
+	  -e "s@<book.*>@@g" -e "s@</book.*>@@g" schemadoc.xml ;\
+	rm  schemadoc.xml.bak ;\
 	$(pgbindir)/dropdb $(TEMPDB) >/dev/null 2>&1 \
 	) || echo "unable to createdb $(TEMPDB)"
 
Index: reference.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/reference.sgml,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ldoc/adminguide/reference.sgml -Ldoc/adminguide/reference.sgml -u -w -r1.4 -r1.5
--- doc/adminguide/reference.sgml
+++ doc/adminguide/reference.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <chapter>
 	<title><productname>Slony-I</productname> binaries</title>
 	&slon;
Index: ddlchanges.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/ddlchanges.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ldoc/adminguide/ddlchanges.sgml -Ldoc/adminguide/ddlchanges.sgml -u -w -r1.5 -r1.6
--- doc/adminguide/ddlchanges.sgml
+++ doc/adminguide/ddlchanges.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="ddlchanges">
 <title>Database Schema Changes (DDL)</title>
Index: cluster.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/cluster.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/cluster.html -Ldoc/adminguide/cluster.html -u -w -r1.3 -r1.4
--- doc/adminguide/cluster.html
+++ doc/adminguide/cluster.html
@@ -1,36 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >Defining Slony-I Clusters</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="UP"
-HREF="slonyintro.html"><LINK
+TITLE="Slony-I Installation"
+HREF="installation.html"><LINK
 REL="PREVIOUS"
 TITLE="Slony-I Concepts"
 HREF="concepts.html"><LINK
 REL="NEXT"
-TITLE="Defining Slony-I Replication
-Sets"
+TITLE="Defining Slony-I Replication Sets"
 HREF="definingsets.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
 CLASS="SECT1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -41,29 +39,49 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
 HREF="concepts.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
+>Slony-I Installation</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Fast Forward</A
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
 ><A
 HREF="definingsets.html"
 ACCESSKEY="N"
@@ -80,36 +98,40 @@
 CLASS="SECT1"
 ><A
 NAME="CLUSTER"
->5. Defining Slony-I Clusters</A
+>8. Defining Slony-I Clusters</A
 ></H1
 ><P
 >A <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
-> cluster is the basic grouping of
-database instances in which replication takes place.  It consists of a
-set of <SPAN
+> cluster is the basic
+grouping of database instances in which replication takes place.  It
+consists of a set of <SPAN
 CLASS="PRODUCTNAME"
 >PostgreSQL</SPAN
-> database instances in which is defined
-a namespace specific to that cluster.&#13;</P
+> database
+instances in which is defined a namespace specific to that
+cluster.</P
 ><P
 >Each database instance in which replication is to take place is
-identified by a node number.&#13;</P
+identified by a node number.</P
 ><P
 >For a simple install, it may be reasonable for the origin to be
-node #1, and for the subscriber to be node #2.&#13;</P
+node #1, and for the subscriber to be node #2.</P
 ><P
 >Some planning should be done, in more complex cases, to ensure
 that the numbering system is kept sane, lest the administrators be
 driven insane.  The node numbers should be chosen to somehow
 correspond to the shape of the environment, as opposed to (say) the
-order in which nodes were initialized.&#13;</P
+order in which nodes were initialized.</P
 ><P
->It may be that in version 1.1, nodes will also have a "name"
-attribute, so that they may be given more mnemonic names.  In that
-case, the node numbers can be cryptic; it will be the node name that
-is used to organize the cluster.</P
+>It may be that in version 1.1, nodes will also have a
+<SPAN
+CLASS="QUOTE"
+>"name"</SPAN
+> attribute, so that they may be given more mnemonic names.
+In that case, the node numbers might remain somewhat cryptic; it will
+be the node name that is used to organize the cluster.</P
 ></DIV
 ><DIV
 CLASS="NAVFOOTER"
@@ -136,7 +158,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -155,13 +177,16 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Slony-I Concepts</TD
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Concepts</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slonyintro.html"
+HREF="installation.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
@@ -169,8 +194,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Defining Slony-I Replication
-Sets</TD
+>Defining Slony-I Replication Sets</TD
 ></TR
 ></TABLE
 ></DIV
Index: listenpaths.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/listenpaths.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ldoc/adminguide/listenpaths.sgml -Ldoc/adminguide/listenpaths.sgml -u -w -r1.7 -r1.8
--- doc/adminguide/listenpaths.sgml
+++ doc/adminguide/listenpaths.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="listenpaths"><title><productname>Slony-I</productname> listen paths</title>
 <note><para> If you are running version
Index: slon.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slon.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/slon.sgml -Ldoc/adminguide/slon.sgml -u -w -r1.3 -r1.4
--- doc/adminguide/slon.sgml
+++ doc/adminguide/slon.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <refentry id="app-slon">
 	<refmeta>
 		<refentrytitle id="app-slon-title"><application>slon</application></refentrytitle>
Index: slonik_ref.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slonik_ref.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/slonik_ref.sgml -Ldoc/adminguide/slonik_ref.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/slonik_ref.sgml
+++ doc/adminguide/slonik_ref.sgml
@@ -1,3 +1,4 @@
+<!-- $Id$ -->
 <article id="slonikcommands">
   <title>Slonik Command Summary</title>
   <sect1 id="slonikintro">
@@ -1886,7 +1887,7 @@
    </refsect1>
   </refentry>
  </reference>
-</article>
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode:sgml
Index: cluster.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/cluster.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/cluster.sgml -Ldoc/adminguide/cluster.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/cluster.sgml
+++ doc/adminguide/cluster.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <sect1 id="cluster">
 <title>Defining Slony-I Clusters</title>
 
Index: help.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/help.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/help.sgml -Ldoc/adminguide/help.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/help.sgml
+++ doc/adminguide/help.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="help">
 <title>More Slony-I Help</title>
Index: schemadoc.xml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/schemadoc.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldoc/adminguide/schemadoc.xml -Ldoc/adminguide/schemadoc.xml -u -w -r1.2 -r1.3
--- doc/adminguide/schemadoc.xml
+++ doc/adminguide/schemadoc.xml
@@ -1,11 +1,19 @@
 <!-- $Header$ -->
 
+
+
+
+
+
+  <chapter id="schema"
+           xreflabel="schemadoc">
+    <title>Schema schemadoc</title>
     <para></para>
 
 
-      <section id="schemadoc.table.sl-config-lock"
-               xreflabel="schemadoc.sl_config_lock">
-        <title id="schemadoc.table.sl-config-lock-title">
+      <section id="table.sl-config-lock"
+               xreflabel="sl_config_lock">
+        <title id="table.sl-config-lock-title">
          Table:
          
          <structname>sl_config_lock</structname>
@@ -55,9 +63,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-confirm"
-               xreflabel="schemadoc.sl_confirm">
-        <title id="schemadoc.table.sl-confirm-title">
+      <section id="table.sl-confirm"
+               xreflabel="sl_confirm">
+        <title id="table.sl-confirm-title">
          Table:
          
          <structname>sl_confirm</structname>
@@ -187,9 +195,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-event"
-               xreflabel="schemadoc.sl_event">
-        <title id="schemadoc.table.sl-event-title">
+      <section id="table.sl-event"
+               xreflabel="sl_event">
+        <title id="table.sl-event-title">
          Table:
          
          <structname>sl_event</structname>
@@ -289,7 +297,7 @@
             <varlistentry>
               <term><structfield>ev_minxid</structfield></term>
               <listitem><para>
-                <type>schemadoc.xxid</type>
+                <type>xxid</type>
 
 
 
@@ -309,7 +317,7 @@
             <varlistentry>
               <term><structfield>ev_maxxid</structfield></term>
               <listitem><para>
-                <type>schemadoc.xxid</type>
+                <type>xxid</type>
 
 
 
@@ -568,9 +576,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-listen"
-               xreflabel="schemadoc.sl_listen">
-        <title id="schemadoc.table.sl-listen-title">
+      <section id="table.sl-listen"
+               xreflabel="sl_listen">
+        <title id="table.sl-listen-title">
          Table:
          
          <structname>sl_listen</structname>
@@ -612,7 +620,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-node"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-node"/>
 
 
 
@@ -651,7 +659,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-path"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-path"/>
 
 
               </para>
@@ -688,7 +696,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-path"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-path"/>
 
 
               </para>
@@ -714,9 +722,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-log-1"
-               xreflabel="schemadoc.sl_log_1">
-        <title id="schemadoc.table.sl-log-1-title">
+      <section id="table.sl-log-1"
+               xreflabel="sl_log_1">
+        <title id="table.sl-log-1-title">
          Table:
          
          <structname>sl_log_1</structname>
@@ -758,7 +766,7 @@
             <varlistentry>
               <term><structfield>log_xid</structfield></term>
               <listitem><para>
-                <type>schemadoc.xxid</type>
+                <type>xxid</type>
 
 
 
@@ -865,9 +873,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-log-2"
-               xreflabel="schemadoc.sl_log_2">
-        <title id="schemadoc.table.sl-log-2-title">
+      <section id="table.sl-log-2"
+               xreflabel="sl_log_2">
+        <title id="table.sl-log-2-title">
          Table:
          
          <structname>sl_log_2</structname>
@@ -909,7 +917,7 @@
             <varlistentry>
               <term><structfield>log_xid</structfield></term>
               <listitem><para>
-                <type>schemadoc.xxid</type>
+                <type>xxid</type>
 
 
 
@@ -1016,9 +1024,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-node"
-               xreflabel="schemadoc.sl_node">
-        <title id="schemadoc.table.sl-node-title">
+      <section id="table.sl-node"
+               xreflabel="sl_node">
+        <title id="table.sl-node-title">
          Table:
          
          <structname>sl_node</structname>
@@ -1137,7 +1145,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-listen"/>
+              <xref linkend="table.sl-listen"/>
             </para>
           </listitem>
 
@@ -1145,7 +1153,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-path"/>
+              <xref linkend="table.sl-path"/>
             </para>
           </listitem>
 
@@ -1153,7 +1161,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-set"/>
+              <xref linkend="table.sl-set"/>
             </para>
           </listitem>
 
@@ -1161,7 +1169,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-setsync"/>
+              <xref linkend="table.sl-setsync"/>
             </para>
           </listitem>
 
@@ -1175,9 +1183,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-path"
-               xreflabel="schemadoc.sl_path">
-        <title id="schemadoc.table.sl-path-title">
+      <section id="table.sl-path"
+               xreflabel="sl_path">
+        <title id="table.sl-path-title">
          Table:
          
          <structname>sl_path</structname>
@@ -1219,7 +1227,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-node"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-node"/>
 
 
 
@@ -1256,7 +1264,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-node"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-node"/>
 
 
 
@@ -1327,7 +1335,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-listen"/>
+              <xref linkend="table.sl-listen"/>
             </para>
           </listitem>
 
@@ -1335,7 +1343,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-subscribe"/>
+              <xref linkend="table.sl-subscribe"/>
             </para>
           </listitem>
 
@@ -1349,9 +1357,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.view.sl-seqlastvalue"
-               xreflabel="schemadoc.sl_seqlastvalue">
-        <title id="schemadoc.view.sl-seqlastvalue-title">
+      <section id="view.sl-seqlastvalue"
+               xreflabel="sl_seqlastvalue">
+        <title id="view.sl-seqlastvalue-title">
          View:
          
          <structname>sl_seqlastvalue</structname>
@@ -1462,7 +1470,7 @@
 , sq.seq_set
 , sq.seq_reloid
 , s.set_origin AS seq_origin
-, schemadoc.sequencelastvalue
+, sequencelastvalue
 (
      (
            (quote_ident
@@ -1475,8 +1483,8 @@
            )
      )
 ) AS seq_last_value 
-FROM schemadoc.sl_sequence sq
-, schemadoc.sl_set s
+FROM sl_sequence sq
+, sl_set s
 , pg_class pgc
 , pg_namespace pgn 
 WHERE (
@@ -1493,9 +1501,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-seqlog"
-               xreflabel="schemadoc.sl_seqlog">
-        <title id="schemadoc.table.sl-seqlog-title">
+      <section id="table.sl-seqlog"
+               xreflabel="sl_seqlog">
+        <title id="table.sl-seqlog-title">
          Table:
          
          <structname>sl_seqlog</structname>
@@ -1620,9 +1628,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-sequence"
-               xreflabel="schemadoc.sl_sequence">
-        <title id="schemadoc.table.sl-sequence-title">
+      <section id="table.sl-sequence"
+               xreflabel="sl_sequence">
+        <title id="table.sl-sequence-title">
          Table:
          
          <structname>sl_sequence</structname>
@@ -1760,7 +1768,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-set"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-set"/>
 
 
               </para>
@@ -1806,9 +1814,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-set"
-               xreflabel="schemadoc.sl_set">
-        <title id="schemadoc.table.sl-set-title">
+      <section id="table.sl-set"
+               xreflabel="sl_set">
+        <title id="table.sl-set-title">
          Table:
          
          <structname>sl_set</structname>
@@ -1872,7 +1880,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-node"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-node"/>
 
 
               </para>
@@ -1887,7 +1895,7 @@
             <varlistentry>
               <term><structfield>set_locked</structfield></term>
               <listitem><para>
-                <type>schemadoc.xxid</type>
+                <type>xxid</type>
 
 
 
@@ -1939,7 +1947,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-sequence"/>
+              <xref linkend="table.sl-sequence"/>
             </para>
           </listitem>
 
@@ -1947,7 +1955,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-setsync"/>
+              <xref linkend="table.sl-setsync"/>
             </para>
           </listitem>
 
@@ -1955,7 +1963,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-subscribe"/>
+              <xref linkend="table.sl-subscribe"/>
             </para>
           </listitem>
 
@@ -1963,7 +1971,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-table"/>
+              <xref linkend="table.sl-table"/>
             </para>
           </listitem>
 
@@ -1977,9 +1985,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-setsync"
-               xreflabel="schemadoc.sl_setsync">
-        <title id="schemadoc.table.sl-setsync-title">
+      <section id="table.sl-setsync"
+               xreflabel="sl_setsync">
+        <title id="table.sl-setsync-title">
          Table:
          
          <structname>sl_setsync</structname>
@@ -2023,7 +2031,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-set"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-set"/>
 
 
               </para>
@@ -2051,7 +2059,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-node"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-node"/>
 
 
               </para>
@@ -2086,7 +2094,7 @@
             <varlistentry>
               <term><structfield>ssy_minxid</structfield></term>
               <listitem><para>
-                <type>schemadoc.xxid</type>
+                <type>xxid</type>
 
 
 
@@ -2106,7 +2114,7 @@
             <varlistentry>
               <term><structfield>ssy_maxxid</structfield></term>
               <listitem><para>
-                <type>schemadoc.xxid</type>
+                <type>xxid</type>
 
 
 
@@ -2177,9 +2185,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-subscribe"
-               xreflabel="schemadoc.sl_subscribe">
-        <title id="schemadoc.table.sl-subscribe-title">
+      <section id="table.sl-subscribe"
+               xreflabel="sl_subscribe">
+        <title id="table.sl-subscribe-title">
          Table:
          
          <structname>sl_subscribe</structname>
@@ -2223,7 +2231,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-set"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-set"/>
 
 
               </para>
@@ -2251,7 +2259,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-path"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-path"/>
 
 
               </para>
@@ -2288,7 +2296,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-path"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-path"/>
 
 
               </para>
@@ -2354,9 +2362,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-table"
-               xreflabel="schemadoc.sl_table">
-        <title id="schemadoc.table.sl-table-title">
+      <section id="table.sl-table"
+               xreflabel="sl_table">
+        <title id="table.sl-table-title">
          Table:
          
          <structname>sl_table</structname>
@@ -2494,7 +2502,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-set"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-set"/>
 
 
               </para>
@@ -2585,7 +2593,7 @@
 
           <listitem>
             <para>
-              <xref linkend="schemadoc.table.sl-trigger"/>
+              <xref linkend="table.sl-trigger"/>
             </para>
           </listitem>
 
@@ -2599,9 +2607,9 @@
       </para>
     </section>
 
-      <section id="schemadoc.table.sl-trigger"
-               xreflabel="schemadoc.sl_trigger">
-        <title id="schemadoc.table.sl-trigger-title">
+      <section id="table.sl-trigger"
+               xreflabel="sl_trigger">
+        <title id="table.sl-trigger-title">
          Table:
          
          <structname>sl_trigger</structname>
@@ -2645,7 +2653,7 @@
 
 
 
-                <literal>REFERENCES</literal> <xref linkend="schemadoc.table.sl-table"/>
+                <literal>REFERENCES</literal> <xref linkend="table.sl-table"/>
 
 
               </para>
@@ -2703,12 +2711,12 @@
 
 
 <!-- Function altertableforreplication( integer ) -->
-    <section id="schemadoc.function.altertableforreplication-integer"
+    <section id="function.altertableforreplication-integer"
              xreflabel="schemadocaltertableforreplication( integer )">
-      <title id="schemadoc.function.altertableforreplication-integer-title">
+      <title id="function.altertableforreplication-integer-title">
        altertableforreplication( integer )
       </title>
-      <titleabbrev id="schemadoc.function.altertableforreplication-integer-titleabbrev">
+      <titleabbrev id="function.altertableforreplication-integer-titleabbrev">
        altertableforreplication( integer )
       </titleabbrev>
 
@@ -2744,12 +2752,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Get our local node ID
 	-- ----
-	v_no_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_no_id := getLocalNodeId(&#39;_schemadoc&#39;);
 
 	-- ----
 	-- Get the sl_table row and the current origin of the table. 
@@ -2760,7 +2768,7 @@
 			&quot;pg_catalog&quot;.quote_ident(PGN.nspname) || &#39;.&#39; ||
 			&quot;pg_catalog&quot;.quote_ident(PGC.relname) as tab_fqname
 			into v_tab_row
-			from schemadoc.sl_table T, schemadoc.sl_set S,
+			from sl_table T, sl_set S,
 				&quot;pg_catalog&quot;.pg_class PGC, &quot;pg_catalog&quot;.pg_namespace PGN,
 				&quot;pg_catalog&quot;.pg_index PGX, &quot;pg_catalog&quot;.pg_class PGXC
 			where T.tab_id = p_tab_id
@@ -2780,7 +2788,7 @@
 				v_tab_fqname;
 	end if;
 
-	v_tab_attkind := schemadoc.determineAttKindUnique(v_tab_row.tab_fqname, 
+	v_tab_attkind := determineAttKindUnique(v_tab_row.tab_fqname, 
 						v_tab_row.tab_idxname);
 
 	execute &#39;lock table &#39; || v_tab_fqname || &#39; in access exclusive mode&#39;;
@@ -2795,7 +2803,7 @@
 		execute &#39;create trigger &quot;_schemadoc_logtrigger_&#39; || 
 				p_tab_id || &#39;&quot; after insert or update or delete on &#39; ||
 				v_tab_fqname || &#39; for each row execute procedure
-				schemadoc.logTrigger (&#39;&#39;_schemadoc&#39;&#39;, &#39;&#39;&#39; || 
+				logTrigger (&#39;&#39;_schemadoc&#39;&#39;, &#39;&#39;&#39; || 
 					p_tab_id || &#39;&#39;&#39;, &#39;&#39;&#39; || 
 					v_tab_attkind || &#39;&#39;&#39;);&#39;;
 	else
@@ -2812,8 +2820,8 @@
 				set tgrelid = v_tab_row.indexrelid
 				where tgrelid = v_tab_row.tab_reloid
 				and not exists (
-						select true from schemadoc.sl_table TAB,
-								schemadoc.sl_trigger TRIG
+						select true from sl_table TAB,
+								sl_trigger TRIG
 								where TAB.tab_reloid = tgrelid
 								and TAB.tab_id = TRIG.trig_tabid
 								and TRIG.trig_tgname = tgname
@@ -2844,13 +2852,13 @@
 		execute &#39;create trigger &quot;_schemadoc_denyaccess_&#39; || 
 				p_tab_id || &#39;&quot; before insert or update or delete on &#39; ||
 				v_tab_fqname || &#39; for each row execute procedure
-				schemadoc.denyAccess (&#39;&#39;_schemadoc&#39;&#39;);&#39;;
+				denyAccess (&#39;&#39;_schemadoc&#39;&#39;);&#39;;
 	end if;
 
 	-- ----
 	-- Mark the table altered in our configuration
 	-- ----
-	update schemadoc.sl_table
+	update sl_table
 			set tab_altered = true where tab_id = p_tab_id;
 
 	return p_tab_id;
@@ -2860,12 +2868,12 @@
     </section>
 
 <!-- Function altertablerestore( integer ) -->
-    <section id="schemadoc.function.altertablerestore-integer"
+    <section id="function.altertablerestore-integer"
              xreflabel="schemadocaltertablerestore( integer )">
-      <title id="schemadoc.function.altertablerestore-integer-title">
+      <title id="function.altertablerestore-integer-title">
        altertablerestore( integer )
       </title>
-      <titleabbrev id="schemadoc.function.altertablerestore-integer-titleabbrev">
+      <titleabbrev id="function.altertablerestore-integer-titleabbrev">
        altertablerestore( integer )
       </titleabbrev>
 
@@ -2900,12 +2908,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Get our local node ID
 	-- ----
-	v_no_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_no_id := getLocalNodeId(&#39;_schemadoc&#39;);
 
 	-- ----
 	-- Get the sl_table row and the current tables origin. Check
@@ -2916,7 +2924,7 @@
 			&quot;pg_catalog&quot;.quote_ident(PGN.nspname) || &#39;.&#39; ||
 			&quot;pg_catalog&quot;.quote_ident(PGC.relname) as tab_fqname
 			into v_tab_row
-			from schemadoc.sl_table T, schemadoc.sl_set S,
+			from sl_table T, sl_set S,
 				&quot;pg_catalog&quot;.pg_class PGC, &quot;pg_catalog&quot;.pg_namespace PGN,
 				&quot;pg_catalog&quot;.pg_index PGX, &quot;pg_catalog&quot;.pg_class PGXC
 			where T.tab_id = p_tab_id
@@ -2985,7 +2993,7 @@
 	-- ----
 	-- Mark the table not altered in our configuration
 	-- ----
-	update schemadoc.sl_table
+	update sl_table
 			set tab_altered = false where tab_id = p_tab_id;
 
 	return p_tab_id;
@@ -2995,12 +3003,12 @@
     </section>
 
 <!-- Function cleanupevent(  ) -->
-    <section id="schemadoc.function.cleanupevent"
+    <section id="function.cleanupevent"
              xreflabel="schemadoccleanupevent(  )">
-      <title id="schemadoc.function.cleanupevent-title">
+      <title id="function.cleanupevent-title">
        cleanupevent(  )
       </title>
-      <titleabbrev id="schemadoc.function.cleanupevent-titleabbrev">
+      <titleabbrev id="function.cleanupevent-titleabbrev">
        cleanupevent(  )
       </titleabbrev>
 
@@ -3029,10 +3037,10 @@
 	-- ----
 	-- First remove all but the oldest confirm row per origin,receiver pair
 	-- ----
-	delete from schemadoc.sl_confirm
-				where con_origin not in (select no_id from schemadoc.sl_node);
-	delete from schemadoc.sl_confirm
-				where con_received not in (select no_id from schemadoc.sl_node);
+	delete from sl_confirm
+				where con_origin not in (select no_id from sl_node);
+	delete from sl_confirm
+				where con_received not in (select no_id from sl_node);
 	-- ----
 	-- Next remove all but the oldest confirm row per origin,receiver pair.
 	-- Ignore confirmations that are younger than 10 minutes. We currently
@@ -3041,11 +3049,11 @@
 	-- that this led to log data that is needed again got removed.
 	-- ----
 	for v_max_row in select con_origin, con_received, max(con_seqno) as con_seqno
-				from schemadoc.sl_confirm
+				from sl_confirm
 				where con_timestamp &lt; (CURRENT_TIMESTAMP - &#39;10 min&#39;::interval)
 				group by con_origin, con_received
 	loop
-		delete from schemadoc.sl_confirm
+		delete from sl_confirm
 				where con_origin = v_max_row.con_origin
 				and con_received = v_max_row.con_received
 				and con_seqno &lt; v_max_row.con_seqno;
@@ -3056,16 +3064,16 @@
 	-- whole cluster up to the last SYNC
 	-- ----
 	for v_min_row in select con_origin, min(con_seqno) as con_seqno
-				from schemadoc.sl_confirm
+				from sl_confirm
 				group by con_origin
 	loop
 		select coalesce(max(ev_seqno), 0) into v_max_sync
-				from schemadoc.sl_event
+				from sl_event
 				where ev_origin = v_min_row.con_origin
 				and ev_seqno &lt;= v_min_row.con_seqno
 				and ev_type = &#39;SYNC&#39;;
 		if v_max_sync &gt; 0 then
-			delete from schemadoc.sl_event
+			delete from sl_event
 					where ev_origin = v_min_row.con_origin
 					and ev_seqno &lt; v_max_sync;
 		end if;
@@ -3078,12 +3086,12 @@
     </section>
 
 <!-- Function cleanuplistener(  ) -->
-    <section id="schemadoc.function.cleanuplistener"
+    <section id="function.cleanuplistener"
              xreflabel="schemadoccleanuplistener(  )">
-      <title id="schemadoc.function.cleanuplistener-title">
+      <title id="function.cleanuplistener-title">
        cleanuplistener(  )
       </title>
-      <titleabbrev id="schemadoc.function.cleanuplistener-titleabbrev">
+      <titleabbrev id="function.cleanuplistener-titleabbrev">
        cleanuplistener(  )
       </titleabbrev>
 
@@ -3105,12 +3113,12 @@
     </section>
 
 <!-- Function createevent( name, text ) -->
-    <section id="schemadoc.function.createevent-name-text"
+    <section id="function.createevent-name-text"
              xreflabel="schemadoccreateevent( name, text )">
-      <title id="schemadoc.function.createevent-name-text-title">
+      <title id="function.createevent-name-text-title">
        createevent( name, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-titleabbrev">
        createevent( name, text )
       </titleabbrev>
 
@@ -3134,12 +3142,12 @@
     </section>
 
 <!-- Function createevent( name, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text"
+    <section id="function.createevent-name-text-text"
              xreflabel="schemadoccreateevent( name, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-title">
+      <title id="function.createevent-name-text-text-title">
        createevent( name, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-titleabbrev">
        createevent( name, text, text )
       </titleabbrev>
 
@@ -3163,12 +3171,12 @@
     </section>
 
 <!-- Function createevent( name, text, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text-text"
+    <section id="function.createevent-name-text-text-text"
              xreflabel="schemadoccreateevent( name, text, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-text-title">
+      <title id="function.createevent-name-text-text-text-title">
        createevent( name, text, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-text-titleabbrev">
        createevent( name, text, text, text )
       </titleabbrev>
 
@@ -3192,12 +3200,12 @@
     </section>
 
 <!-- Function createevent( name, text, text, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text-text-text"
+    <section id="function.createevent-name-text-text-text-text"
              xreflabel="schemadoccreateevent( name, text, text, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-text-text-title">
+      <title id="function.createevent-name-text-text-text-text-title">
        createevent( name, text, text, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-text-text-titleabbrev">
        createevent( name, text, text, text, text )
       </titleabbrev>
 
@@ -3221,12 +3229,12 @@
     </section>
 
 <!-- Function createevent( name, text, text, text, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text-text-text-text"
+    <section id="function.createevent-name-text-text-text-text-text"
              xreflabel="schemadoccreateevent( name, text, text, text, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-text-text-text-title">
+      <title id="function.createevent-name-text-text-text-text-text-title">
        createevent( name, text, text, text, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-text-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-text-text-text-titleabbrev">
        createevent( name, text, text, text, text, text )
       </titleabbrev>
 
@@ -3250,12 +3258,12 @@
     </section>
 
 <!-- Function createevent( name, text, text, text, text, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text-text-text-text-text"
+    <section id="function.createevent-name-text-text-text-text-text-text"
              xreflabel="schemadoccreateevent( name, text, text, text, text, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-text-text-text-text-title">
+      <title id="function.createevent-name-text-text-text-text-text-text-title">
        createevent( name, text, text, text, text, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-text-text-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-text-text-text-text-titleabbrev">
        createevent( name, text, text, text, text, text, text )
       </titleabbrev>
 
@@ -3279,12 +3287,12 @@
     </section>
 
 <!-- Function createevent( name, text, text, text, text, text, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text-text-text-text-text-text"
+    <section id="function.createevent-name-text-text-text-text-text-text-text"
              xreflabel="schemadoccreateevent( name, text, text, text, text, text, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-title">
+      <title id="function.createevent-name-text-text-text-text-text-text-text-title">
        createevent( name, text, text, text, text, text, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-text-text-text-text-text-titleabbrev">
        createevent( name, text, text, text, text, text, text, text )
       </titleabbrev>
 
@@ -3308,12 +3316,12 @@
     </section>
 
 <!-- Function createevent( name, text, text, text, text, text, text, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-text"
+    <section id="function.createevent-name-text-text-text-text-text-text-text-text"
              xreflabel="schemadoccreateevent( name, text, text, text, text, text, text, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-text-title">
+      <title id="function.createevent-name-text-text-text-text-text-text-text-text-title">
        createevent( name, text, text, text, text, text, text, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-text-text-text-text-text-text-titleabbrev">
        createevent( name, text, text, text, text, text, text, text, text )
       </titleabbrev>
 
@@ -3337,12 +3345,12 @@
     </section>
 
 <!-- Function createevent( name, text, text, text, text, text, text, text, text, text ) -->
-    <section id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-text-text"
+    <section id="function.createevent-name-text-text-text-text-text-text-text-text-text"
              xreflabel="schemadoccreateevent( name, text, text, text, text, text, text, text, text, text )">
-      <title id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-text-text-title">
+      <title id="function.createevent-name-text-text-text-text-text-text-text-text-text-title">
        createevent( name, text, text, text, text, text, text, text, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.createevent-name-text-text-text-text-text-text-text-text-text-titleabbrev">
+      <titleabbrev id="function.createevent-name-text-text-text-text-text-text-text-text-text-titleabbrev">
        createevent( name, text, text, text, text, text, text, text, text, text )
       </titleabbrev>
 
@@ -3366,12 +3374,12 @@
     </section>
 
 <!-- Function ddlscript( integer, text, integer ) -->
-    <section id="schemadoc.function.ddlscript-integer-text-integer"
+    <section id="function.ddlscript-integer-text-integer"
              xreflabel="schemadocddlscript( integer, text, integer )">
-      <title id="schemadoc.function.ddlscript-integer-text-integer-title">
+      <title id="function.ddlscript-integer-text-integer-title">
        ddlscript( integer, text, integer )
       </title>
-      <titleabbrev id="schemadoc.function.ddlscript-integer-text-integer-titleabbrev">
+      <titleabbrev id="function.ddlscript-integer-text-integer-titleabbrev">
        ddlscript( integer, text, integer )
       </titleabbrev>
 
@@ -3402,19 +3410,19 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that the set exists and originates here
 	-- ----
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_set_id
 			for update;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_set_id;
 	end if;
-	if v_set_origin &lt;&gt; schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_set_origin &lt;&gt; getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				p_set_id;
 	end if;
@@ -3422,10 +3430,10 @@
 	-- ----
 	-- Create a SYNC event, run the script and generate the DDL_SCRIPT event
 	-- ----
-	perform schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;, NULL);
-	perform schemadoc.ddlScript_int(p_set_id, p_script, p_only_on_node);
-	perform schemadoc.updateRelname(p_set_id, p_only_on_node);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;DDL_SCRIPT&#39;, 
+	perform createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;, NULL);
+	perform ddlScript_int(p_set_id, p_script, p_only_on_node);
+	perform updateRelname(p_set_id, p_only_on_node);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;DDL_SCRIPT&#39;, 
 			p_set_id, p_script, p_only_on_node);
 end;
 </programlisting>
@@ -3433,12 +3441,12 @@
     </section>
 
 <!-- Function ddlscript_int( integer, text, integer ) -->
-    <section id="schemadoc.function.ddlscript-int-integer-text-integer"
+    <section id="function.ddlscript-int-integer-text-integer"
              xreflabel="schemadocddlscript_int( integer, text, integer )">
-      <title id="schemadoc.function.ddlscript-int-integer-text-integer-title">
+      <title id="function.ddlscript-int-integer-text-integer-title">
        ddlscript_int( integer, text, integer )
       </title>
-      <titleabbrev id="schemadoc.function.ddlscript-int-integer-text-integer-titleabbrev">
+      <titleabbrev id="function.ddlscript-int-integer-text-integer-titleabbrev">
        ddlscript_int( integer, text, integer )
       </titleabbrev>
 
@@ -3471,22 +3479,22 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that we either are the set origin or a current
 	-- subscriber of the set.
 	-- ----
-	v_no_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_no_id := getLocalNodeId(&#39;_schemadoc&#39;);
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_set_id
 			for update;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_set_id;
 	end if;
 	if v_set_origin &lt;&gt; v_no_id
-			and not exists (select 1 from schemadoc.sl_subscribe
+			and not exists (select 1 from sl_subscribe
 						where sub_set = p_set_id
 						and sub_receiver = v_no_id)
 	then
@@ -3504,10 +3512,10 @@
 	-- ----
 	-- Restore all original triggers and rules
 	-- ----
-	for v_row in select * from schemadoc.sl_table
+	for v_row in select * from sl_table
 			where tab_set = p_set_id
 	loop
-		perform schemadoc.alterTableRestore(v_row.tab_id);
+		perform alterTableRestore(v_row.tab_id);
 	end loop;
 
 	-- ----
@@ -3518,10 +3526,10 @@
 	-- ----
 	-- Put all tables back into replicated mode
 	-- ----
-	for v_row in select * from schemadoc.sl_table
+	for v_row in select * from sl_table
 			where tab_set = p_set_id
 	loop
-		perform schemadoc.alterTableForReplication(v_row.tab_id);
+		perform alterTableForReplication(v_row.tab_id);
 	end loop;
 
 	return p_set_id;
@@ -3531,12 +3539,12 @@
     </section>
 
 <!-- Function denyaccess(  ) -->
-    <section id="schemadoc.function.denyaccess"
+    <section id="function.denyaccess"
              xreflabel="schemadocdenyaccess(  )">
-      <title id="schemadoc.function.denyaccess-title">
+      <title id="function.denyaccess-title">
        denyaccess(  )
       </title>
-      <titleabbrev id="schemadoc.function.denyaccess-titleabbrev">
+      <titleabbrev id="function.denyaccess-titleabbrev">
        denyaccess(  )
       </titleabbrev>
 
@@ -3558,12 +3566,12 @@
     </section>
 
 <!-- Function determineattkindserial( text ) -->
-    <section id="schemadoc.function.determineattkindserial-text"
+    <section id="function.determineattkindserial-text"
              xreflabel="schemadocdetermineattkindserial( text )">
-      <title id="schemadoc.function.determineattkindserial-text-title">
+      <title id="function.determineattkindserial-text-title">
        determineattkindserial( text )
       </title>
-      <titleabbrev id="schemadoc.function.determineattkindserial-text-titleabbrev">
+      <titleabbrev id="function.determineattkindserial-text-titleabbrev">
        determineattkindserial( text )
       </titleabbrev>
 
@@ -3636,7 +3644,7 @@
 
 	execute &#39;update &#39; || p_tab_fqname ||
 		&#39; set &quot;_Slony-I_schemadoc_rowID&quot; =&#39; ||
-		&#39; &quot;pg_catalog&quot;.nextval(&#39;&#39;schemadoc.sl_rowid_seq&#39;&#39;);&#39;;
+		&#39; &quot;pg_catalog&quot;.nextval(&#39;&#39;sl_rowid_seq&#39;&#39;);&#39;;
 	execute &#39;alter table only &#39; || p_tab_fqname ||
 		&#39; add unique (&quot;_Slony-I_schemadoc_rowID&quot;);&#39;;
 	execute &#39;alter table only &#39; || p_tab_fqname ||
@@ -3653,12 +3661,12 @@
     </section>
 
 <!-- Function determineattkindunique( text, name ) -->
-    <section id="schemadoc.function.determineattkindunique-text-name"
+    <section id="function.determineattkindunique-text-name"
              xreflabel="schemadocdetermineattkindunique( text, name )">
-      <title id="schemadoc.function.determineattkindunique-text-name-title">
+      <title id="function.determineattkindunique-text-name-title">
        determineattkindunique( text, name )
       </title>
-      <titleabbrev id="schemadoc.function.determineattkindunique-text-name-titleabbrev">
+      <titleabbrev id="function.determineattkindunique-text-name-titleabbrev">
        determineattkindunique( text, name )
       </titleabbrev>
 
@@ -3765,12 +3773,12 @@
     </section>
 
 <!-- Function determineidxnameserial( text ) -->
-    <section id="schemadoc.function.determineidxnameserial-text"
+    <section id="function.determineidxnameserial-text"
              xreflabel="schemadocdetermineidxnameserial( text )">
-      <title id="schemadoc.function.determineidxnameserial-text-title">
+      <title id="function.determineidxnameserial-text-title">
        determineidxnameserial( text )
       </title>
-      <titleabbrev id="schemadoc.function.determineidxnameserial-text-titleabbrev">
+      <titleabbrev id="function.determineidxnameserial-text-titleabbrev">
        determineidxnameserial( text )
       </titleabbrev>
 
@@ -3819,12 +3827,12 @@
     </section>
 
 <!-- Function determineidxnameunique( text, name ) -->
-    <section id="schemadoc.function.determineidxnameunique-text-name"
+    <section id="function.determineidxnameunique-text-name"
              xreflabel="schemadocdetermineidxnameunique( text, name )">
-      <title id="schemadoc.function.determineidxnameunique-text-name-title">
+      <title id="function.determineidxnameunique-text-name-title">
        determineidxnameunique( text, name )
       </title>
-      <titleabbrev id="schemadoc.function.determineidxnameunique-text-name-titleabbrev">
+      <titleabbrev id="function.determineidxnameunique-text-name-titleabbrev">
        determineidxnameunique( text, name )
       </titleabbrev>
 
@@ -3901,12 +3909,12 @@
     </section>
 
 <!-- Function disablenode( integer ) -->
-    <section id="schemadoc.function.disablenode-integer"
+    <section id="function.disablenode-integer"
              xreflabel="schemadocdisablenode( integer )">
-      <title id="schemadoc.function.disablenode-integer-title">
+      <title id="function.disablenode-integer-title">
        disablenode( integer )
       </title>
-      <titleabbrev id="schemadoc.function.disablenode-integer-titleabbrev">
+      <titleabbrev id="function.disablenode-integer-titleabbrev">
        disablenode( integer )
       </titleabbrev>
 
@@ -3937,12 +3945,12 @@
     </section>
 
 <!-- Function disablenode_int( integer ) -->
-    <section id="schemadoc.function.disablenode-int-integer"
+    <section id="function.disablenode-int-integer"
              xreflabel="schemadocdisablenode_int( integer )">
-      <title id="schemadoc.function.disablenode-int-integer-title">
+      <title id="function.disablenode-int-integer-title">
        disablenode_int( integer )
       </title>
-      <titleabbrev id="schemadoc.function.disablenode-int-integer-titleabbrev">
+      <titleabbrev id="function.disablenode-int-integer-titleabbrev">
        disablenode_int( integer )
       </titleabbrev>
 
@@ -3971,12 +3979,12 @@
     </section>
 
 <!-- Function droplisten( integer, integer, integer ) -->
-    <section id="schemadoc.function.droplisten-integer-integer-integer"
+    <section id="function.droplisten-integer-integer-integer"
              xreflabel="schemadocdroplisten( integer, integer, integer )">
-      <title id="schemadoc.function.droplisten-integer-integer-integer-title">
+      <title id="function.droplisten-integer-integer-integer-title">
        droplisten( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.droplisten-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.droplisten-integer-integer-integer-titleabbrev">
        droplisten( integer, integer, integer )
       </titleabbrev>
 
@@ -4003,10 +4011,10 @@
 begin
 	return -1;
 
-	perform schemadoc.dropListen_int(p_li_origin, 
+	perform dropListen_int(p_li_origin, 
 			p_li_provider, p_li_receiver);
 	
-	return  schemadoc.createEvent (&#39;_schemadoc&#39;, &#39;DROP_LISTEN&#39;,
+	return  createEvent (&#39;_schemadoc&#39;, &#39;DROP_LISTEN&#39;,
 			p_li_origin, p_li_provider, p_li_receiver);
 end;
 </programlisting>
@@ -4014,12 +4022,12 @@
     </section>
 
 <!-- Function droplisten_int( integer, integer, integer ) -->
-    <section id="schemadoc.function.droplisten-int-integer-integer-integer"
+    <section id="function.droplisten-int-integer-integer-integer"
              xreflabel="schemadocdroplisten_int( integer, integer, integer )">
-      <title id="schemadoc.function.droplisten-int-integer-integer-integer-title">
+      <title id="function.droplisten-int-integer-integer-integer-title">
        droplisten_int( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.droplisten-int-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.droplisten-int-integer-integer-integer-titleabbrev">
        droplisten_int( integer, integer, integer )
       </titleabbrev>
 
@@ -4050,9 +4058,9 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
-	delete from schemadoc.sl_listen
+	delete from sl_listen
 			where li_origin = p_li_origin
 			and li_provider = p_li_provider
 			and li_receiver = p_li_receiver;
@@ -4067,12 +4075,12 @@
     </section>
 
 <!-- Function dropnode( integer ) -->
-    <section id="schemadoc.function.dropnode-integer"
+    <section id="function.dropnode-integer"
              xreflabel="schemadocdropnode( integer )">
-      <title id="schemadoc.function.dropnode-integer-title">
+      <title id="function.dropnode-integer-title">
        dropnode( integer )
       </title>
-      <titleabbrev id="schemadoc.function.dropnode-integer-titleabbrev">
+      <titleabbrev id="function.dropnode-integer-titleabbrev">
        dropnode( integer )
       </titleabbrev>
 
@@ -4097,16 +4105,16 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that this got called on a different node
 	-- ----
-	if p_no_id = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if p_no_id = getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: DROP_NODE cannot initiate on the dropped node&#39;;
 	end if;
 
-	select * into v_node_row from schemadoc.sl_node
+	select * into v_node_row from sl_node
 			where no_id = p_no_id
 			for update;
 	if not found then
@@ -4116,7 +4124,7 @@
 	-- ----
 	-- Make sure we do not break other nodes subscriptions with this
 	-- ----
-	if exists (select true from schemadoc.sl_subscribe
+	if exists (select true from sl_subscribe
 			where sub_provider = p_no_id)
 	then
 		raise exception &#39;Slony-I: Node % is still configured as data provider&#39;,
@@ -4126,7 +4134,7 @@
 	-- ----
 	-- Make sure no set originates there any more
 	-- ----
-	if exists (select true from schemadoc.sl_set
+	if exists (select true from sl_set
 			where set_origin = p_no_id)
 	then
 		raise exception &#39;Slony-I: Node % is still origin of one or more sets&#39;,
@@ -4136,8 +4144,8 @@
 	-- ----
 	-- Call the internal drop functionality and generate the event
 	-- ----
-	perform schemadoc.dropNode_int(p_no_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;DROP_NODE&#39;,
+	perform dropNode_int(p_no_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;DROP_NODE&#39;,
 									p_no_id);
 end;
 </programlisting>
@@ -4145,12 +4153,12 @@
     </section>
 
 <!-- Function dropnode_int( integer ) -->
-    <section id="schemadoc.function.dropnode-int-integer"
+    <section id="function.dropnode-int-integer"
              xreflabel="schemadocdropnode_int( integer )">
-      <title id="schemadoc.function.dropnode-int-integer-title">
+      <title id="function.dropnode-int-integer-title">
        dropnode_int( integer )
       </title>
-      <titleabbrev id="schemadoc.function.dropnode-int-integer-titleabbrev">
+      <titleabbrev id="function.dropnode-int-integer-titleabbrev">
        dropnode_int( integer )
       </titleabbrev>
 
@@ -4175,28 +4183,28 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- If the dropped node is a remote node, clean the configuration
 	-- from all traces for it.
 	-- ----
-	if p_no_id &lt;&gt; schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
-		delete from schemadoc.sl_subscribe
+	if p_no_id &lt;&gt; getLocalNodeId(&#39;_schemadoc&#39;) then
+		delete from sl_subscribe
 				where sub_receiver = p_no_id;
-		delete from schemadoc.sl_listen
+		delete from sl_listen
 				where li_origin = p_no_id
 					or li_provider = p_no_id
 					or li_receiver = p_no_id;
-		delete from schemadoc.sl_path
+		delete from sl_path
 				where pa_server = p_no_id
 					or pa_client = p_no_id;
-		delete from schemadoc.sl_confirm
+		delete from sl_confirm
 				where con_origin = p_no_id
 					or con_received = p_no_id;
-		delete from schemadoc.sl_event
+		delete from sl_event
 				where ev_origin = p_no_id;
-		delete from schemadoc.sl_node
+		delete from sl_node
 				where no_id = p_no_id;
 
 		return p_no_id;
@@ -4206,12 +4214,12 @@
 	-- This is us ... deactivate the node for now, the daemon
 	-- will call uninstallNode() in a separate transaction.
 	-- ----
-	update schemadoc.sl_node
+	update sl_node
 			set no_active = false
 			where no_id = p_no_id;
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	return p_no_id;
 end;
@@ -4220,12 +4228,12 @@
     </section>
 
 <!-- Function droppath( integer, integer ) -->
-    <section id="schemadoc.function.droppath-integer-integer"
+    <section id="function.droppath-integer-integer"
              xreflabel="schemadocdroppath( integer, integer )">
-      <title id="schemadoc.function.droppath-integer-integer-title">
+      <title id="function.droppath-integer-integer-title">
        droppath( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.droppath-integer-integer-titleabbrev">
+      <titleabbrev id="function.droppath-integer-integer-titleabbrev">
        droppath( integer, integer )
       </titleabbrev>
 
@@ -4251,14 +4259,14 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- There should be no existing subscriptions. Auto unsubscribing
 	-- is considered too dangerous. 
 	-- ----
 	for v_row in select sub_set, sub_provider, sub_receiver
-			from schemadoc.sl_subscribe
+			from sl_subscribe
 			where sub_provider = p_pa_server
 			and sub_receiver = p_pa_client
 	loop
@@ -4271,23 +4279,23 @@
 	-- Drop all sl_listen entries that depend on this path
 	-- ----
 	for v_row in select li_origin, li_provider, li_receiver
-			from schemadoc.sl_listen
+			from sl_listen
 			where li_provider = p_pa_server
 			and li_receiver = p_pa_client
 	loop
-		perform schemadoc.dropListen(
+		perform dropListen(
 				v_row.li_origin, v_row.li_provider, v_row.li_receiver);
 	end loop;
 
 	-- ----
 	-- Now drop the path and create the event
 	-- ----
-	perform schemadoc.dropPath_int(p_pa_server, p_pa_client);
+	perform dropPath_int(p_pa_server, p_pa_client);
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
-	return  schemadoc.createEvent (&#39;_schemadoc&#39;, &#39;DROP_PATH&#39;,
+	return  createEvent (&#39;_schemadoc&#39;, &#39;DROP_PATH&#39;,
 			p_pa_server, p_pa_client);
 end;
 </programlisting>
@@ -4295,12 +4303,12 @@
     </section>
 
 <!-- Function droppath_int( integer, integer ) -->
-    <section id="schemadoc.function.droppath-int-integer-integer"
+    <section id="function.droppath-int-integer-integer"
              xreflabel="schemadocdroppath_int( integer, integer )">
-      <title id="schemadoc.function.droppath-int-integer-integer-title">
+      <title id="function.droppath-int-integer-integer-title">
        droppath_int( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.droppath-int-integer-integer-titleabbrev">
+      <titleabbrev id="function.droppath-int-integer-integer-titleabbrev">
        droppath_int( integer, integer )
       </titleabbrev>
 
@@ -4325,29 +4333,29 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Remove any dangling sl_listen entries with the server
 	-- as provider and the client as receiver. This must have
 	-- been cleared out before, but obviously was not.
 	-- ----
-	delete from schemadoc.sl_listen
+	delete from sl_listen
 			where li_provider = p_pa_server
 			and li_receiver = p_pa_client;
 
-	delete from schemadoc.sl_path
+	delete from sl_path
 			where pa_server = p_pa_server
 			and pa_client = p_pa_client;
 
 	if found then
 		-- Rewrite sl_listen table
-		perform schemadoc.RebuildListenEntries();
+		perform RebuildListenEntries();
 
 		return 1;
 	else
 		-- Rewrite sl_listen table
-		perform schemadoc.RebuildListenEntries();
+		perform RebuildListenEntries();
 
 		return 0;
 	end if;
@@ -4357,12 +4365,12 @@
     </section>
 
 <!-- Function dropset( integer ) -->
-    <section id="schemadoc.function.dropset-integer"
+    <section id="function.dropset-integer"
              xreflabel="schemadocdropset( integer )">
-      <title id="schemadoc.function.dropset-integer-title">
+      <title id="function.dropset-integer-title">
        dropset( integer )
       </title>
-      <titleabbrev id="schemadoc.function.dropset-integer-titleabbrev">
+      <titleabbrev id="function.dropset-integer-titleabbrev">
        dropset( integer )
       </titleabbrev>
 
@@ -4389,17 +4397,17 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 	
 	-- ----
 	-- Check that the set exists and originates here
 	-- ----
-	select set_origin into v_origin from schemadoc.sl_set
+	select set_origin into v_origin from sl_set
 			where set_id = p_set_id;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_set_id;
 	end if;
-	if v_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				p_set_id;
 	end if;
@@ -4407,8 +4415,8 @@
 	-- ----
 	-- Call the internal drop set functionality and generate the event
 	-- ----
-	perform schemadoc.dropSet_int(p_set_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;DROP_SET&#39;, 
+	perform dropSet_int(p_set_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;DROP_SET&#39;, 
 			p_set_id);
 end;
 </programlisting>
@@ -4416,12 +4424,12 @@
     </section>
 
 <!-- Function dropset_int( integer ) -->
-    <section id="schemadoc.function.dropset-int-integer"
+    <section id="function.dropset-int-integer"
              xreflabel="schemadocdropset_int( integer )">
-      <title id="schemadoc.function.dropset-int-integer-title">
+      <title id="function.dropset-int-integer-title">
        dropset_int( integer )
       </title>
-      <titleabbrev id="schemadoc.function.dropset-int-integer-titleabbrev">
+      <titleabbrev id="function.dropset-int-integer-titleabbrev">
        dropset_int( integer )
       </titleabbrev>
 
@@ -4446,36 +4454,36 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 	
 	-- ----
 	-- Restore all tables original triggers and rules and remove
 	-- our replication stuff.
 	-- ----
-	for v_tab_row in select tab_id from schemadoc.sl_table
+	for v_tab_row in select tab_id from sl_table
 			where tab_set = p_set_id
 			order by tab_id
 	loop
-		perform schemadoc.alterTableRestore(v_tab_row.tab_id);
-		perform schemadoc.tableDropKey(v_tab_row.tab_id);
+		perform alterTableRestore(v_tab_row.tab_id);
+		perform tableDropKey(v_tab_row.tab_id);
 	end loop;
 
 	-- ----
 	-- Remove all traces of the set configuration
 	-- ----
-	delete from schemadoc.sl_sequence
+	delete from sl_sequence
 			where seq_set = p_set_id;
-	delete from schemadoc.sl_table
+	delete from sl_table
 			where tab_set = p_set_id;
-	delete from schemadoc.sl_subscribe
+	delete from sl_subscribe
 			where sub_set = p_set_id;
-	delete from schemadoc.sl_setsync
+	delete from sl_setsync
 			where ssy_setid = p_set_id;
-	delete from schemadoc.sl_set
+	delete from sl_set
 			where set_id = p_set_id;
 
 	-- Regenerate sl_listen since we revised the subscriptions
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	return p_set_id;
 end;
@@ -4484,12 +4492,12 @@
     </section>
 
 <!-- Function droptrigger( integer, name ) -->
-    <section id="schemadoc.function.droptrigger-integer-name"
+    <section id="function.droptrigger-integer-name"
              xreflabel="schemadocdroptrigger( integer, name )">
-      <title id="schemadoc.function.droptrigger-integer-name-title">
+      <title id="function.droptrigger-integer-name-title">
        droptrigger( integer, name )
       </title>
-      <titleabbrev id="schemadoc.function.droptrigger-integer-name-titleabbrev">
+      <titleabbrev id="function.droptrigger-integer-name-titleabbrev">
        droptrigger( integer, name )
       </titleabbrev>
 
@@ -4514,8 +4522,8 @@
 	p_trig_tabid		alias for $1;
 	p_trig_tgname		alias for $2;
 begin
-	perform schemadoc.dropTrigger_int(p_trig_tabid, p_trig_tgname);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;DROP_TRIGGER&#39;,
+	perform dropTrigger_int(p_trig_tabid, p_trig_tgname);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;DROP_TRIGGER&#39;,
 			p_trig_tabid, p_trig_tgname);
 end;
 </programlisting>
@@ -4523,12 +4531,12 @@
     </section>
 
 <!-- Function droptrigger_int( integer, name ) -->
-    <section id="schemadoc.function.droptrigger-int-integer-name"
+    <section id="function.droptrigger-int-integer-name"
              xreflabel="schemadocdroptrigger_int( integer, name )">
-      <title id="schemadoc.function.droptrigger-int-integer-name-title">
+      <title id="function.droptrigger-int-integer-name-title">
        droptrigger_int( integer, name )
       </title>
-      <titleabbrev id="schemadoc.function.droptrigger-int-integer-name-titleabbrev">
+      <titleabbrev id="function.droptrigger-int-integer-name-titleabbrev">
        droptrigger_int( integer, name )
       </titleabbrev>
 
@@ -4557,13 +4565,13 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Get the current table status (altered or not)
 	-- ----
 	select tab_altered into v_tab_altered
-			from schemadoc.sl_table where tab_id = p_trig_tabid;
+			from sl_table where tab_id = p_trig_tabid;
 	if not found then
 		-- ----
 		-- Not found is no hard error here, because that might
@@ -4576,13 +4584,13 @@
 	-- If the table is modified for replication, restore the original state
 	-- ----
 	if v_tab_altered then
-		perform schemadoc.alterTableRestore(p_trig_tabid);
+		perform alterTableRestore(p_trig_tabid);
 	end if;
 
 	-- ----
 	-- Remove the entry from sl_trigger
 	-- ----
-	delete from schemadoc.sl_trigger
+	delete from sl_trigger
 			where trig_tabid = p_trig_tabid
 			  and trig_tgname = p_trig_tgname;
 
@@ -4590,7 +4598,7 @@
 	-- Put the table back into replicated state if it was
 	-- ----
 	if v_tab_altered then
-		perform schemadoc.alterTableForReplication(p_trig_tabid);
+		perform alterTableForReplication(p_trig_tabid);
 	end if;
 
 	return p_trig_tabid;
@@ -4600,12 +4608,12 @@
     </section>
 
 <!-- Function enablenode( integer ) -->
-    <section id="schemadoc.function.enablenode-integer"
+    <section id="function.enablenode-integer"
              xreflabel="schemadocenablenode( integer )">
-      <title id="schemadoc.function.enablenode-integer-title">
+      <title id="function.enablenode-integer-title">
        enablenode( integer )
       </title>
-      <titleabbrev id="schemadoc.function.enablenode-integer-titleabbrev">
+      <titleabbrev id="function.enablenode-integer-titleabbrev">
        enablenode( integer )
       </titleabbrev>
 
@@ -4633,15 +4641,15 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that we are the node to activate and that we are
 	-- currently disabled.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 	select * into v_node_row
-			from schemadoc.sl_node
+			from sl_node
 			where no_id = p_no_id
 			for update;
 	if not found then 
@@ -4654,8 +4662,8 @@
 	-- ----
 	-- Activate this node and generate the ENABLE_NODE event
 	-- ----
-	perform schemadoc.enableNode_int (p_no_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;ENABLE_NODE&#39;,
+	perform enableNode_int (p_no_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;ENABLE_NODE&#39;,
 									p_no_id);
 end;
 </programlisting>
@@ -4663,12 +4671,12 @@
     </section>
 
 <!-- Function enablenode_int( integer ) -->
-    <section id="schemadoc.function.enablenode-int-integer"
+    <section id="function.enablenode-int-integer"
              xreflabel="schemadocenablenode_int( integer )">
-      <title id="schemadoc.function.enablenode-int-integer-title">
+      <title id="function.enablenode-int-integer-title">
        enablenode_int( integer )
       </title>
-      <titleabbrev id="schemadoc.function.enablenode-int-integer-titleabbrev">
+      <titleabbrev id="function.enablenode-int-integer-titleabbrev">
        enablenode_int( integer )
       </titleabbrev>
 
@@ -4697,13 +4705,13 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that the node is inactive
 	-- ----
 	select * into v_node_row
-			from schemadoc.sl_node
+			from sl_node
 			where no_id = p_no_id
 			for update;
 	if not found then 
@@ -4716,17 +4724,17 @@
 	-- ----
 	-- Activate the node and generate sl_confirm status rows for it.
 	-- ----
-	update schemadoc.sl_node
+	update sl_node
 			set no_active = &#39;t&#39;
 			where no_id = p_no_id;
-	insert into schemadoc.sl_confirm
+	insert into sl_confirm
 			(con_origin, con_received, con_seqno)
-			select no_id, p_no_id, 0 from schemadoc.sl_node
+			select no_id, p_no_id, 0 from sl_node
 				where no_id != p_no_id
 				and no_active;
-	insert into schemadoc.sl_confirm
+	insert into sl_confirm
 			(con_origin, con_received, con_seqno)
-			select p_no_id, no_id, 0 from schemadoc.sl_node
+			select p_no_id, no_id, 0 from sl_node
 				where no_id != p_no_id
 				and no_active;
 
@@ -4734,16 +4742,16 @@
 	-- Generate ENABLE_SUBSCRIPTION events for all sets that
 	-- origin here and are subscribed by the just enabled node.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 	for v_sub_row in select SUB.sub_set, SUB.sub_provider from
-			schemadoc.sl_set S,
-			schemadoc.sl_subscribe SUB
+			sl_set S,
+			sl_subscribe SUB
 			where S.set_origin = v_local_node_id
 			and S.set_id = SUB.sub_set
 			and SUB.sub_receiver = p_no_id
 			for update of S
 	loop
-		perform schemadoc.enableSubscription (v_sub_row.sub_set,,
+		perform enableSubscription (v_sub_row.sub_set,,
 				v_sub_row.sub_provider, p_no_id);
 	end loop;
 
@@ -4754,12 +4762,12 @@
     </section>
 
 <!-- Function enablesubscription( integer, integer, integer ) -->
-    <section id="schemadoc.function.enablesubscription-integer-integer-integer"
+    <section id="function.enablesubscription-integer-integer-integer"
              xreflabel="schemadocenablesubscription( integer, integer, integer )">
-      <title id="schemadoc.function.enablesubscription-integer-integer-integer-title">
+      <title id="function.enablesubscription-integer-integer-integer-title">
        enablesubscription( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.enablesubscription-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.enablesubscription-integer-integer-integer-titleabbrev">
        enablesubscription( integer, integer, integer )
       </titleabbrev>
 
@@ -4786,7 +4794,7 @@
 	p_sub_provider		alias for $2;
 	p_sub_receiver		alias for $3;
 begin
-	return  schemadoc.enableSubscription_int (p_sub_set, 
+	return  enableSubscription_int (p_sub_set, 
 			p_sub_provider, p_sub_receiver);
 end;
 </programlisting>
@@ -4794,12 +4802,12 @@
     </section>
 
 <!-- Function enablesubscription_int( integer, integer, integer ) -->
-    <section id="schemadoc.function.enablesubscription-int-integer-integer-integer"
+    <section id="function.enablesubscription-int-integer-integer-integer"
              xreflabel="schemadocenablesubscription_int( integer, integer, integer )">
-      <title id="schemadoc.function.enablesubscription-int-integer-integer-integer-title">
+      <title id="function.enablesubscription-int-integer-integer-integer-title">
        enablesubscription_int( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.enablesubscription-int-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.enablesubscription-int-integer-integer-integer-titleabbrev">
        enablesubscription_int( integer, integer, integer )
       </titleabbrev>
 
@@ -4833,7 +4841,7 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- The real work is done in the replication engine. All
@@ -4843,24 +4851,24 @@
 	-- ----
 	-- Well, not only ... we might be missing an important event here
 	-- ----
-	if not exists (select true from schemadoc.sl_path
+	if not exists (select true from sl_path
 			where pa_server = p_sub_provider
 			and pa_client = p_sub_receiver)
 	then
-		insert into schemadoc.sl_path
+		insert into sl_path
 				(pa_server, pa_client, pa_conninfo, pa_connretry)
 				values 
 				(p_sub_provider, p_sub_receiver, 
 				&#39;&lt;event pending&gt;&#39;, 10);
 	end if;
 
-	update schemadoc.sl_subscribe
+	update sl_subscribe
 			set sub_active = &#39;t&#39;
 			where sub_set = p_sub_set
 			and sub_receiver = p_sub_receiver;
 	get diagnostics v_n = row_count;
 	if v_n = 0 then
-		insert into schemadoc.sl_subscribe
+		insert into sl_subscribe
 				(sub_set, sub_provider, sub_receiver,
 				sub_forward, sub_active)
 				values
@@ -4869,7 +4877,7 @@
 	end if;
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	return p_sub_set;
 end;
@@ -4878,12 +4886,12 @@
     </section>
 
 <!-- Function failednode( integer, integer ) -->
-    <section id="schemadoc.function.failednode-integer-integer"
+    <section id="function.failednode-integer-integer"
              xreflabel="schemadocfailednode( integer, integer )">
-      <title id="schemadoc.function.failednode-integer-integer-title">
+      <title id="function.failednode-integer-integer-title">
        failednode( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.failednode-integer-integer-titleabbrev">
+      <titleabbrev id="function.failednode-integer-integer-titleabbrev">
        failednode( integer, integer )
       </titleabbrev>
 
@@ -4912,7 +4920,7 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- All consistency checks first
@@ -4920,10 +4928,10 @@
 	-- also has a path to the backup node.
 	-- ----
 	for v_row in select P.pa_client
-			from schemadoc.sl_path P
+			from sl_path P
 			where P.pa_server = p_failed_node
 				and P.pa_client &lt;&gt; p_backup_node
-				and not exists (select true from schemadoc.sl_path PP
+				and not exists (select true from sl_path PP
 							where PP.pa_server = p_backup_node
 								and PP.pa_client = P.pa_client)
 	loop
@@ -4935,7 +4943,7 @@
 	-- Check all sets originating on the failed node
 	-- ----
 	for v_row in select set_id
-			from schemadoc.sl_set
+			from sl_set
 			where set_origin = p_failed_node
 	loop
 		-- ----
@@ -4943,7 +4951,7 @@
 		-- that origin on the failed node
 		-- ----
 		select into v_row2 sub_forward, sub_active
-				from schemadoc.sl_subscribe
+				from sl_subscribe
 				where sub_set = v_row.set_id
 					and sub_receiver = p_backup_node;
 		if not found then
@@ -4964,7 +4972,7 @@
 		-- be a forwarder too.
 		-- ----
 		select into v_n count(*)
-				from schemadoc.sl_subscribe
+				from sl_subscribe
 				where sub_set = v_row.set_id
 					and sub_receiver &lt;&gt; p_backup_node;
 		if v_n &gt; 0 and not v_row2.sub_forward then
@@ -4976,7 +4984,7 @@
 	-- ----
 	-- Terminate all connections of the failed node the hard way
 	-- ----
-	perform schemadoc.terminateNodeConnections(
+	perform terminateNodeConnections(
 			&#39;_schemadoc_Node_&#39; || p_failed_node);
 
 -- Note that the following code should all become obsolete in the wake
@@ -4987,11 +4995,11 @@
 	-- Let every node that listens for something on the failed node
 	-- listen for that on the backup node instead.
 	-- ----
-	for v_row in select * from schemadoc.sl_listen
+	for v_row in select * from sl_listen
 			where li_provider = p_failed_node
 				and li_receiver &lt;&gt; p_backup_node
 	loop
-		perform schemadoc.storeListen_int(v_row.li_origin,
+		perform storeListen_int(v_row.li_origin,
 				p_backup_node, v_row.li_receiver);
 	end loop;
 
@@ -5000,11 +5008,11 @@
 	-- failed node did listen for it.
 	-- ----
 	for v_row in select li_origin, li_provider
-			from schemadoc.sl_listen
+			from sl_listen
 			where li_receiver = p_failed_node
 				and li_provider &lt;&gt; p_backup_node
 	loop
-		perform schemadoc.storeListen_int(v_row.li_origin,
+		perform storeListen_int(v_row.li_origin,
 				v_row.li_provider, p_backup_node);
 	end loop;
 
@@ -5012,7 +5020,7 @@
 	-- Remove all sl_listen entries that receive anything from the
 	-- failed node.
 	-- ----
-	delete from schemadoc.sl_listen
+	delete from sl_listen
 			where li_provider = p_failed_node
 				or li_receiver = p_failed_node;
 end if;
@@ -5021,12 +5029,12 @@
 	-- Move the sets
 	-- ----
 	for v_row in select S.set_id, (select count(*)
-					from schemadoc.sl_subscribe SUB
+					from sl_subscribe SUB
 					where S.set_id = SUB.sub_set
 						and SUB.sub_receiver &lt;&gt; p_backup_node
 						and SUB.sub_provider = p_failed_node)
 					as num_direct_receivers 
-			from schemadoc.sl_set S
+			from sl_set S
 			where S.set_origin = p_failed_node
 			for update
 	loop
@@ -5042,29 +5050,29 @@
 			-- adding the log trigger, removing the subscription and the
 			-- obsolete setsync status.
 			-- ----
-			if p_backup_node = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
-				for v_row2 in select * from schemadoc.sl_table
+			if p_backup_node = getLocalNodeId(&#39;_schemadoc&#39;) then
+				for v_row2 in select * from sl_table
 						where tab_set = v_row.set_id
 				loop
-					perform schemadoc.alterTableRestore(v_row2.tab_id);
+					perform alterTableRestore(v_row2.tab_id);
 				end loop;
 			end if;
 
-			update schemadoc.sl_set set set_origin = p_backup_node
+			update sl_set set set_origin = p_backup_node
 					where set_id = v_row.set_id;
 
-			if p_backup_node = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
-				delete from schemadoc.sl_setsync
+			if p_backup_node = getLocalNodeId(&#39;_schemadoc&#39;) then
+				delete from sl_setsync
 						where ssy_setid = v_row.set_id;
 
-				for v_row2 in select * from schemadoc.sl_table
+				for v_row2 in select * from sl_table
 						where tab_set = v_row.set_id
 				loop
-					perform schemadoc.alterTableForReplication(v_row2.tab_id);
+					perform alterTableForReplication(v_row2.tab_id);
 				end loop;
 			end if;
 
-			delete from schemadoc.sl_subscribe
+			delete from sl_subscribe
 					where sub_set = v_row.set_id
 						and sub_receiver = p_backup_node;
 		else
@@ -5079,16 +5087,16 @@
 			-- the highest SYNC and redirect this to it on
 			-- backup node later.
 			-- ----
-			update schemadoc.sl_subscribe
+			update sl_subscribe
 					set sub_provider = (select min(SS.sub_receiver)
-							from schemadoc.sl_subscribe SS
+							from sl_subscribe SS
 							where SS.sub_set = v_row.set_id
 								and SS.sub_provider = p_failed_node
 								and SS.sub_receiver &lt;&gt; p_backup_node
 								and SS.sub_forward)
 					where sub_set = v_row.set_id
 						and sub_receiver = p_backup_node;
-			update schemadoc.sl_subscribe
+			update sl_subscribe
 					set sub_provider = p_backup_node
 					where sub_set = v_row.set_id
 						and sub_provider = p_failed_node
@@ -5097,7 +5105,7 @@
 	end loop;
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	-- ----
 	-- Make sure the node daemon will restart
@@ -5114,12 +5122,12 @@
     </section>
 
 <!-- Function failednode2( integer, integer, integer, bigint, bigint ) -->
-    <section id="schemadoc.function.failednode2-integer-integer-integer-bigint-bigint"
+    <section id="function.failednode2-integer-integer-integer-bigint-bigint"
              xreflabel="schemadocfailednode2( integer, integer, integer, bigint, bigint )">
-      <title id="schemadoc.function.failednode2-integer-integer-integer-bigint-bigint-title">
+      <title id="function.failednode2-integer-integer-integer-bigint-bigint-title">
        failednode2( integer, integer, integer, bigint, bigint )
       </title>
-      <titleabbrev id="schemadoc.function.failednode2-integer-integer-integer-bigint-bigint-titleabbrev">
+      <titleabbrev id="function.failednode2-integer-integer-integer-bigint-bigint-titleabbrev">
        failednode2( integer, integer, integer, bigint, bigint )
       </titleabbrev>
 
@@ -5151,10 +5159,10 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	select * into v_row
-			from schemadoc.sl_event
+			from sl_event
 			where ev_origin = p_failed_node
 			and ev_seqno = p_ev_seqno;
 	if not found then
@@ -5162,7 +5170,7 @@
 				p_failed_node, p_ev_seqno;
 	end if;
 
-	insert into schemadoc.sl_event
+	insert into sl_event
 			(ev_origin, ev_seqno, ev_timestamp,
 			ev_minxid, ev_maxxid, ev_xip,
 			ev_type, ev_data1, ev_data2, ev_data3)
@@ -5171,16 +5179,16 @@
 			v_row.ev_minxid, v_row.ev_maxxid, v_row.ev_xip,
 			&#39;FAILOVER_SET&#39;, p_failed_node::text, p_backup_node::text,
 			p_set_id::text);
-	insert into schemadoc.sl_confirm
+	insert into sl_confirm
 			(con_origin, con_received, con_seqno, con_timestamp)
 			values
-			(p_failed_node, schemadoc.getLocalNodeId(&#39;_schemadoc&#39;),
+			(p_failed_node, getLocalNodeId(&#39;_schemadoc&#39;),
 			p_ev_seqfake, CURRENT_TIMESTAMP);
 	notify &quot;_schemadoc_Event&quot;;
 	notify &quot;_schemadoc_Confirm&quot;;
 	notify &quot;_schemadoc_Restart&quot;;
 
-	perform schemadoc.failoverSet_int(p_failed_node,
+	perform failoverSet_int(p_failed_node,
 			p_backup_node, p_set_id);
 
 	return p_ev_seqfake;
@@ -5190,12 +5198,12 @@
     </section>
 
 <!-- Function failoverset_int( integer, integer, integer ) -->
-    <section id="schemadoc.function.failoverset-int-integer-integer-integer"
+    <section id="function.failoverset-int-integer-integer-integer"
              xreflabel="schemadocfailoverset_int( integer, integer, integer )">
-      <title id="schemadoc.function.failoverset-int-integer-integer-integer-title">
+      <title id="function.failoverset-int-integer-integer-integer-title">
        failoverset_int( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.failoverset-int-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.failoverset-int-integer-integer-integer-titleabbrev">
        failoverset_int( integer, integer, integer )
       </titleabbrev>
 
@@ -5225,73 +5233,73 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Change the origin of the set now to the backup node.
 	-- On the backup node this includes changing all the
 	-- trigger and protection stuff
 	-- ----
-	if p_backup_node = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
-		for v_row in select * from schemadoc.sl_table
+	if p_backup_node = getLocalNodeId(&#39;_schemadoc&#39;) then
+		for v_row in select * from sl_table
 				where tab_set = p_set_id
 		loop
-			perform schemadoc.alterTableRestore(v_row.tab_id);
+			perform alterTableRestore(v_row.tab_id);
 		end loop;
 
-		delete from schemadoc.sl_setsync
+		delete from sl_setsync
 				where ssy_setid = p_set_id;
-		delete from schemadoc.sl_subscribe
+		delete from sl_subscribe
 				where sub_set = p_set_id
 					and sub_receiver = p_backup_node;
-		update schemadoc.sl_set
+		update sl_set
 				set set_origin = p_backup_node
 				where set_id = p_set_id;
 
-		for v_row in select * from schemadoc.sl_table
+		for v_row in select * from sl_table
 				where tab_set = p_set_id
 		loop
-			perform schemadoc.alterTableForReplication(v_row.tab_id);
+			perform alterTableForReplication(v_row.tab_id);
 		end loop;
 	else
-		delete from schemadoc.sl_subscribe
+		delete from sl_subscribe
 				where sub_set = p_set_id
 					and sub_receiver = p_backup_node;
-		update schemadoc.sl_set
+		update sl_set
 				set set_origin = p_backup_node
 				where set_id = p_set_id;
 	end if;
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	-- ----
 	-- If we are a subscriber of the set ourself, change our
 	-- setsync status to reflect the new set origin.
 	-- ----
-	if exists (select true from schemadoc.sl_subscribe
+	if exists (select true from sl_subscribe
 			where sub_set = p_set_id
-				and sub_receiver = schemadoc.getLocalNodeId(
+				and sub_receiver = getLocalNodeId(
 						&#39;_schemadoc&#39;))
 	then
-		delete from schemadoc.sl_setsync
+		delete from sl_setsync
 				where ssy_setid = p_set_id;
 
 		select coalesce(max(ev_seqno), 0) into v_last_sync
-				from schemadoc.sl_event
+				from sl_event
 				where ev_origin = p_backup_node
 					and ev_type = &#39;SYNC&#39;;
 		if v_last_sync &gt; 0 then
-			insert into schemadoc.sl_setsync
+			insert into sl_setsync
 					(ssy_setid, ssy_origin, ssy_seqno,
 					ssy_minxid, ssy_maxxid, ssy_xip, ssy_action_list)
 					select p_set_id, p_backup_node, v_last_sync,
 					ev_minxid, ev_maxxid, ev_xip, NULL
-					from schemadoc.sl_event
+					from sl_event
 					where ev_origin = p_backup_node
 						and ev_seqno = v_last_sync;
 		else
-			insert into schemadoc.sl_setsync
+			insert into sl_setsync
 					(ssy_setid, ssy_origin, ssy_seqno,
 					ssy_minxid, ssy_maxxid, ssy_xip, ssy_action_list)
 					values (p_set_id, p_backup_node, &#39;0&#39;,
@@ -5307,12 +5315,12 @@
     </section>
 
 <!-- Function forwardconfirm( integer, integer, bigint, timestamp without time zone ) -->
-    <section id="schemadoc.function.forwardconfirm-integer-integer-bigint-timestamp-without-time-zone"
+    <section id="function.forwardconfirm-integer-integer-bigint-timestamp-without-time-zone"
              xreflabel="schemadocforwardconfirm( integer, integer, bigint, timestamp without time zone )">
-      <title id="schemadoc.function.forwardconfirm-integer-integer-bigint-timestamp-without-time-zone-title">
+      <title id="function.forwardconfirm-integer-integer-bigint-timestamp-without-time-zone-title">
        forwardconfirm( integer, integer, bigint, timestamp without time zone )
       </title>
-      <titleabbrev id="schemadoc.function.forwardconfirm-integer-integer-bigint-timestamp-without-time-zone-titleabbrev">
+      <titleabbrev id="function.forwardconfirm-integer-integer-bigint-timestamp-without-time-zone-titleabbrev">
        forwardconfirm( integer, integer, bigint, timestamp without time zone )
       </titleabbrev>
 
@@ -5342,11 +5350,11 @@
 	v_max_seqno		bigint;
 begin
 	select into v_max_seqno coalesce(max(con_seqno), 0)
-			from schemadoc.sl_confirm
+			from sl_confirm
 			where con_origin = p_con_origin
 			and con_received = p_con_received;
 	if v_max_seqno &lt; p_con_seqno then
-		insert into schemadoc.sl_confirm 
+		insert into sl_confirm 
 				(con_origin, con_received, con_seqno, con_timestamp)
 				values (p_con_origin, p_con_received, p_con_seqno,
 					p_con_timestamp);
@@ -5361,12 +5369,12 @@
     </section>
 
 <!-- Function generate_sync_event( interval ) -->
-    <section id="schemadoc.function.generate-sync-event-interval"
+    <section id="function.generate-sync-event-interval"
              xreflabel="schemadocgenerate_sync_event( interval )">
-      <title id="schemadoc.function.generate-sync-event-interval-title">
+      <title id="function.generate-sync-event-interval-title">
        generate_sync_event( interval )
       </title>
-      <titleabbrev id="schemadoc.function.generate-sync-event-interval-titleabbrev">
+      <titleabbrev id="function.generate-sync-event-interval-titleabbrev">
        generate_sync_event( interval )
       </titleabbrev>
 
@@ -5389,12 +5397,12 @@
 	v_node_row     record;
 
 BEGIN
-	select 1 into v_node_row from schemadoc.sl_event 
-       	  where ev_type = &#39;SYNC&#39; and ev_origin = schemadoc.getLocalNodeId(&#39;schemadoc&#39;)
+	select 1 into v_node_row from sl_event 
+       	  where ev_type = &#39;SYNC&#39; and ev_origin = getLocalNodeId(&#39;schemadoc&#39;)
           and ev_timestamp &gt; now() - p_interval limit 1;
 	if not found then
 		-- If there has been no SYNC in the last interval, then push one
-		perform schemadoc.createEvent(&#39;schemadoc&#39;, &#39;SYNC&#39;, NULL);
+		perform createEvent(&#39;schemadoc&#39;, &#39;SYNC&#39;, NULL);
 		return 1;
 	else
 		return 0;
@@ -5405,12 +5413,12 @@
     </section>
 
 <!-- Function getlocalnodeid( name ) -->
-    <section id="schemadoc.function.getlocalnodeid-name"
+    <section id="function.getlocalnodeid-name"
              xreflabel="schemadocgetlocalnodeid( name )">
-      <title id="schemadoc.function.getlocalnodeid-name-title">
+      <title id="function.getlocalnodeid-name-title">
        getlocalnodeid( name )
       </title>
-      <titleabbrev id="schemadoc.function.getlocalnodeid-name-titleabbrev">
+      <titleabbrev id="function.getlocalnodeid-name-titleabbrev">
        getlocalnodeid( name )
       </titleabbrev>
 
@@ -5432,12 +5440,12 @@
     </section>
 
 <!-- Function getmoduleversion(  ) -->
-    <section id="schemadoc.function.getmoduleversion"
+    <section id="function.getmoduleversion"
              xreflabel="schemadocgetmoduleversion(  )">
-      <title id="schemadoc.function.getmoduleversion-title">
+      <title id="function.getmoduleversion-title">
        getmoduleversion(  )
       </title>
-      <titleabbrev id="schemadoc.function.getmoduleversion-titleabbrev">
+      <titleabbrev id="function.getmoduleversion-titleabbrev">
        getmoduleversion(  )
       </titleabbrev>
 
@@ -5459,12 +5467,12 @@
     </section>
 
 <!-- Function getsessionrole( name ) -->
-    <section id="schemadoc.function.getsessionrole-name"
+    <section id="function.getsessionrole-name"
              xreflabel="schemadocgetsessionrole( name )">
-      <title id="schemadoc.function.getsessionrole-name-title">
+      <title id="function.getsessionrole-name-title">
        getsessionrole( name )
       </title>
-      <titleabbrev id="schemadoc.function.getsessionrole-name-titleabbrev">
+      <titleabbrev id="function.getsessionrole-name-titleabbrev">
        getsessionrole( name )
       </titleabbrev>
 
@@ -5486,12 +5494,12 @@
     </section>
 
 <!-- Function initializelocalnode( integer, text ) -->
-    <section id="schemadoc.function.initializelocalnode-integer-text"
+    <section id="function.initializelocalnode-integer-text"
              xreflabel="schemadocinitializelocalnode( integer, text )">
-      <title id="schemadoc.function.initializelocalnode-integer-text-title">
+      <title id="function.initializelocalnode-integer-text-title">
        initializelocalnode( integer, text )
       </title>
-      <titleabbrev id="schemadoc.function.initializelocalnode-integer-text-titleabbrev">
+      <titleabbrev id="function.initializelocalnode-integer-text-titleabbrev">
        initializelocalnode( integer, text )
       </titleabbrev>
 
@@ -5522,12 +5530,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Make sure this node is uninitialized or got reset
 	-- ----
-	select last_value::int4 into v_old_node_id from schemadoc.sl_local_node_id;
+	select last_value::int4 into v_old_node_id from sl_local_node_id;
 	if v_old_node_id != -1 then
 		raise exception &#39;Slony-I: This node is already initialized&#39;;
 	end if;
@@ -5536,10 +5544,10 @@
 	-- Set sl_local_node_id to the requested value and add our
 	-- own system to sl_node.
 	-- ----
-	perform setval(&#39;schemadoc.sl_local_node_id&#39;, p_local_node_id);
-	perform setval(&#39;schemadoc.sl_rowid_seq&#39;, 
+	perform setval(&#39;sl_local_node_id&#39;, p_local_node_id);
+	perform setval(&#39;sl_rowid_seq&#39;, 
 			p_local_node_id::int8 * &#39;1000000000000000&#39;::int8);
-	perform schemadoc.storeNode_int (p_local_node_id, p_comment, false);
+	perform storeNode_int (p_local_node_id, p_comment, false);
 	
 	return p_local_node_id;
 end;
@@ -5548,12 +5556,12 @@
     </section>
 
 <!-- Function lockedset(  ) -->
-    <section id="schemadoc.function.lockedset"
+    <section id="function.lockedset"
              xreflabel="schemadoclockedset(  )">
-      <title id="schemadoc.function.lockedset-title">
+      <title id="function.lockedset-title">
        lockedset(  )
       </title>
-      <titleabbrev id="schemadoc.function.lockedset-titleabbrev">
+      <titleabbrev id="function.lockedset-titleabbrev">
        lockedset(  )
       </titleabbrev>
 
@@ -5575,12 +5583,12 @@
     </section>
 
 <!-- Function lockset( integer ) -->
-    <section id="schemadoc.function.lockset-integer"
+    <section id="function.lockset-integer"
              xreflabel="schemadoclockset( integer )">
-      <title id="schemadoc.function.lockset-integer-title">
+      <title id="function.lockset-integer-title">
        lockset( integer )
       </title>
-      <titleabbrev id="schemadoc.function.lockset-integer-titleabbrev">
+      <titleabbrev id="function.lockset-integer-titleabbrev">
        lockset( integer )
       </titleabbrev>
 
@@ -5610,14 +5618,14 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that the set exists and that we are the origin
 	-- and that it is not already locked.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
-	select * into v_set_row from schemadoc.sl_set
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
+	select * into v_set_row from sl_set
 			where set_id = p_set_id
 			for update;
 	if not found then
@@ -5637,7 +5645,7 @@
 	for v_tab_row in select T.tab_id,
 			&quot;pg_catalog&quot;.quote_ident(PGN.nspname) || &#39;.&#39; ||
 			&quot;pg_catalog&quot;.quote_ident(PGC.relname) as tab_fqname
-			from schemadoc.sl_table T,
+			from sl_table T,
 				&quot;pg_catalog&quot;.pg_class PGC, &quot;pg_catalog&quot;.pg_namespace PGN
 			where T.tab_set = p_set_id
 				and T.tab_reloid = PGC.oid
@@ -5648,14 +5656,14 @@
 				v_tab_row.tab_id || 
 				&#39;&quot; before insert or update or delete on &#39; ||
 				v_tab_row.tab_fqname || &#39; for each row execute procedure
-				schemadoc.lockedSet (&#39;&#39;_schemadoc&#39;&#39;);&#39;;
+				lockedSet (&#39;&#39;_schemadoc&#39;&#39;);&#39;;
 	end loop;
 
 	-- ----
 	-- Remember our snapshots xmax as for the set locking
 	-- ----
-	update schemadoc.sl_set
-			set set_locked = schemadoc.getMaxXid()
+	update sl_set
+			set set_locked = getMaxXid()
 			where set_id = p_set_id;
 
 	return p_set_id;
@@ -5665,12 +5673,12 @@
     </section>
 
 <!-- Function logtrigger(  ) -->
-    <section id="schemadoc.function.logtrigger"
+    <section id="function.logtrigger"
              xreflabel="schemadoclogtrigger(  )">
-      <title id="schemadoc.function.logtrigger-title">
+      <title id="function.logtrigger-title">
        logtrigger(  )
       </title>
-      <titleabbrev id="schemadoc.function.logtrigger-titleabbrev">
+      <titleabbrev id="function.logtrigger-titleabbrev">
        logtrigger(  )
       </titleabbrev>
 
@@ -5693,12 +5701,12 @@
     </section>
 
 <!-- Function mergeset( integer, integer ) -->
-    <section id="schemadoc.function.mergeset-integer-integer"
+    <section id="function.mergeset-integer-integer"
              xreflabel="schemadocmergeset( integer, integer )">
-      <title id="schemadoc.function.mergeset-integer-integer-title">
+      <title id="function.mergeset-integer-integer-title">
        mergeset( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.mergeset-integer-integer-titleabbrev">
+      <titleabbrev id="function.mergeset-integer-integer-titleabbrev">
        mergeset( integer, integer )
       </titleabbrev>
 
@@ -5727,7 +5735,7 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 	
 	-- ----
 	-- Check that both sets exist and originate here
@@ -5735,22 +5743,22 @@
 	if p_set_id = p_add_id then
 		raise exception &#39;Slony-I: merged set ids cannot be identical&#39;;
 	end if;
-	select set_origin into v_origin from schemadoc.sl_set
+	select set_origin into v_origin from sl_set
 			where set_id = p_set_id;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_set_id;
 	end if;
-	if v_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				p_set_id;
 	end if;
 
-	select set_origin into v_origin from schemadoc.sl_set
+	select set_origin into v_origin from sl_set
 			where set_id = p_add_id;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_add_id;
 	end if;
-	if v_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				p_add_id;
 	end if;
@@ -5758,20 +5766,20 @@
 	-- ----
 	-- Check that both sets are subscribed by the same set of nodes
 	-- ----
-	if exists (select true from schemadoc.sl_subscribe SUB1
+	if exists (select true from sl_subscribe SUB1
 				where SUB1.sub_set = p_set_id
 				and SUB1.sub_receiver not in (select SUB2.sub_receiver
-						from schemadoc.sl_subscribe SUB2
+						from sl_subscribe SUB2
 						where SUB2.sub_set = p_add_id))
 	then
 		raise exception &#39;Slony-I: subscriber lists of set % and % are different&#39;,
 				p_set_id, p_add_id;
 	end if;
 
-	if exists (select true from schemadoc.sl_subscribe SUB1
+	if exists (select true from sl_subscribe SUB1
 				where SUB1.sub_set = p_add_id
 				and SUB1.sub_receiver not in (select SUB2.sub_receiver
-						from schemadoc.sl_subscribe SUB2
+						from sl_subscribe SUB2
 						where SUB2.sub_set = p_set_id))
 	then
 		raise exception &#39;Slony-I: subscriber lists of set % and % are different&#39;,
@@ -5781,9 +5789,9 @@
 	-- ----
 	-- Create a SYNC event, merge the sets, create a MERGE_SET event
 	-- ----
-	perform schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;, NULL);
-	perform schemadoc.mergeSet_int(p_set_id, p_add_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;MERGE_SET&#39;, 
+	perform createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;, NULL);
+	perform mergeSet_int(p_set_id, p_add_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;MERGE_SET&#39;, 
 			p_set_id, p_add_id);
 end;
 </programlisting>
@@ -5791,12 +5799,12 @@
     </section>
 
 <!-- Function mergeset_int( integer, integer ) -->
-    <section id="schemadoc.function.mergeset-int-integer-integer"
+    <section id="function.mergeset-int-integer-integer"
              xreflabel="schemadocmergeset_int( integer, integer )">
-      <title id="schemadoc.function.mergeset-int-integer-integer-title">
+      <title id="function.mergeset-int-integer-integer-title">
        mergeset_int( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.mergeset-int-integer-integer-titleabbrev">
+      <titleabbrev id="function.mergeset-int-integer-integer-titleabbrev">
        mergeset_int( integer, integer )
       </titleabbrev>
 
@@ -5822,19 +5830,19 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 	
-	update schemadoc.sl_sequence
+	update sl_sequence
 			set seq_set = p_set_id
 			where seq_set = p_add_id;
-	update schemadoc.sl_table
+	update sl_table
 			set tab_set = p_set_id
 			where tab_set = p_add_id;
-	delete from schemadoc.sl_subscribe
+	delete from sl_subscribe
 			where sub_set = p_add_id;
-	delete from schemadoc.sl_setsync
+	delete from sl_setsync
 			where ssy_setid = p_add_id;
-	delete from schemadoc.sl_set
+	delete from sl_set
 			where set_id = p_add_id;
 
 	return p_set_id;
@@ -5844,12 +5852,12 @@
     </section>
 
 <!-- Function moveset( integer, integer ) -->
-    <section id="schemadoc.function.moveset-integer-integer"
+    <section id="function.moveset-integer-integer"
              xreflabel="schemadocmoveset( integer, integer )">
-      <title id="schemadoc.function.moveset-integer-integer-title">
+      <title id="function.moveset-integer-integer-title">
        moveset( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.moveset-integer-integer-titleabbrev">
+      <titleabbrev id="function.moveset-integer-integer-titleabbrev">
        moveset( integer, integer )
       </titleabbrev>
 
@@ -5881,14 +5889,14 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that the set is locked and that this locking
 	-- happened long enough ago.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
-	select * into v_set_row from schemadoc.sl_set
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
+	select * into v_set_row from sl_set
 			where set_id = p_set_id
 			for update;
 	if not found then
@@ -5901,7 +5909,7 @@
 	if v_set_row.set_locked isnull then
 		raise exception &#39;Slony-I: set % is not locked&#39;, p_set_id;
 	end if;
-	if v_set_row.set_locked &gt; schemadoc.getMinXid() then
+	if v_set_row.set_locked &gt; getMinXid() then
 		raise exception &#39;Slony-I: cannot move set % yet, transactions &lt; % are still in progress&#39;,
 				p_set_id, v_set_row.set_locked;
 	end if;
@@ -5909,12 +5917,12 @@
 	-- ----
 	-- Unlock the set
 	-- ----
-	perform schemadoc.unlockSet(p_set_id);
+	perform unlockSet(p_set_id);
 
 	-- ----
 	-- Check that the new_origin is an active subscriber of the set
 	-- ----
-	select * into v_sub_row from schemadoc.sl_subscribe
+	select * into v_sub_row from sl_subscribe
 			where sub_set = p_set_id
 			and sub_receiver = p_new_origin;
 	if not found then
@@ -5929,27 +5937,27 @@
 	-- ----
 	-- Reconfigure everything
 	-- ----
-	perform schemadoc.moveSet_int(p_set_id, v_local_node_id,
+	perform moveSet_int(p_set_id, v_local_node_id,
 			p_new_origin);
 
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	-- ----
 	-- At this time we hold access exclusive locks for every table
 	-- in the set. But we did move the set to the new origin, so the
 	-- createEvent() we are doing now will not record the sequences.
 	-- ----
-	v_sync_seqno := schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;);
-	insert into schemadoc.sl_seqlog 
+	v_sync_seqno := createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;);
+	insert into sl_seqlog 
 			(seql_seqid, seql_origin, seql_ev_seqno, seql_last_value)
 			select seq_id, v_local_node_id, v_sync_seqno, seq_last_value
-			from schemadoc.sl_seqlastvalue
+			from sl_seqlastvalue
 			where seq_set = p_set_id;
 					
 	-- ----
 	-- Finally we generate the real event
 	-- ----
-	return schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;MOVE_SET&#39;, 
+	return createEvent(&#39;_schemadoc&#39;, &#39;MOVE_SET&#39;, 
 			p_set_id, v_local_node_id, p_new_origin);
 end;
 </programlisting>
@@ -5957,12 +5965,12 @@
     </section>
 
 <!-- Function moveset_int( integer, integer, integer ) -->
-    <section id="schemadoc.function.moveset-int-integer-integer-integer"
+    <section id="function.moveset-int-integer-integer-integer"
              xreflabel="schemadocmoveset_int( integer, integer, integer )">
-      <title id="schemadoc.function.moveset-int-integer-integer-integer-title">
+      <title id="function.moveset-int-integer-integer-integer-title">
        moveset_int( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.moveset-int-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.moveset-int-integer-integer-integer-titleabbrev">
        moveset_int( integer, integer, integer )
       </titleabbrev>
 
@@ -5998,23 +6006,23 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Get our local node ID
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 
 	-- ----
 	-- If we are the old or new origin of the set, we need to
 	-- remove the log trigger from all tables first.
 	-- ----
 	if v_local_node_id = p_old_origin or v_local_node_id = p_new_origin then
-		for v_tab_row in select tab_id from schemadoc.sl_table
+		for v_tab_row in select tab_id from sl_table
 				where tab_set = p_set_id
 				order by tab_id
 		loop
-			perform schemadoc.alterTableRestore(v_tab_row.tab_id);
+			perform alterTableRestore(v_tab_row.tab_id);
 		end loop;
 	end if;
 
@@ -6023,7 +6031,7 @@
 	-- ----
 	v_sub_last = p_new_origin;
 	select sub_provider into v_sub_node
-			from schemadoc.sl_subscribe
+			from sl_subscribe
 			where sub_receiver = p_new_origin;
 	if not found then
 		raise exception &#39;Slony-I: subscription path broken in moveSet_int&#39;;
@@ -6040,14 +6048,14 @@
 		-- the reverse chain.
 		-- ----
 		select sub_provider into v_sub_next
-				from schemadoc.sl_subscribe
+				from sl_subscribe
 				where sub_set = p_set_id
 					and sub_receiver = v_sub_node
 				for update;
 		if not found then
 			raise exception &#39;Slony-I: subscription path broken in moveSet_int&#39;;
 		end if;
-		update schemadoc.sl_subscribe
+		update sl_subscribe
 				set sub_provider = v_sub_last
 				where sub_set = p_set_id
 					and sub_receiver = v_sub_node;
@@ -6059,26 +6067,26 @@
 	-- ----
 	-- This includes creating a subscription for the old origin
 	-- ----
-	insert into schemadoc.sl_subscribe
+	insert into sl_subscribe
 			(sub_set, sub_provider, sub_receiver,
 			sub_forward, sub_active)
 			values (p_set_id, v_sub_last, p_old_origin, true, true);
 	if v_local_node_id = p_old_origin then
 		select coalesce(max(ev_seqno), 0) into v_last_sync 
-				from schemadoc.sl_event
+				from sl_event
 				where ev_origin = p_new_origin
 					and ev_type = &#39;SYNC&#39;;
 		if v_last_sync &gt; 0 then
-			insert into schemadoc.sl_setsync
+			insert into sl_setsync
 					(ssy_setid, ssy_origin, ssy_seqno,
 					ssy_minxid, ssy_maxxid, ssy_xip, ssy_action_list)
 					select p_set_id, p_new_origin, v_last_sync,
 					ev_minxid, ev_maxxid, ev_xip, NULL
-					from schemadoc.sl_event
+					from sl_event
 					where ev_origin = p_new_origin
 						and ev_seqno = v_last_sync;
 		else
-			insert into schemadoc.sl_setsync
+			insert into sl_setsync
 					(ssy_setid, ssy_origin, ssy_seqno,
 					ssy_minxid, ssy_maxxid, ssy_xip, ssy_action_list)
 					values (p_set_id, p_new_origin, &#39;0&#39;,
@@ -6089,7 +6097,7 @@
 	-- ----
 	-- Now change the ownership of the set.
 	-- ----
-	update schemadoc.sl_set
+	update sl_set
 			set set_origin = p_new_origin
 			where set_id = p_set_id;
 
@@ -6098,7 +6106,7 @@
 	-- and the subscription.
 	-- ----
 	if v_local_node_id = p_new_origin then
-		delete from schemadoc.sl_setsync
+		delete from sl_setsync
 				where ssy_setid = p_set_id;
 	else
 		if v_local_node_id &lt;&gt; p_old_origin then
@@ -6106,23 +6114,23 @@
 			-- On every other node, change the setsync so that it will
 			-- pick up from the new origins last known sync.
 			--
-			delete from schemadoc.sl_setsync
+			delete from sl_setsync
 					where ssy_setid = p_set_id;
 			select coalesce(max(ev_seqno), 0) into v_last_sync
-					from schemadoc.sl_event
+					from sl_event
 					where ev_origin = p_new_origin
 						and ev_type = &#39;SYNC&#39;;
 			if v_last_sync &gt; 0 then
-				insert into schemadoc.sl_setsync
+				insert into sl_setsync
 						(ssy_setid, ssy_origin, ssy_seqno,
 						ssy_minxid, ssy_maxxid, ssy_xip, ssy_action_list)
 						select p_set_id, p_new_origin, v_last_sync,
 						ev_minxid, ev_maxxid, ev_xip, NULL
-						from schemadoc.sl_event
+						from sl_event
 						where ev_origin = p_new_origin
 							and ev_seqno = v_last_sync;
 			else
-				insert into schemadoc.sl_setsync
+				insert into sl_setsync
 						(ssy_setid, ssy_origin, ssy_seqno,
 						ssy_minxid, ssy_maxxid, ssy_xip, ssy_action_list)
 						values (p_set_id, p_new_origin, &#39;0&#39;,
@@ -6130,23 +6138,23 @@
 			end if;
 		end if;
 	end if;
-	delete from schemadoc.sl_subscribe
+	delete from sl_subscribe
 			where sub_set = p_set_id
 			and sub_receiver = p_new_origin;
 
 	-- Regenerate sl_listen since we revised the subscriptions
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	-- ----
 	-- If we are the new or old origin, we have to
 	-- put all the tables into altered state again.
 	-- ----
 	if v_local_node_id = p_old_origin or v_local_node_id = p_new_origin then
-		for v_tab_row in select tab_id from schemadoc.sl_table
+		for v_tab_row in select tab_id from sl_table
 				where tab_set = p_set_id
 				order by tab_id
 		loop
-			perform schemadoc.alterTableForReplication(v_tab_row.tab_id);
+			perform alterTableForReplication(v_tab_row.tab_id);
 		end loop;
 	end if;
 
@@ -6157,12 +6165,12 @@
     </section>
 
 <!-- Function rebuildlistenentries(  ) -->
-    <section id="schemadoc.function.rebuildlistenentries"
+    <section id="function.rebuildlistenentries"
              xreflabel="schemadocrebuildlistenentries(  )">
-      <title id="schemadoc.function.rebuildlistenentries-title">
+      <title id="function.rebuildlistenentries-title">
        rebuildlistenentries(  )
       </title>
-      <titleabbrev id="schemadoc.function.rebuildlistenentries-titleabbrev">
+      <titleabbrev id="function.rebuildlistenentries-titleabbrev">
        rebuildlistenentries(  )
       </titleabbrev>
 
@@ -6188,14 +6196,14 @@
 	v_row			record;
 begin
 	-- First remove the entire configuration
-	delete from schemadoc.sl_listen;
+	delete from sl_listen;
 
 	-- The loop over every possible pair of origin, receiver
 	for v_row in select N1.no_id as origin, N2.no_id as receiver
-			from schemadoc.sl_node N1, schemadoc.sl_node N2
+			from sl_node N1, sl_node N2
 			where N1.no_id &lt;&gt; N2.no_id
 	loop
-		perform schemadoc.RebuildListenEntriesOne(v_row.origin, v_row.receiver);
+		perform RebuildListenEntriesOne(v_row.origin, v_row.receiver);
 	end loop;
 
 	return 0;
@@ -6205,12 +6213,12 @@
     </section>
 
 <!-- Function rebuildlistenentriesone( integer, integer ) -->
-    <section id="schemadoc.function.rebuildlistenentriesone-integer-integer"
+    <section id="function.rebuildlistenentriesone-integer-integer"
              xreflabel="schemadocrebuildlistenentriesone( integer, integer )">
-      <title id="schemadoc.function.rebuildlistenentriesone-integer-integer-title">
+      <title id="function.rebuildlistenentriesone-integer-integer-title">
        rebuildlistenentriesone( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.rebuildlistenentriesone-integer-integer-titleabbrev">
+      <titleabbrev id="function.rebuildlistenentriesone-integer-integer-titleabbrev">
        rebuildlistenentriesone( integer, integer )
       </titleabbrev>
 
@@ -6238,15 +6246,15 @@
 	-- 1. If the receiver is subscribed to any set from the origin,
 	--    listen on the same provider(s).
 	for v_row in select distinct sub_provider
-			from schemadoc.sl_subscribe, schemadoc.sl_set,
-				schemadoc.sl_path
+			from sl_subscribe, sl_set,
+				sl_path
 			where sub_set = set_id
 			and set_origin = p_origin
 			and sub_receiver = p_receiver
 			and sub_provider = pa_server
 			and sub_receiver = pa_client
 	loop
-		perform schemadoc.storeListen_int(p_origin, 
+		perform storeListen_int(p_origin, 
 				v_row.sub_provider, p_receiver);
 	end loop;
 	if found then
@@ -6256,11 +6264,11 @@
 	-- 2. If the receiver has a direct path to the provider,
 	--    use that.
 	if exists (select true
-			from schemadoc.sl_path
+			from sl_path
 			where pa_server = p_origin
 			and pa_client = p_receiver)
 	then
-		perform schemadoc.storeListen_int(p_origin, p_origin, p_receiver);
+		perform storeListen_int(p_origin, p_origin, p_receiver);
 		return 1;
 	end if;
 
@@ -6269,18 +6277,18 @@
 	--    normal subscription routes).
 	for v_row in select distinct provider from (
 			select sub_provider as provider
-					from schemadoc.sl_subscribe
+					from sl_subscribe
 					where sub_receiver = p_receiver
 			union
 			select sub_receiver as provider
-					from schemadoc.sl_subscribe
+					from sl_subscribe
 					where sub_provider = p_receiver
-					and exists (select true from schemadoc.sl_path
+					and exists (select true from sl_path
 								where pa_server = sub_receiver
 								and pa_client = sub_provider)
 			) as S
 	loop
-		perform schemadoc.storeListen_int(p_origin,
+		perform storeListen_int(p_origin,
 				v_row.provider, p_receiver);
 	end loop;
 	if found then
@@ -6293,10 +6301,10 @@
 	--    is built or a new node added. This brute force fallback
 	--    ensures that events will propagate if possible at all.
 	for v_row in select pa_server as provider
-			from schemadoc.sl_path
+			from sl_path
 			where pa_client = p_receiver
 	loop
-		perform schemadoc.storeListen_int(p_origin, 
+		perform storeListen_int(p_origin, 
 				v_row.provider, p_receiver);
 	end loop;
 	if found then
@@ -6310,12 +6318,12 @@
     </section>
 
 <!-- Function sequencelastvalue( text ) -->
-    <section id="schemadoc.function.sequencelastvalue-text"
+    <section id="function.sequencelastvalue-text"
              xreflabel="schemadocsequencelastvalue( text )">
-      <title id="schemadoc.function.sequencelastvalue-text-title">
+      <title id="function.sequencelastvalue-text-title">
        sequencelastvalue( text )
       </title>
-      <titleabbrev id="schemadoc.function.sequencelastvalue-text-titleabbrev">
+      <titleabbrev id="function.sequencelastvalue-text-titleabbrev">
        sequencelastvalue( text )
       </titleabbrev>
 
@@ -6349,12 +6357,12 @@
     </section>
 
 <!-- Function sequencesetvalue( integer, integer, bigint, bigint ) -->
-    <section id="schemadoc.function.sequencesetvalue-integer-integer-bigint-bigint"
+    <section id="function.sequencesetvalue-integer-integer-bigint-bigint"
              xreflabel="schemadocsequencesetvalue( integer, integer, bigint, bigint )">
-      <title id="schemadoc.function.sequencesetvalue-integer-integer-bigint-bigint-title">
+      <title id="function.sequencesetvalue-integer-integer-bigint-bigint-title">
        sequencesetvalue( integer, integer, bigint, bigint )
       </title>
-      <titleabbrev id="schemadoc.function.sequencesetvalue-integer-integer-bigint-bigint-titleabbrev">
+      <titleabbrev id="function.sequencesetvalue-integer-integer-bigint-bigint-titleabbrev">
        sequencesetvalue( integer, integer, bigint, bigint )
       </titleabbrev>
 
@@ -6386,7 +6394,7 @@
 	-- ----
 	select &quot;pg_catalog&quot;.quote_ident(PGN.nspname) || &#39;.&#39; ||
 			&quot;pg_catalog&quot;.quote_ident(PGC.relname) into v_fqname
-		from schemadoc.sl_sequence SQ,
+		from sl_sequence SQ,
 			&quot;pg_catalog&quot;.pg_class PGC, &quot;pg_catalog&quot;.pg_namespace PGN
 		where SQ.seq_id = p_seq_id
 			and SQ.seq_reloid = PGC.oid
@@ -6401,7 +6409,7 @@
 	execute &#39;select setval(&#39;&#39;&#39; || v_fqname ||
 			&#39;&#39;&#39;, &#39;&#39;&#39; || p_last_value || &#39;&#39;&#39;)&#39;;
 
-	insert into schemadoc.sl_seqlog
+	insert into sl_seqlog
 			(seql_seqid, seql_origin, seql_ev_seqno, seql_last_value)
 			values (p_seq_id, p_seq_origin, p_ev_seqno, p_last_value);
 
@@ -6412,12 +6420,12 @@
     </section>
 
 <!-- Function setaddsequence( integer, integer, text, text ) -->
-    <section id="schemadoc.function.setaddsequence-integer-integer-text-text"
+    <section id="function.setaddsequence-integer-integer-text-text"
              xreflabel="schemadocsetaddsequence( integer, integer, text, text )">
-      <title id="schemadoc.function.setaddsequence-integer-integer-text-text-title">
+      <title id="function.setaddsequence-integer-integer-text-text-title">
        setaddsequence( integer, integer, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.setaddsequence-integer-integer-text-text-titleabbrev">
+      <titleabbrev id="function.setaddsequence-integer-integer-text-text-titleabbrev">
        setaddsequence( integer, integer, text, text )
       </titleabbrev>
 
@@ -6449,22 +6457,22 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that we are the origin of the set
 	-- ----
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setAddSequence(): set % not found&#39;, p_set_id;
 	end if;
-	if v_set_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_set_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: setAddSequence(): set % has remote origin&#39;, p_set_id;
 	end if;
 
-	if exists (select true from schemadoc.sl_subscribe
+	if exists (select true from sl_subscribe
 			where sub_set = p_set_id)
 	then
 		raise exception &#39;Slony-I: cannot add sequence to currently subscribed set %&#39;,
@@ -6474,9 +6482,9 @@
 	-- ----
 	-- Add the sequence to the set and generate the SET_ADD_SEQUENCE event
 	-- ----
-	perform schemadoc.setAddSequence_int(p_set_id, p_seq_id, p_fqname,
+	perform setAddSequence_int(p_set_id, p_seq_id, p_fqname,
 			p_seq_comment);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SET_ADD_SEQUENCE&#39;,
+	return  createEvent(&#39;_schemadoc&#39;, &#39;SET_ADD_SEQUENCE&#39;,
 			p_set_id, p_seq_id, p_fqname, p_seq_comment);
 end;
 </programlisting>
@@ -6484,12 +6492,12 @@
     </section>
 
 <!-- Function setaddsequence_int( integer, integer, text, text ) -->
-    <section id="schemadoc.function.setaddsequence-int-integer-integer-text-text"
+    <section id="function.setaddsequence-int-integer-integer-text-text"
              xreflabel="schemadocsetaddsequence_int( integer, integer, text, text )">
-      <title id="schemadoc.function.setaddsequence-int-integer-integer-text-text-title">
+      <title id="function.setaddsequence-int-integer-integer-text-text-title">
        setaddsequence_int( integer, integer, text, text )
       </title>
-      <titleabbrev id="schemadoc.function.setaddsequence-int-integer-integer-text-text-titleabbrev">
+      <titleabbrev id="function.setaddsequence-int-integer-integer-text-text-titleabbrev">
        setaddsequence_int( integer, integer, text, text )
       </titleabbrev>
 
@@ -6527,16 +6535,16 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- For sets with a remote origin, check that we are subscribed 
 	-- to that set. Otherwise we ignore the sequence because it might 
 	-- not even exist in our database.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setAddSequence_int(): set % not found&#39;,
@@ -6544,9 +6552,9 @@
 	end if;
 	if v_set_origin != v_local_node_id then
 		select sub_provider into v_sub_provider
-				from schemadoc.sl_subscribe
+				from sl_subscribe
 				where sub_set = p_set_id
-				and sub_receiver = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+				and sub_receiver = getLocalNodeId(&#39;_schemadoc&#39;);
 		if not found then
 			return 0;
 		end if;
@@ -6573,7 +6581,7 @@
 	-- ----
 	-- Add the sequence to sl_sequence
 	-- ----
-	insert into schemadoc.sl_sequence
+	insert into sl_sequence
 		(seq_id, seq_reloid, seq_relname, seq_nspname, seq_set, seq_comment) 
 		values
 		(p_seq_id, v_seq_reloid, v_seq_relname, v_seq_nspname,  p_set_id, p_seq_comment);
@@ -6583,15 +6591,15 @@
 	-- ----
 	if v_set_origin = v_local_node_id then
 		for v_sync_row in select coalesce (max(ev_seqno), 0) as ev_seqno
-				from schemadoc.sl_event
+				from sl_event
 				where ev_origin = v_local_node_id
 					and ev_type = &#39;SYNC&#39;
 		loop
-			insert into schemadoc.sl_seqlog
+			insert into sl_seqlog
 					(seql_seqid, seql_origin, seql_ev_seqno, 
 					seql_last_value) values
 					(p_seq_id, v_local_node_id, v_sync_row.ev_seqno,
-					schemadoc.sequenceLastValue(p_fqname));
+					sequenceLastValue(p_fqname));
 		end loop;
 	end if;
 
@@ -6602,12 +6610,12 @@
     </section>
 
 <!-- Function setaddtable( integer, integer, text, name, text ) -->
-    <section id="schemadoc.function.setaddtable-integer-integer-text-name-text"
+    <section id="function.setaddtable-integer-integer-text-name-text"
              xreflabel="schemadocsetaddtable( integer, integer, text, name, text )">
-      <title id="schemadoc.function.setaddtable-integer-integer-text-name-text-title">
+      <title id="function.setaddtable-integer-integer-text-name-text-title">
        setaddtable( integer, integer, text, name, text )
       </title>
-      <titleabbrev id="schemadoc.function.setaddtable-integer-integer-text-name-text-titleabbrev">
+      <titleabbrev id="function.setaddtable-integer-integer-text-name-text-titleabbrev">
        setaddtable( integer, integer, text, name, text )
       </titleabbrev>
 
@@ -6641,22 +6649,22 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that we are the origin of the set
 	-- ----
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setAddTable(): set % not found&#39;, p_set_id;
 	end if;
-	if v_set_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_set_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: setAddTable(): set % has remote origin&#39;, p_set_id;
 	end if;
 
-	if exists (select true from schemadoc.sl_subscribe
+	if exists (select true from sl_subscribe
 			where sub_set = p_set_id)
 	then
 		raise exception &#39;Slony-I: cannot add table to currently subscribed set %&#39;,
@@ -6666,9 +6674,9 @@
 	-- ----
 	-- Add the table to the set and generate the SET_ADD_TABLE event
 	-- ----
-	perform schemadoc.setAddTable_int(p_set_id, p_tab_id, p_fqname,
+	perform setAddTable_int(p_set_id, p_tab_id, p_fqname,
 			p_tab_idxname, p_tab_comment);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SET_ADD_TABLE&#39;,
+	return  createEvent(&#39;_schemadoc&#39;, &#39;SET_ADD_TABLE&#39;,
 			p_set_id, p_tab_id, p_fqname,
 			p_tab_idxname, p_tab_comment);
 end;
@@ -6677,12 +6685,12 @@
     </section>
 
 <!-- Function setaddtable_int( integer, integer, text, name, text ) -->
-    <section id="schemadoc.function.setaddtable-int-integer-integer-text-name-text"
+    <section id="function.setaddtable-int-integer-integer-text-name-text"
              xreflabel="schemadocsetaddtable_int( integer, integer, text, name, text )">
-      <title id="schemadoc.function.setaddtable-int-integer-integer-text-name-text-title">
+      <title id="function.setaddtable-int-integer-integer-text-name-text-title">
        setaddtable_int( integer, integer, text, name, text )
       </title>
-      <titleabbrev id="schemadoc.function.setaddtable-int-integer-integer-text-name-text-titleabbrev">
+      <titleabbrev id="function.setaddtable-int-integer-integer-text-name-text-titleabbrev">
        setaddtable_int( integer, integer, text, name, text )
       </titleabbrev>
 
@@ -6722,16 +6730,16 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- For sets with a remote origin, check that we are subscribed 
 	-- to that set. Otherwise we ignore the table because it might 
 	-- not even exist in our database.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setAddTable_int(): set % not found&#39;,
@@ -6739,9 +6747,9 @@
 	end if;
 	if v_set_origin != v_local_node_id then
 		select sub_provider into v_sub_provider
-				from schemadoc.sl_subscribe
+				from sl_subscribe
 				where sub_set = p_set_id
-				and sub_receiver = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+				and sub_receiver = getLocalNodeId(&#39;_schemadoc&#39;);
 		if not found then
 			return 0;
 		end if;
@@ -6777,13 +6785,13 @@
 	-- ----
 	-- Add the table to sl_table and create the trigger on it.
 	-- ----
-	insert into schemadoc.sl_table
+	insert into sl_table
 			(tab_id, tab_reloid, tab_relname, tab_nspname, 
 			tab_set, tab_idxname, tab_altered, tab_comment) 
 			values
 			(p_tab_id, v_tab_reloid, v_tab_relname, v_tab_nspname,
 			p_set_id, p_tab_idxname, false, p_tab_comment);
-	perform schemadoc.alterTableForReplication(p_tab_id);
+	perform alterTableForReplication(p_tab_id);
 
 	return p_tab_id;
 end;
@@ -6792,12 +6800,12 @@
     </section>
 
 <!-- Function setdropsequence( integer ) -->
-    <section id="schemadoc.function.setdropsequence-integer"
+    <section id="function.setdropsequence-integer"
              xreflabel="schemadocsetdropsequence( integer )">
-      <title id="schemadoc.function.setdropsequence-integer-title">
+      <title id="function.setdropsequence-integer-title">
        setdropsequence( integer )
       </title>
-      <titleabbrev id="schemadoc.function.setdropsequence-integer-titleabbrev">
+      <titleabbrev id="function.setdropsequence-integer-titleabbrev">
        setdropsequence( integer )
       </titleabbrev>
 
@@ -6827,12 +6835,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Determine set id for this sequence
 	-- ----
-	select seq_set into v_set_id from schemadoc.sl_sequence where seq_id = p_seq_id;
+	select seq_set into v_set_id from sl_sequence where seq_id = p_seq_id;
 
 	-- ----
 	-- Ensure sequence exists
@@ -6846,20 +6854,20 @@
 	-- Check that we are the origin of the set
 	-- ----
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = v_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setDropSequence(): set % not found&#39;, v_set_id;
 	end if;
-	if v_set_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_set_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: setDropSequence(): set % has remote origin&#39;, v_set_id;
 	end if;
 
 	-- ----
 	-- Add the sequence to the set and generate the SET_ADD_SEQUENCE event
 	-- ----
-	perform schemadoc.setDropSequence_int(p_seq_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SET_DROP_SEQUENCE&#39;,
+	perform setDropSequence_int(p_seq_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;SET_DROP_SEQUENCE&#39;,
 			p_seq_id);
 end;
 </programlisting>
@@ -6867,12 +6875,12 @@
     </section>
 
 <!-- Function setdropsequence_int( integer ) -->
-    <section id="schemadoc.function.setdropsequence-int-integer"
+    <section id="function.setdropsequence-int-integer"
              xreflabel="schemadocsetdropsequence_int( integer )">
-      <title id="schemadoc.function.setdropsequence-int-integer-title">
+      <title id="function.setdropsequence-int-integer-title">
        setdropsequence_int( integer )
       </title>
-      <titleabbrev id="schemadoc.function.setdropsequence-int-integer-titleabbrev">
+      <titleabbrev id="function.setdropsequence-int-integer-titleabbrev">
        setdropsequence_int( integer )
       </titleabbrev>
 
@@ -6906,12 +6914,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Determine set id for this sequence
 	-- ----
-	select seq_set into v_set_id from schemadoc.sl_sequence where seq_id = p_seq_id;
+	select seq_set into v_set_id from sl_sequence where seq_id = p_seq_id;
 
 	-- ----
 	-- Ensure sequence exists
@@ -6925,9 +6933,9 @@
 	-- to that set. Otherwise we ignore the sequence because it might 
 	-- not even exist in our database.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = v_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setDropSequence_int(): set % not found&#39;,
@@ -6935,9 +6943,9 @@
 	end if;
 	if v_set_origin != v_local_node_id then
 		select sub_provider into v_sub_provider
-				from schemadoc.sl_subscribe
+				from sl_subscribe
 				where sub_set = v_set_id
-				and sub_receiver = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+				and sub_receiver = getLocalNodeId(&#39;_schemadoc&#39;);
 		if not found then
 			return 0;
 		end if;
@@ -6946,8 +6954,8 @@
 	-- ----
 	-- drop the sequence from sl_sequence, sl_seqlog
 	-- ----
-	delete from schemadoc.sl_seqlog where seql_seqid = p_seq_id;
-	delete from schemadoc.sl_sequence where seq_id = p_seq_id;
+	delete from sl_seqlog where seql_seqid = p_seq_id;
+	delete from sl_sequence where seq_id = p_seq_id;
 
 	return p_seq_id;
 end;
@@ -6956,12 +6964,12 @@
     </section>
 
 <!-- Function setdroptable( integer ) -->
-    <section id="schemadoc.function.setdroptable-integer"
+    <section id="function.setdroptable-integer"
              xreflabel="schemadocsetdroptable( integer )">
-      <title id="schemadoc.function.setdroptable-integer-title">
+      <title id="function.setdroptable-integer-title">
        setdroptable( integer )
       </title>
-      <titleabbrev id="schemadoc.function.setdroptable-integer-titleabbrev">
+      <titleabbrev id="function.setdroptable-integer-titleabbrev">
        setdroptable( integer )
       </titleabbrev>
 
@@ -6990,12 +6998,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
         -- ----
 	-- Determine the set_id
         -- ----
-	select tab_set into v_set_id from schemadoc.sl_table where tab_id = p_tab_id;
+	select tab_set into v_set_id from sl_table where tab_id = p_tab_id;
 
 	-- ----
 	-- Ensure table exists
@@ -7009,32 +7017,32 @@
 	-- Check that we are the origin of the set
 	-- ----
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = v_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setDropTable(): set % not found&#39;, v_set_id;
 	end if;
-	if v_set_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_set_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: setDropTable(): set % has remote origin&#39;, v_set_id;
 	end if;
 
 	-- ----
 	-- Drop the table from the set and generate the SET_ADD_TABLE event
 	-- ----
-	perform schemadoc.setDropTable_int(p_tab_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SET_DROP_TABLE&#39;, p_tab_id);
+	perform setDropTable_int(p_tab_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;SET_DROP_TABLE&#39;, p_tab_id);
 end;
 </programlisting>
       </para>
     </section>
 
 <!-- Function setdroptable_int( integer ) -->
-    <section id="schemadoc.function.setdroptable-int-integer"
+    <section id="function.setdroptable-int-integer"
              xreflabel="schemadocsetdroptable_int( integer )">
-      <title id="schemadoc.function.setdroptable-int-integer-title">
+      <title id="function.setdroptable-int-integer-title">
        setdroptable_int( integer )
       </title>
-      <titleabbrev id="schemadoc.function.setdroptable-int-integer-titleabbrev">
+      <titleabbrev id="function.setdroptable-int-integer-titleabbrev">
        setdroptable_int( integer )
       </titleabbrev>
 
@@ -7067,12 +7075,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
         -- ----
 	-- Determine the set_id
         -- ----
-	select tab_set into v_set_id from schemadoc.sl_table where tab_id = p_tab_id;
+	select tab_set into v_set_id from sl_table where tab_id = p_tab_id;
 
 	-- ----
 	-- Ensure table exists
@@ -7086,9 +7094,9 @@
 	-- to that set. Otherwise we ignore the table because it might 
 	-- not even exist in our database.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = v_set_id;
 	if not found then
 		raise exception &#39;Slony-I: setDropTable_int(): set % not found&#39;,
@@ -7096,9 +7104,9 @@
 	end if;
 	if v_set_origin != v_local_node_id then
 		select sub_provider into v_sub_provider
-				from schemadoc.sl_subscribe
+				from sl_subscribe
 				where sub_set = v_set_id
-				and sub_receiver = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+				and sub_receiver = getLocalNodeId(&#39;_schemadoc&#39;);
 		if not found then
 			return 0;
 		end if;
@@ -7107,9 +7115,9 @@
 	-- ----
 	-- Drop the table from sl_table and drop trigger from it.
 	-- ----
-	perform schemadoc.alterTableRestore(p_tab_id);
-	perform schemadoc.tableDropKey(p_tab_id);
-	delete from schemadoc.sl_table where tab_id = p_tab_id;
+	perform alterTableRestore(p_tab_id);
+	perform tableDropKey(p_tab_id);
+	delete from sl_table where tab_id = p_tab_id;
 	return p_tab_id;
 end;
 </programlisting>
@@ -7117,12 +7125,12 @@
     </section>
 
 <!-- Function setmovesequence( integer, integer ) -->
-    <section id="schemadoc.function.setmovesequence-integer-integer"
+    <section id="function.setmovesequence-integer-integer"
              xreflabel="schemadocsetmovesequence( integer, integer )">
-      <title id="schemadoc.function.setmovesequence-integer-integer-title">
+      <title id="function.setmovesequence-integer-integer-title">
        setmovesequence( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.setmovesequence-integer-integer-titleabbrev">
+      <titleabbrev id="function.setmovesequence-integer-integer-titleabbrev">
        setmovesequence( integer, integer )
       </titleabbrev>
 
@@ -7149,12 +7157,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Get the sequences current set
 	-- ----
-	select seq_set into v_old_set_id from schemadoc.sl_sequence
+	select seq_set into v_old_set_id from sl_sequence
 			where seq_id = p_seq_id;
 	if not found then
 		raise exception &#39;Slony-I: sequence %d not found&#39;, p_seq_id;
@@ -7166,22 +7174,22 @@
 	if p_new_set_id = v_old_set_id then
 		raise exception &#39;Slony-I: set ids cannot be identical&#39;;
 	end if;
-	select set_origin into v_origin from schemadoc.sl_set
+	select set_origin into v_origin from sl_set
 			where set_id = p_new_set_id;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_new_set_id;
 	end if;
-	if v_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				p_new_set_id;
 	end if;
 
-	select set_origin into v_origin from schemadoc.sl_set
+	select set_origin into v_origin from sl_set
 			where set_id = v_old_set_id;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, v_old_set_id;
 	end if;
-	if v_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				v_old_set_id;
 	end if;
@@ -7189,20 +7197,20 @@
 	-- ----
 	-- Check that both sets are subscribed by the same set of nodes
 	-- ----
-	if exists (select true from schemadoc.sl_subscribe SUB1
+	if exists (select true from sl_subscribe SUB1
 				where SUB1.sub_set = p_new_set_id
 				and SUB1.sub_receiver not in (select SUB2.sub_receiver
-						from schemadoc.sl_subscribe SUB2
+						from sl_subscribe SUB2
 						where SUB2.sub_set = v_old_set_id))
 	then
 		raise exception &#39;Slony-I: subscriber lists of set % and % are different&#39;,
 				p_new_set_id, v_old_set_id;
 	end if;
 
-	if exists (select true from schemadoc.sl_subscribe SUB1
+	if exists (select true from sl_subscribe SUB1
 				where SUB1.sub_set = v_old_set_id
 				and SUB1.sub_receiver not in (select SUB2.sub_receiver
-						from schemadoc.sl_subscribe SUB2
+						from sl_subscribe SUB2
 						where SUB2.sub_set = p_new_set_id))
 	then
 		raise exception &#39;Slony-I: subscriber lists of set % and % are different&#39;,
@@ -7212,8 +7220,8 @@
 	-- ----
 	-- Change the set the sequence belongs to
 	-- ----
-	perform schemadoc.setMoveSequence_int(p_seq_id, p_new_set_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SET_MOVE_SEQUENCE&#39;, 
+	perform setMoveSequence_int(p_seq_id, p_new_set_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;SET_MOVE_SEQUENCE&#39;, 
 			p_seq_id, p_new_set_id);
 end;
 </programlisting>
@@ -7221,12 +7229,12 @@
     </section>
 
 <!-- Function setmovesequence_int( integer, integer ) -->
-    <section id="schemadoc.function.setmovesequence-int-integer-integer"
+    <section id="function.setmovesequence-int-integer-integer"
              xreflabel="schemadocsetmovesequence_int( integer, integer )">
-      <title id="schemadoc.function.setmovesequence-int-integer-integer-title">
+      <title id="function.setmovesequence-int-integer-integer-title">
        setmovesequence_int( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.setmovesequence-int-integer-integer-titleabbrev">
+      <titleabbrev id="function.setmovesequence-int-integer-integer-titleabbrev">
        setmovesequence_int( integer, integer )
       </titleabbrev>
 
@@ -7251,12 +7259,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 	
 	-- ----
 	-- Move the sequence to the new set
 	-- ----
-	update schemadoc.sl_sequence
+	update sl_sequence
 			set seq_set = p_new_set_id
 			where seq_id = p_seq_id;
 
@@ -7267,12 +7275,12 @@
     </section>
 
 <!-- Function setmovetable( integer, integer ) -->
-    <section id="schemadoc.function.setmovetable-integer-integer"
+    <section id="function.setmovetable-integer-integer"
              xreflabel="schemadocsetmovetable( integer, integer )">
-      <title id="schemadoc.function.setmovetable-integer-integer-title">
+      <title id="function.setmovetable-integer-integer-title">
        setmovetable( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.setmovetable-integer-integer-titleabbrev">
+      <titleabbrev id="function.setmovetable-integer-integer-titleabbrev">
        setmovetable( integer, integer )
       </titleabbrev>
 
@@ -7300,12 +7308,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Get the tables current set
 	-- ----
-	select tab_set into v_old_set_id from schemadoc.sl_table
+	select tab_set into v_old_set_id from sl_table
 			where tab_id = p_tab_id;
 	if not found then
 		raise exception &#39;Slony-I: table %d not found&#39;, p_tab_id;
@@ -7317,22 +7325,22 @@
 	if p_new_set_id = v_old_set_id then
 		raise exception &#39;Slony-I: set ids cannot be identical&#39;;
 	end if;
-	select set_origin into v_origin from schemadoc.sl_set
+	select set_origin into v_origin from sl_set
 			where set_id = p_new_set_id;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_new_set_id;
 	end if;
-	if v_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				p_new_set_id;
 	end if;
 
-	select set_origin into v_origin from schemadoc.sl_set
+	select set_origin into v_origin from sl_set
 			where set_id = v_old_set_id;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, v_old_set_id;
 	end if;
-	if v_origin != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if v_origin != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: set % does not originate on local node&#39;,
 				v_old_set_id;
 	end if;
@@ -7340,20 +7348,20 @@
 	-- ----
 	-- Check that both sets are subscribed by the same set of nodes
 	-- ----
-	if exists (select true from schemadoc.sl_subscribe SUB1
+	if exists (select true from sl_subscribe SUB1
 				where SUB1.sub_set = p_new_set_id
 				and SUB1.sub_receiver not in (select SUB2.sub_receiver
-						from schemadoc.sl_subscribe SUB2
+						from sl_subscribe SUB2
 						where SUB2.sub_set = v_old_set_id))
 	then
 		raise exception &#39;Slony-I: subscriber lists of set % and % are different&#39;,
 				p_new_set_id, v_old_set_id;
 	end if;
 
-	if exists (select true from schemadoc.sl_subscribe SUB1
+	if exists (select true from sl_subscribe SUB1
 				where SUB1.sub_set = v_old_set_id
 				and SUB1.sub_receiver not in (select SUB2.sub_receiver
-						from schemadoc.sl_subscribe SUB2
+						from sl_subscribe SUB2
 						where SUB2.sub_set = p_new_set_id))
 	then
 		raise exception &#39;Slony-I: subscriber lists of set % and % are different&#39;,
@@ -7363,9 +7371,9 @@
 	-- ----
 	-- Change the set the table belongs to
 	-- ----
-	perform schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;, NULL);
-	perform schemadoc.setMoveTable_int(p_tab_id, p_new_set_id);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SET_MOVE_TABLE&#39;, 
+	perform createEvent(&#39;_schemadoc&#39;, &#39;SYNC&#39;, NULL);
+	perform setMoveTable_int(p_tab_id, p_new_set_id);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;SET_MOVE_TABLE&#39;, 
 			p_tab_id, p_new_set_id);
 end;
 </programlisting>
@@ -7373,12 +7381,12 @@
     </section>
 
 <!-- Function setmovetable_int( integer, integer ) -->
-    <section id="schemadoc.function.setmovetable-int-integer-integer"
+    <section id="function.setmovetable-int-integer-integer"
              xreflabel="schemadocsetmovetable_int( integer, integer )">
-      <title id="schemadoc.function.setmovetable-int-integer-integer-title">
+      <title id="function.setmovetable-int-integer-integer-title">
        setmovetable_int( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.setmovetable-int-integer-integer-titleabbrev">
+      <titleabbrev id="function.setmovetable-int-integer-integer-titleabbrev">
        setmovetable_int( integer, integer )
       </titleabbrev>
 
@@ -7403,12 +7411,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 	
 	-- ----
 	-- Move the table to the new set
 	-- ----
-	update schemadoc.sl_table
+	update sl_table
 			set tab_set = p_new_set_id
 			where tab_id = p_tab_id;
 
@@ -7419,12 +7427,12 @@
     </section>
 
 <!-- Function setsessionrole( name, text ) -->
-    <section id="schemadoc.function.setsessionrole-name-text"
+    <section id="function.setsessionrole-name-text"
              xreflabel="schemadocsetsessionrole( name, text )">
-      <title id="schemadoc.function.setsessionrole-name-text-title">
+      <title id="function.setsessionrole-name-text-title">
        setsessionrole( name, text )
       </title>
-      <titleabbrev id="schemadoc.function.setsessionrole-name-text-titleabbrev">
+      <titleabbrev id="function.setsessionrole-name-text-titleabbrev">
        setsessionrole( name, text )
       </titleabbrev>
 
@@ -7446,12 +7454,12 @@
     </section>
 
 <!-- Function slonyversion(  ) -->
-    <section id="schemadoc.function.slonyversion"
+    <section id="function.slonyversion"
              xreflabel="schemadocslonyversion(  )">
-      <title id="schemadoc.function.slonyversion-title">
+      <title id="function.slonyversion-title">
        slonyversion(  )
       </title>
-      <titleabbrev id="schemadoc.function.slonyversion-titleabbrev">
+      <titleabbrev id="function.slonyversion-titleabbrev">
        slonyversion(  )
       </titleabbrev>
 
@@ -7470,21 +7478,21 @@
        Returns the version number of the slony schema
         <programlisting>
 begin
-	return &#39;&#39;	|| schemadoc.slonyVersionMajor() || &#39;.&#39;
-				|| schemadoc.slonyVersionMinor() || &#39;.&#39;
-				|| schemadoc.slonyVersionPatchlevel();
+	return &#39;&#39;	|| slonyVersionMajor() || &#39;.&#39;
+				|| slonyVersionMinor() || &#39;.&#39;
+				|| slonyVersionPatchlevel();
 end;
 </programlisting>
       </para>
     </section>
 
 <!-- Function slonyversionmajor(  ) -->
-    <section id="schemadoc.function.slonyversionmajor"
+    <section id="function.slonyversionmajor"
              xreflabel="schemadocslonyversionmajor(  )">
-      <title id="schemadoc.function.slonyversionmajor-title">
+      <title id="function.slonyversionmajor-title">
        slonyversionmajor(  )
       </title>
-      <titleabbrev id="schemadoc.function.slonyversionmajor-titleabbrev">
+      <titleabbrev id="function.slonyversionmajor-titleabbrev">
        slonyversionmajor(  )
       </titleabbrev>
 
@@ -7510,12 +7518,12 @@
     </section>
 
 <!-- Function slonyversionminor(  ) -->
-    <section id="schemadoc.function.slonyversionminor"
+    <section id="function.slonyversionminor"
              xreflabel="schemadocslonyversionminor(  )">
-      <title id="schemadoc.function.slonyversionminor-title">
+      <title id="function.slonyversionminor-title">
        slonyversionminor(  )
       </title>
-      <titleabbrev id="schemadoc.function.slonyversionminor-titleabbrev">
+      <titleabbrev id="function.slonyversionminor-titleabbrev">
        slonyversionminor(  )
       </titleabbrev>
 
@@ -7541,12 +7549,12 @@
     </section>
 
 <!-- Function slonyversionpatchlevel(  ) -->
-    <section id="schemadoc.function.slonyversionpatchlevel"
+    <section id="function.slonyversionpatchlevel"
              xreflabel="schemadocslonyversionpatchlevel(  )">
-      <title id="schemadoc.function.slonyversionpatchlevel-title">
+      <title id="function.slonyversionpatchlevel-title">
        slonyversionpatchlevel(  )
       </title>
-      <titleabbrev id="schemadoc.function.slonyversionpatchlevel-titleabbrev">
+      <titleabbrev id="function.slonyversionpatchlevel-titleabbrev">
        slonyversionpatchlevel(  )
       </titleabbrev>
 
@@ -7572,12 +7580,12 @@
     </section>
 
 <!-- Function storelisten( integer, integer, integer ) -->
-    <section id="schemadoc.function.storelisten-integer-integer-integer"
+    <section id="function.storelisten-integer-integer-integer"
              xreflabel="schemadocstorelisten( integer, integer, integer )">
-      <title id="schemadoc.function.storelisten-integer-integer-integer-title">
+      <title id="function.storelisten-integer-integer-integer-title">
        storelisten( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.storelisten-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.storelisten-integer-integer-integer-titleabbrev">
        storelisten( integer, integer, integer )
       </titleabbrev>
 
@@ -7606,8 +7614,8 @@
 begin
 	return -1;
 
-	perform schemadoc.storeListen_int (p_origin, p_provider, p_receiver);
-	return  schemadoc.createEvent (&#39;_schemadoc&#39;, &#39;STORE_LISTEN&#39;,
+	perform storeListen_int (p_origin, p_provider, p_receiver);
+	return  createEvent (&#39;_schemadoc&#39;, &#39;STORE_LISTEN&#39;,
 			p_origin, p_provider, p_receiver);
 end;
 </programlisting>
@@ -7615,12 +7623,12 @@
     </section>
 
 <!-- Function storelisten_int( integer, integer, integer ) -->
-    <section id="schemadoc.function.storelisten-int-integer-integer-integer"
+    <section id="function.storelisten-int-integer-integer-integer"
              xreflabel="schemadocstorelisten_int( integer, integer, integer )">
-      <title id="schemadoc.function.storelisten-int-integer-integer-integer-title">
+      <title id="function.storelisten-int-integer-integer-integer-title">
        storelisten_int( integer, integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.storelisten-int-integer-integer-integer-titleabbrev">
+      <titleabbrev id="function.storelisten-int-integer-integer-integer-titleabbrev">
        storelisten_int( integer, integer, integer )
       </titleabbrev>
 
@@ -7651,10 +7659,10 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	select 1 into v_exists
-			from schemadoc.sl_listen
+			from sl_listen
 			where li_origin = p_li_origin
 			and li_provider = p_li_provider
 			and li_receiver = p_li_receiver;
@@ -7664,20 +7672,20 @@
 		-- about the nodes involved in this, we generate those nodes
 		-- as pending.
 		-- ----
-		if not exists (select 1 from schemadoc.sl_node
+		if not exists (select 1 from sl_node
 						where no_id = p_li_origin) then
-			perform schemadoc.storeNode_int (p_li_origin, &#39;&lt;event pending&gt;&#39;);
+			perform storeNode_int (p_li_origin, &#39;&lt;event pending&gt;&#39;);
 		end if;
-		if not exists (select 1 from schemadoc.sl_node
+		if not exists (select 1 from sl_node
 						where no_id = p_li_provider) then
-			perform schemadoc.storeNode_int (p_li_provider, &#39;&lt;event pending&gt;&#39;);
+			perform storeNode_int (p_li_provider, &#39;&lt;event pending&gt;&#39;);
 		end if;
-		if not exists (select 1 from schemadoc.sl_node
+		if not exists (select 1 from sl_node
 						where no_id = p_li_receiver) then
-			perform schemadoc.storeNode_int (p_li_receiver, &#39;&lt;event pending&gt;&#39;);
+			perform storeNode_int (p_li_receiver, &#39;&lt;event pending&gt;&#39;);
 		end if;
 
-		insert into schemadoc.sl_listen
+		insert into sl_listen
 				(li_origin, li_provider, li_receiver) values
 				(p_li_origin, p_li_provider, p_li_receiver);
 	end if;
@@ -7689,12 +7697,12 @@
     </section>
 
 <!-- Function storenode( integer, text, boolean ) -->
-    <section id="schemadoc.function.storenode-integer-text-boolean"
+    <section id="function.storenode-integer-text-boolean"
              xreflabel="schemadocstorenode( integer, text, boolean )">
-      <title id="schemadoc.function.storenode-integer-text-boolean-title">
+      <title id="function.storenode-integer-text-boolean-title">
        storenode( integer, text, boolean )
       </title>
-      <titleabbrev id="schemadoc.function.storenode-integer-text-boolean-titleabbrev">
+      <titleabbrev id="function.storenode-integer-text-boolean-titleabbrev">
        storenode( integer, text, boolean )
       </titleabbrev>
 
@@ -7727,8 +7735,8 @@
 	else
 		v_no_spool_txt = &#39;f&#39;;
 	end if;
-	perform schemadoc.storeNode_int (p_no_id, p_no_comment, p_no_spool);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;STORE_NODE&#39;,
+	perform storeNode_int (p_no_id, p_no_comment, p_no_spool);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;STORE_NODE&#39;,
 									p_no_id, p_no_comment, v_no_spool_txt);
 end;
 </programlisting>
@@ -7736,12 +7744,12 @@
     </section>
 
 <!-- Function storenode_int( integer, text, boolean ) -->
-    <section id="schemadoc.function.storenode-int-integer-text-boolean"
+    <section id="function.storenode-int-integer-text-boolean"
              xreflabel="schemadocstorenode_int( integer, text, boolean )">
-      <title id="schemadoc.function.storenode-int-integer-text-boolean-title">
+      <title id="function.storenode-int-integer-text-boolean-title">
        storenode_int( integer, text, boolean )
       </title>
-      <titleabbrev id="schemadoc.function.storenode-int-integer-text-boolean-titleabbrev">
+      <titleabbrev id="function.storenode-int-integer-text-boolean-titleabbrev">
        storenode_int( integer, text, boolean )
       </titleabbrev>
 
@@ -7772,20 +7780,20 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check if the node exists
 	-- ----
 	select * into v_old_row
-			from schemadoc.sl_node
+			from sl_node
 			where no_id = p_no_id
 			for update;
 	if found then 
 		-- ----
 		-- Node exists, update the existing row.
 		-- ----
-		update schemadoc.sl_node
+		update sl_node
 				set no_comment = p_no_comment,
 				no_spool = p_no_spool
 				where no_id = p_no_id;
@@ -7793,7 +7801,7 @@
 		-- ----
 		-- New node, insert the sl_node row
 		-- ----
-		insert into schemadoc.sl_node
+		insert into sl_node
 				(no_id, no_active, no_comment, no_spool) values
 				(p_no_id, &#39;f&#39;, p_no_comment, p_no_spool);
 	end if;
@@ -7805,12 +7813,12 @@
     </section>
 
 <!-- Function storepath( integer, integer, text, integer ) -->
-    <section id="schemadoc.function.storepath-integer-integer-text-integer"
+    <section id="function.storepath-integer-integer-text-integer"
              xreflabel="schemadocstorepath( integer, integer, text, integer )">
-      <title id="schemadoc.function.storepath-integer-integer-text-integer-title">
+      <title id="function.storepath-integer-integer-text-integer-title">
        storepath( integer, integer, text, integer )
       </title>
-      <titleabbrev id="schemadoc.function.storepath-integer-integer-text-integer-titleabbrev">
+      <titleabbrev id="function.storepath-integer-integer-text-integer-titleabbrev">
        storepath( integer, integer, text, integer )
       </titleabbrev>
 
@@ -7837,9 +7845,9 @@
 	p_pa_conninfo	alias for $3;
 	p_pa_connretry	alias for $4;
 begin
-	perform schemadoc.storePath_int(p_pa_server, p_pa_client,
+	perform storePath_int(p_pa_server, p_pa_client,
 			p_pa_conninfo, p_pa_connretry);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;STORE_PATH&#39;, 
+	return  createEvent(&#39;_schemadoc&#39;, &#39;STORE_PATH&#39;, 
 			p_pa_server, p_pa_client, p_pa_conninfo, p_pa_connretry);
 end;
 </programlisting>
@@ -7847,12 +7855,12 @@
     </section>
 
 <!-- Function storepath_int( integer, integer, text, integer ) -->
-    <section id="schemadoc.function.storepath-int-integer-integer-text-integer"
+    <section id="function.storepath-int-integer-integer-text-integer"
              xreflabel="schemadocstorepath_int( integer, integer, text, integer )">
-      <title id="schemadoc.function.storepath-int-integer-integer-text-integer-title">
+      <title id="function.storepath-int-integer-integer-text-integer-title">
        storepath_int( integer, integer, text, integer )
       </title>
-      <titleabbrev id="schemadoc.function.storepath-int-integer-integer-text-integer-titleabbrev">
+      <titleabbrev id="function.storepath-int-integer-integer-text-integer-titleabbrev">
        storepath_int( integer, integer, text, integer )
       </titleabbrev>
 
@@ -7883,13 +7891,13 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check if the path already exists
 	-- ----
 	select 1 into v_dummy
-			from schemadoc.sl_path
+			from sl_path
 			where pa_server = p_pa_server
 			and pa_client = p_pa_client
 			for update;
@@ -7897,7 +7905,7 @@
 		-- ----
 		-- Path exists, update pa_conninfo
 		-- ----
-		update schemadoc.sl_path
+		update sl_path
 				set pa_conninfo = p_pa_conninfo,
 					pa_connretry = p_pa_connretry
 				where pa_server = p_pa_server
@@ -7910,21 +7918,21 @@
 		-- about the nodes involved in this, we generate those nodes
 		-- as pending.
 		-- ----
-		if not exists (select 1 from schemadoc.sl_node
+		if not exists (select 1 from sl_node
 						where no_id = p_pa_server) then
-			perform schemadoc.storeNode_int (p_pa_server, &#39;&lt;event pending&gt;&#39;);
+			perform storeNode_int (p_pa_server, &#39;&lt;event pending&gt;&#39;);
 		end if;
-		if not exists (select 1 from schemadoc.sl_node
+		if not exists (select 1 from sl_node
 						where no_id = p_pa_client) then
-			perform schemadoc.storeNode_int (p_pa_client, &#39;&lt;event pending&gt;&#39;);
+			perform storeNode_int (p_pa_client, &#39;&lt;event pending&gt;&#39;);
 		end if;
-		insert into schemadoc.sl_path
+		insert into sl_path
 				(pa_server, pa_client, pa_conninfo, pa_connretry) values
 				(p_pa_server, p_pa_client, p_pa_conninfo, p_pa_connretry);
 	end if;
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	return 0;
 end;
@@ -7933,12 +7941,12 @@
     </section>
 
 <!-- Function storeset( integer, text ) -->
-    <section id="schemadoc.function.storeset-integer-text"
+    <section id="function.storeset-integer-text"
              xreflabel="schemadocstoreset( integer, text )">
-      <title id="schemadoc.function.storeset-integer-text-title">
+      <title id="function.storeset-integer-text-title">
        storeset( integer, text )
       </title>
-      <titleabbrev id="schemadoc.function.storeset-integer-text-titleabbrev">
+      <titleabbrev id="function.storeset-integer-text-titleabbrev">
        storeset( integer, text )
       </titleabbrev>
 
@@ -7964,15 +7972,15 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
 
-	insert into schemadoc.sl_set
+	insert into sl_set
 			(set_id, set_origin, set_comment) values
 			(p_set_id, v_local_node_id, p_set_comment);
 
-	return schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;STORE_SET&#39;, 
+	return createEvent(&#39;_schemadoc&#39;, &#39;STORE_SET&#39;, 
 			p_set_id, v_local_node_id, p_set_comment);
 end;
 </programlisting>
@@ -7980,12 +7988,12 @@
     </section>
 
 <!-- Function storeset_int( integer, integer, text ) -->
-    <section id="schemadoc.function.storeset-int-integer-integer-text"
+    <section id="function.storeset-int-integer-integer-text"
              xreflabel="schemadocstoreset_int( integer, integer, text )">
-      <title id="schemadoc.function.storeset-int-integer-integer-text-title">
+      <title id="function.storeset-int-integer-integer-text-title">
        storeset_int( integer, integer, text )
       </title>
-      <titleabbrev id="schemadoc.function.storeset-int-integer-integer-text-titleabbrev">
+      <titleabbrev id="function.storeset-int-integer-integer-text-titleabbrev">
        storeset_int( integer, integer, text )
       </titleabbrev>
 
@@ -8015,22 +8023,22 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	select 1 into v_dummy
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_set_id
 			for update;
 	if found then 
-		update schemadoc.sl_set
+		update sl_set
 				set set_comment = p_set_comment
 				where set_id = p_set_id;
 	else
-		if not exists (select 1 from schemadoc.sl_node
+		if not exists (select 1 from sl_node
 						where no_id = p_set_origin) then
-			perform schemadoc.storeNode_int (p_set_origin, &#39;&lt;event pending&gt;&#39;);
+			perform storeNode_int (p_set_origin, &#39;&lt;event pending&gt;&#39;);
 		end if;
-		insert into schemadoc.sl_set
+		insert into sl_set
 				(set_id, set_origin, set_comment) values
 				(p_set_id, p_set_origin, p_set_comment);
 	end if;
@@ -8042,12 +8050,12 @@
     </section>
 
 <!-- Function storetrigger( integer, name ) -->
-    <section id="schemadoc.function.storetrigger-integer-name"
+    <section id="function.storetrigger-integer-name"
              xreflabel="schemadocstoretrigger( integer, name )">
-      <title id="schemadoc.function.storetrigger-integer-name-title">
+      <title id="function.storetrigger-integer-name-title">
        storetrigger( integer, name )
       </title>
-      <titleabbrev id="schemadoc.function.storetrigger-integer-name-titleabbrev">
+      <titleabbrev id="function.storetrigger-integer-name-titleabbrev">
        storetrigger( integer, name )
       </titleabbrev>
 
@@ -8072,8 +8080,8 @@
 	p_trig_tabid		alias for $1;
 	p_trig_tgname		alias for $2;
 begin
-	perform schemadoc.storeTrigger_int(p_trig_tabid, p_trig_tgname);
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;STORE_TRIGGER&#39;,
+	perform storeTrigger_int(p_trig_tabid, p_trig_tgname);
+	return  createEvent(&#39;_schemadoc&#39;, &#39;STORE_TRIGGER&#39;,
 			p_trig_tabid, p_trig_tgname);
 end;
 </programlisting>
@@ -8081,12 +8089,12 @@
     </section>
 
 <!-- Function storetrigger_int( integer, name ) -->
-    <section id="schemadoc.function.storetrigger-int-integer-name"
+    <section id="function.storetrigger-int-integer-name"
              xreflabel="schemadocstoretrigger_int( integer, name )">
-      <title id="schemadoc.function.storetrigger-int-integer-name-title">
+      <title id="function.storetrigger-int-integer-name-title">
        storetrigger_int( integer, name )
       </title>
-      <titleabbrev id="schemadoc.function.storetrigger-int-integer-name-titleabbrev">
+      <titleabbrev id="function.storetrigger-int-integer-name-titleabbrev">
        storetrigger_int( integer, name )
       </titleabbrev>
 
@@ -8115,13 +8123,13 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Get the current table status (altered or not)
 	-- ----
 	select tab_altered into v_tab_altered
-			from schemadoc.sl_table where tab_id = p_trig_tabid;
+			from sl_table where tab_id = p_trig_tabid;
 	if not found then
 		-- ----
 		-- Not found is no hard error here, because that might
@@ -8134,16 +8142,16 @@
 	-- If the table is modified for replication, restore the original state
 	-- ----
 	if v_tab_altered then
-		perform schemadoc.alterTableRestore(p_trig_tabid);
+		perform alterTableRestore(p_trig_tabid);
 	end if;
 
 	-- ----
 	-- Make sure that an entry for this trigger exists
 	-- ----
-	delete from schemadoc.sl_trigger
+	delete from sl_trigger
 			where trig_tabid = p_trig_tabid
 			  and trig_tgname = p_trig_tgname;
-	insert into schemadoc.sl_trigger (
+	insert into sl_trigger (
 				trig_tabid, trig_tgname
 			) values (
 				p_trig_tabid, p_trig_tgname
@@ -8153,7 +8161,7 @@
 	-- Put the table back into replicated state if it was
 	-- ----
 	if v_tab_altered then
-		perform schemadoc.alterTableForReplication(p_trig_tabid);
+		perform alterTableForReplication(p_trig_tabid);
 	end if;
 
 	return p_trig_tabid;
@@ -8163,12 +8171,12 @@
     </section>
 
 <!-- Function subscribeset( integer, integer, integer, boolean ) -->
-    <section id="schemadoc.function.subscribeset-integer-integer-integer-boolean"
+    <section id="function.subscribeset-integer-integer-integer-boolean"
              xreflabel="schemadocsubscribeset( integer, integer, integer, boolean )">
-      <title id="schemadoc.function.subscribeset-integer-integer-integer-boolean-title">
+      <title id="function.subscribeset-integer-integer-integer-boolean-title">
        subscribeset( integer, integer, integer, boolean )
       </title>
-      <titleabbrev id="schemadoc.function.subscribeset-integer-integer-integer-boolean-titleabbrev">
+      <titleabbrev id="function.subscribeset-integer-integer-integer-boolean-titleabbrev">
        subscribeset( integer, integer, integer, boolean )
       </titleabbrev>
 
@@ -8200,12 +8208,12 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that this is called on the receiver node
 	-- ----
-	if p_sub_provider != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if p_sub_provider != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: subscribeSet() must be called on provider&#39;;
 	end if;
 
@@ -8213,7 +8221,7 @@
 	-- Check that the origin and provider of the set are remote
 	-- ----
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_sub_set;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_sub_set;
@@ -8230,20 +8238,20 @@
 	-- ----
 	-- Create the SUBSCRIBE_SET event
 	-- ----
-	v_ev_seqno :=  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;SUBSCRIBE_SET&#39;, 
+	v_ev_seqno :=  createEvent(&#39;_schemadoc&#39;, &#39;SUBSCRIBE_SET&#39;, 
 			p_sub_set, p_sub_provider, p_sub_receiver, 
 			case p_sub_forward when true then &#39;t&#39; else &#39;f&#39; end);
 
 	-- ----
 	-- Call the internal procedure to store the subscription
 	-- ----
-	perform schemadoc.subscribeSet_int(p_sub_set, p_sub_provider,
+	perform subscribeSet_int(p_sub_set, p_sub_provider,
 			p_sub_receiver, p_sub_forward);
 
 	-- ----
 	-- Submit listen management events
 	-- ----
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	return v_ev_seqno;
 end;
@@ -8252,12 +8260,12 @@
     </section>
 
 <!-- Function subscribeset_int( integer, integer, integer, boolean ) -->
-    <section id="schemadoc.function.subscribeset-int-integer-integer-integer-boolean"
+    <section id="function.subscribeset-int-integer-integer-integer-boolean"
              xreflabel="schemadocsubscribeset_int( integer, integer, integer, boolean )">
-      <title id="schemadoc.function.subscribeset-int-integer-integer-integer-boolean-title">
+      <title id="function.subscribeset-int-integer-integer-integer-boolean-title">
        subscribeset_int( integer, integer, integer, boolean )
       </title>
-      <titleabbrev id="schemadoc.function.subscribeset-int-integer-integer-integer-boolean-titleabbrev">
+      <titleabbrev id="function.subscribeset-int-integer-integer-integer-boolean-titleabbrev">
        subscribeset_int( integer, integer, integer, boolean )
       </titleabbrev>
 
@@ -8289,13 +8297,13 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Provider change is only allowed for active sets
 	-- ----
-	if p_sub_receiver = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
-		select sub_active into v_sub_row from schemadoc.sl_subscribe
+	if p_sub_receiver = getLocalNodeId(&#39;_schemadoc&#39;) then
+		select sub_active into v_sub_row from sl_subscribe
 				where sub_set = p_sub_set
 				and sub_receiver = p_sub_receiver;
 		if found then
@@ -8309,7 +8317,7 @@
 	-- ----
 	-- Try to change provider and/or forward for an existing subscription
 	-- ----
-	update schemadoc.sl_subscribe
+	update sl_subscribe
 			set sub_provider = p_sub_provider,
 				sub_forward = p_sub_forward
 			where sub_set = p_sub_set
@@ -8321,17 +8329,17 @@
 	-- ----
 	-- Not found, insert a new one
 	-- ----
-	if not exists (select true from schemadoc.sl_path
+	if not exists (select true from sl_path
 			where pa_server = p_sub_provider
 			and pa_client = p_sub_receiver)
 	then
-		insert into schemadoc.sl_path
+		insert into sl_path
 				(pa_server, pa_client, pa_conninfo, pa_connretry)
 				values 
 				(p_sub_provider, p_sub_receiver, 
 				&#39;&lt;event pending&gt;&#39;, 10);
 	end if;
-	insert into schemadoc.sl_subscribe
+	insert into sl_subscribe
 			(sub_set, sub_provider, sub_receiver, sub_forward, sub_active)
 			values (p_sub_set, p_sub_provider, p_sub_receiver,
 				p_sub_forward, false);
@@ -8340,22 +8348,22 @@
 	-- If the set origin is here, then enable the subscription
 	-- ----
 	select set_origin into v_set_origin
-			from schemadoc.sl_set
+			from sl_set
 			where set_id = p_sub_set;
 	if not found then
 		raise exception &#39;Slony-I: set % not found&#39;, p_sub_set;
 	end if;
 
-	if v_set_origin = schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
-		perform schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;ENABLE_SUBSCRIPTION&#39;, 
+	if v_set_origin = getLocalNodeId(&#39;_schemadoc&#39;) then
+		perform createEvent(&#39;_schemadoc&#39;, &#39;ENABLE_SUBSCRIPTION&#39;, 
 				p_sub_set, p_sub_provider, p_sub_receiver, 
 				case p_sub_forward when true then &#39;t&#39; else &#39;f&#39; end);
-		perform schemadoc.enableSubscription(p_sub_set, 
+		perform enableSubscription(p_sub_set, 
 				p_sub_provider, p_sub_receiver);
 	end if;
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	return p_sub_set;
 end;
@@ -8364,12 +8372,12 @@
     </section>
 
 <!-- Function tableaddkey( text ) -->
-    <section id="schemadoc.function.tableaddkey-text"
+    <section id="function.tableaddkey-text"
              xreflabel="schemadoctableaddkey( text )">
-      <title id="schemadoc.function.tableaddkey-text-title">
+      <title id="function.tableaddkey-text-title">
        tableaddkey( text )
       </title>
-      <titleabbrev id="schemadoc.function.tableaddkey-text-titleabbrev">
+      <titleabbrev id="function.tableaddkey-text-titleabbrev">
        tableaddkey( text )
       </titleabbrev>
 
@@ -8442,7 +8450,7 @@
 			&#39; add column &quot;_Slony-I_schemadoc_rowID&quot; bigint;&#39;;
 		execute &#39;alter table only &#39; || p_tab_fqname ||
 			&#39; alter column &quot;_Slony-I_schemadoc_rowID&quot; &#39; ||
-			&#39; set default &quot;pg_catalog&quot;.nextval(&#39;&#39;schemadoc.sl_rowid_seq&#39;&#39;);&#39;;
+			&#39; set default &quot;pg_catalog&quot;.nextval(&#39;&#39;sl_rowid_seq&#39;&#39;);&#39;;
 
 		v_attkind := v_attkind || &#39;k&#39;;
 	end if;
@@ -8457,12 +8465,12 @@
     </section>
 
 <!-- Function tabledropkey( integer ) -->
-    <section id="schemadoc.function.tabledropkey-integer"
+    <section id="function.tabledropkey-integer"
              xreflabel="schemadoctabledropkey( integer )">
-      <title id="schemadoc.function.tabledropkey-integer-title">
+      <title id="function.tabledropkey-integer-title">
        tabledropkey( integer )
       </title>
-      <titleabbrev id="schemadoc.function.tabledropkey-integer-titleabbrev">
+      <titleabbrev id="function.tabledropkey-integer-titleabbrev">
        tabledropkey( integer )
       </titleabbrev>
 
@@ -8491,7 +8499,7 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Construct the tables fully qualified name and get its oid
@@ -8499,7 +8507,7 @@
 	select &quot;pg_catalog&quot;.quote_ident(PGN.nspname) || &#39;.&#39; ||
 				&quot;pg_catalog&quot;.quote_ident(PGC.relname),
 				PGC.oid into v_tab_fqname, v_tab_oid
-			from schemadoc.sl_table T,
+			from sl_table T,
 				&quot;pg_catalog&quot;.pg_class PGC,
 				&quot;pg_catalog&quot;.pg_namespace PGN
 			where T.tab_id = p_tab_id
@@ -8529,12 +8537,12 @@
     </section>
 
 <!-- Function tablehasserialkey( text ) -->
-    <section id="schemadoc.function.tablehasserialkey-text"
+    <section id="function.tablehasserialkey-text"
              xreflabel="schemadoctablehasserialkey( text )">
-      <title id="schemadoc.function.tablehasserialkey-text-title">
+      <title id="function.tablehasserialkey-text-title">
        tablehasserialkey( text )
       </title>
-      <titleabbrev id="schemadoc.function.tablehasserialkey-text-titleabbrev">
+      <titleabbrev id="function.tablehasserialkey-text-titleabbrev">
        tablehasserialkey( text )
       </titleabbrev>
 
@@ -8576,12 +8584,12 @@
     </section>
 
 <!-- Function terminatenodeconnections( name ) -->
-    <section id="schemadoc.function.terminatenodeconnections-name"
+    <section id="function.terminatenodeconnections-name"
              xreflabel="schemadocterminatenodeconnections( name )">
-      <title id="schemadoc.function.terminatenodeconnections-name-title">
+      <title id="function.terminatenodeconnections-name-title">
        terminatenodeconnections( name )
       </title>
-      <titleabbrev id="schemadoc.function.terminatenodeconnections-name-titleabbrev">
+      <titleabbrev id="function.terminatenodeconnections-name-titleabbrev">
        terminatenodeconnections( name )
       </titleabbrev>
 
@@ -8603,12 +8611,12 @@
     </section>
 
 <!-- Function uninstallnode(  ) -->
-    <section id="schemadoc.function.uninstallnode"
+    <section id="function.uninstallnode"
              xreflabel="schemadocuninstallnode(  )">
-      <title id="schemadoc.function.uninstallnode-title">
+      <title id="function.uninstallnode-title">
        uninstallnode(  )
       </title>
-      <titleabbrev id="schemadoc.function.uninstallnode-titleabbrev">
+      <titleabbrev id="function.uninstallnode-titleabbrev">
        uninstallnode(  )
       </titleabbrev>
 
@@ -8633,15 +8641,15 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- This is us ... time for suicide! Restore all tables to
 	-- their original status.
 	-- ----
-	for v_tab_row in select * from schemadoc.sl_table loop
-		perform schemadoc.alterTableRestore(v_tab_row.tab_id);
-		perform schemadoc.tableDropKey(v_tab_row.tab_id);
+	for v_tab_row in select * from sl_table loop
+		perform alterTableRestore(v_tab_row.tab_id);
+		perform tableDropKey(v_tab_row.tab_id);
 	end loop;
 
 	raise notice &#39;Slony-I: Please drop schema &quot;_schemadoc&quot;&#39;;
@@ -8652,12 +8660,12 @@
     </section>
 
 <!-- Function unlockset( integer ) -->
-    <section id="schemadoc.function.unlockset-integer"
+    <section id="function.unlockset-integer"
              xreflabel="schemadocunlockset( integer )">
-      <title id="schemadoc.function.unlockset-integer-title">
+      <title id="function.unlockset-integer-title">
        unlockset( integer )
       </title>
-      <titleabbrev id="schemadoc.function.unlockset-integer-titleabbrev">
+      <titleabbrev id="function.unlockset-integer-titleabbrev">
        unlockset( integer )
       </titleabbrev>
 
@@ -8684,14 +8692,14 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that the set exists and that we are the origin
 	-- and that it is not already locked.
 	-- ----
-	v_local_node_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
-	select * into v_set_row from schemadoc.sl_set
+	v_local_node_id := getLocalNodeId(&#39;_schemadoc&#39;);
+	select * into v_set_row from sl_set
 			where set_id = p_set_id
 			for update;
 	if not found then
@@ -8711,7 +8719,7 @@
 	for v_tab_row in select T.tab_id,
 			&quot;pg_catalog&quot;.quote_ident(PGN.nspname) || &#39;.&#39; ||
 			&quot;pg_catalog&quot;.quote_ident(PGC.relname) as tab_fqname
-			from schemadoc.sl_table T,
+			from sl_table T,
 				&quot;pg_catalog&quot;.pg_class PGC, &quot;pg_catalog&quot;.pg_namespace PGN
 			where T.tab_set = p_set_id
 				and T.tab_reloid = PGC.oid
@@ -8725,7 +8733,7 @@
 	-- ----
 	-- Clear out the set_locked field
 	-- ----
-	update schemadoc.sl_set
+	update sl_set
 			set set_locked = NULL
 			where set_id = p_set_id;
 
@@ -8736,12 +8744,12 @@
     </section>
 
 <!-- Function unsubscribeset( integer, integer ) -->
-    <section id="schemadoc.function.unsubscribeset-integer-integer"
+    <section id="function.unsubscribeset-integer-integer"
              xreflabel="schemadocunsubscribeset( integer, integer )">
-      <title id="schemadoc.function.unsubscribeset-integer-integer-title">
+      <title id="function.unsubscribeset-integer-integer-title">
        unsubscribeset( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.unsubscribeset-integer-integer-titleabbrev">
+      <titleabbrev id="function.unsubscribeset-integer-integer-titleabbrev">
        unsubscribeset( integer, integer )
       </titleabbrev>
 
@@ -8774,19 +8782,19 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- Check that this is called on the receiver node
 	-- ----
-	if p_sub_receiver != schemadoc.getLocalNodeId(&#39;_schemadoc&#39;) then
+	if p_sub_receiver != getLocalNodeId(&#39;_schemadoc&#39;) then
 		raise exception &#39;Slony-I: unsubscribeSet() must be called on receiver&#39;;
 	end if;
 
 	-- ----
 	-- Check that this does not break any chains
 	-- ----
-	if exists (select true from schemadoc.sl_subscribe
+	if exists (select true from sl_subscribe
 			where sub_set = p_sub_set
 				and sub_provider = p_sub_receiver)
 	then
@@ -8798,12 +8806,12 @@
 	-- Restore all tables original triggers and rules and remove
 	-- our replication stuff.
 	-- ----
-	for v_tab_row in select tab_id from schemadoc.sl_table
+	for v_tab_row in select tab_id from sl_table
 			where tab_set = p_sub_set
 			order by tab_id
 	loop
-		perform schemadoc.alterTableRestore(v_tab_row.tab_id);
-		perform schemadoc.tableDropKey(v_tab_row.tab_id);
+		perform alterTableRestore(v_tab_row.tab_id);
+		perform tableDropKey(v_tab_row.tab_id);
 	end loop;
 
 	-- ----
@@ -8811,7 +8819,7 @@
 	-- worker thread to ignore the set and stop replicating
 	-- right now.
 	-- ----
-	delete from schemadoc.sl_setsync
+	delete from sl_setsync
 			where ssy_setid = p_sub_set;
 
 	-- ----
@@ -8819,23 +8827,23 @@
 	-- Should we ever subscribe again, the initial data
 	-- copy process will create new ones.
 	-- ----
-	delete from schemadoc.sl_table
+	delete from sl_table
 			where tab_set = p_sub_set;
-	delete from schemadoc.sl_sequence
+	delete from sl_sequence
 			where seq_set = p_sub_set;
 
 	-- ----
 	-- Call the internal procedure to drop the subscription
 	-- ----
-	perform schemadoc.unsubscribeSet_int(p_sub_set, p_sub_receiver);
+	perform unsubscribeSet_int(p_sub_set, p_sub_receiver);
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	-- ----
 	-- Create the UNSUBSCRIBE_SET event
 	-- ----
-	return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;UNSUBSCRIBE_SET&#39;, 
+	return  createEvent(&#39;_schemadoc&#39;, &#39;UNSUBSCRIBE_SET&#39;, 
 			p_sub_set, p_sub_receiver);
 end;
 </programlisting>
@@ -8843,12 +8851,12 @@
     </section>
 
 <!-- Function unsubscribeset_int( integer, integer ) -->
-    <section id="schemadoc.function.unsubscribeset-int-integer-integer"
+    <section id="function.unsubscribeset-int-integer-integer"
              xreflabel="schemadocunsubscribeset_int( integer, integer )">
-      <title id="schemadoc.function.unsubscribeset-int-integer-integer-title">
+      <title id="function.unsubscribeset-int-integer-integer-title">
        unsubscribeset_int( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.unsubscribeset-int-integer-integer-titleabbrev">
+      <titleabbrev id="function.unsubscribeset-int-integer-integer-titleabbrev">
        unsubscribeset_int( integer, integer )
       </titleabbrev>
 
@@ -8877,18 +8885,18 @@
 	-- ----
 	-- Grab the central configuration lock
 	-- ----
-	lock table schemadoc.sl_config_lock;
+	lock table sl_config_lock;
 
 	-- ----
 	-- All the real work is done before event generation on the
 	-- subscriber.
 	-- ----
-	delete from schemadoc.sl_subscribe
+	delete from sl_subscribe
 			where sub_set = p_sub_set
 				and sub_receiver = p_sub_receiver;
 
 	-- Rewrite sl_listen table
-	perform schemadoc.RebuildListenEntries();
+	perform RebuildListenEntries();
 
 	return p_sub_set;
 end;
@@ -8897,12 +8905,12 @@
     </section>
 
 <!-- Function updaterelname( integer, integer ) -->
-    <section id="schemadoc.function.updaterelname-integer-integer"
+    <section id="function.updaterelname-integer-integer"
              xreflabel="schemadocupdaterelname( integer, integer )">
-      <title id="schemadoc.function.updaterelname-integer-integer-title">
+      <title id="function.updaterelname-integer-integer-title">
        updaterelname( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.updaterelname-integer-integer-titleabbrev">
+      <titleabbrev id="function.updaterelname-integer-integer-titleabbrev">
        updaterelname( integer, integer )
       </titleabbrev>
 
@@ -8929,22 +8937,22 @@
         -- ----
         -- Grab the central configuration lock
         -- ----
-        lock table schemadoc.sl_config_lock;
+        lock table sl_config_lock;
 
         -- ----
         -- Check that we either are the set origin or a current
         -- subscriber of the set.
         -- ----
-        v_no_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+        v_no_id := getLocalNodeId(&#39;_schemadoc&#39;);
         select set_origin into v_set_origin
-                        from schemadoc.sl_set
+                        from sl_set
                         where set_id = p_set_id
                         for update;
         if not found then
                 raise exception &#39;Slony-I: set % not found&#39;, p_set_id;
         end if;
         if v_set_origin &lt;&gt; v_no_id
-                and not exists (select 1 from schemadoc.sl_subscribe
+                and not exists (select 1 from sl_subscribe
                         where sub_set = p_set_id
                         and sub_receiver = v_no_id)
         then
@@ -8958,15 +8966,15 @@
         if p_only_on_node &gt; 0 and p_only_on_node &lt;&gt; v_no_id then
                 return 0;
         end if;
-        update schemadoc.sl_table set 
+        update sl_table set 
                 tab_relname = PGC.relname, tab_nspname = PGN.nspname
                 from pg_catalog.pg_class PGC, pg_catalog.pg_namespace PGN 
-                where schemadoc.sl_table.tab_reloid = PGC.oid
+                where sl_table.tab_reloid = PGC.oid
                         and PGC.relnamespace = PGN.oid;
-        update schemadoc.sl_sequence set
+        update sl_sequence set
                 seq_relname = PGC.relname, seq_nspname = PGN.nspname
                 from pg_catalog.pg_class PGC, pg_catalog.pg_namespace PGN
-                where schemadoc.sl_sequence.seq_reloid = PGC.oid
+                where sl_sequence.seq_reloid = PGC.oid
                 and PGC.relnamespace = PGN.oid;
         return p_set_id;
 end;
@@ -8975,12 +8983,12 @@
     </section>
 
 <!-- Function updatereloid( integer, integer ) -->
-    <section id="schemadoc.function.updatereloid-integer-integer"
+    <section id="function.updatereloid-integer-integer"
              xreflabel="schemadocupdatereloid( integer, integer )">
-      <title id="schemadoc.function.updatereloid-integer-integer-title">
+      <title id="function.updatereloid-integer-integer-title">
        updatereloid( integer, integer )
       </title>
-      <titleabbrev id="schemadoc.function.updatereloid-integer-integer-titleabbrev">
+      <titleabbrev id="function.updatereloid-integer-integer-titleabbrev">
        updatereloid( integer, integer )
       </titleabbrev>
 
@@ -9010,22 +9018,22 @@
         -- ----
         -- Grab the central configuration lock
         -- ----
-        lock table schemadoc.sl_config_lock;
+        lock table sl_config_lock;
 
         -- ----
         -- Check that we either are the set origin or a current
         -- subscriber of the set.
         -- ----
-        v_no_id := schemadoc.getLocalNodeId(&#39;_schemadoc&#39;);
+        v_no_id := getLocalNodeId(&#39;_schemadoc&#39;);
         select set_origin into v_set_origin
-                        from schemadoc.sl_set
+                        from sl_set
                         where set_id = p_set_id
                         for update;
         if not found then
                 raise exception &#39;Slony-I: set % not found&#39;, p_set_id;
         end if;
         if v_set_origin &lt;&gt; v_no_id
-                and not exists (select 1 from schemadoc.sl_subscribe
+                and not exists (select 1 from sl_subscribe
                         where sub_set = p_set_id
                         and sub_receiver = v_no_id)
         then
@@ -9039,21 +9047,21 @@
         if p_only_on_node &gt; 0 and p_only_on_node &lt;&gt; v_no_id then
                 return 0;
         end if;
-        update schemadoc.sl_table set
+        update sl_table set
                 tab_reloid = PGC.oid
                 from pg_catalog.pg_class PGC, pg_catalog.pg_namespace PGN
-                where pg_catalog.quote_ident(schemadoc.sl_table.tab_relname) = pg_catalog.quote_ident(PGC.relname)
+                where pg_catalog.quote_ident(sl_table.tab_relname) = pg_catalog.quote_ident(PGC.relname)
                         and PGC.relnamespace = PGN.oid
-			and pg_catalog.quote_ident(PGN.nspname) = pg_catalog.quote_ident(schemadoc.sl_table.tab_nspname);
+			and pg_catalog.quote_ident(PGN.nspname) = pg_catalog.quote_ident(sl_table.tab_nspname);
 
-        update schemadoc.sl_sequence set
+        update sl_sequence set
                 seq_reloid = PGC.oid
                 from pg_catalog.pg_class PGC, pg_catalog.pg_namespace PGN
-                where pg_catalog.quote_ident(schemadoc.sl_sequence.seq_relname) = pg_catalog.quote_ident(PGC.relname)
+                where pg_catalog.quote_ident(sl_sequence.seq_relname) = pg_catalog.quote_ident(PGC.relname)
                 	and PGC.relnamespace = PGN.oid
-			and pg_catalog.quote_ident(PGN.nspname) = pg_catalog.quote_ident(schemadoc.sl_sequence.seq_nspname);
+			and pg_catalog.quote_ident(PGN.nspname) = pg_catalog.quote_ident(sl_sequence.seq_nspname);
 
-        return  schemadoc.createEvent(&#39;_schemadoc&#39;, &#39;RESET_CONFIG&#39;,
+        return  createEvent(&#39;_schemadoc&#39;, &#39;RESET_CONFIG&#39;,
                         p_set_id, p_only_on_node);
 end;
 </programlisting>
@@ -9061,12 +9069,12 @@
     </section>
 
 <!-- Function upgradeschema( text ) -->
-    <section id="schemadoc.function.upgradeschema-text"
+    <section id="function.upgradeschema-text"
              xreflabel="schemadocupgradeschema( text )">
-      <title id="schemadoc.function.upgradeschema-text-title">
+      <title id="function.upgradeschema-text-title">
        upgradeschema( text )
       </title>
-      <titleabbrev id="schemadoc.function.upgradeschema-text-titleabbrev">
+      <titleabbrev id="function.upgradeschema-text-titleabbrev">
        upgradeschema( text )
       </titleabbrev>
 
@@ -9091,38 +9099,38 @@
 	-- upgrade sl_table
 	if p_old = &#39;1.0.2&#39; or p_old = &#39;1.0.5&#39; then
 		-- Add new column(s) sl_table.tab_relname, sl_table.tab_nspname
-		execute &#39;alter table schemadoc.sl_table add column tab_relname name&#39;;
-		execute &#39;alter table schemadoc.sl_table add column tab_nspname name&#39;;
+		execute &#39;alter table sl_table add column tab_relname name&#39;;
+		execute &#39;alter table sl_table add column tab_nspname name&#39;;
 
 		-- populate the colums with data
-		update schemadoc.sl_table set
+		update sl_table set
 			tab_relname = PGC.relname, tab_nspname = PGN.nspname
 			from pg_catalog.pg_class PGC, pg_catalog.pg_namespace PGN
-			where schemadoc.sl_table.tab_reloid = PGC.oid
+			where sl_table.tab_reloid = PGC.oid
 			and PGC.relnamespace = PGN.oid;
 
 		-- constrain the colums
-		execute &#39;alter table schemadoc.sl_table alter column tab_relname set NOT NULL&#39;;
-		execute &#39;alter table schemadoc.sl_table alter column tab_nspname set NOT NULL&#39;;
+		execute &#39;alter table sl_table alter column tab_relname set NOT NULL&#39;;
+		execute &#39;alter table sl_table alter column tab_nspname set NOT NULL&#39;;
 
 	end if;
 
 	-- upgrade sl_sequence
 	if p_old = &#39;1.0.2&#39; or p_old = &#39;1.0.5&#39; then
 		-- Add new column(s) sl_sequence.seq_relname, sl_sequence.seq_nspname
-		execute &#39;alter table schemadoc.sl_sequence add column seq_relname name&#39;;
-		execute &#39;alter table schemadoc.sl_sequence add column seq_nspname name&#39;;
+		execute &#39;alter table sl_sequence add column seq_relname name&#39;;
+		execute &#39;alter table sl_sequence add column seq_nspname name&#39;;
 
 		-- populate the columns with data
-		update schemadoc.sl_sequence set
+		update sl_sequence set
 			seq_relname = PGC.relname, seq_nspname = PGN.nspname
 			from pg_catalog.pg_class PGC, pg_catalog.pg_namespace PGN
-			where schemadoc.sl_sequence.seq_reloid = PGC.oid
+			where sl_sequence.seq_reloid = PGC.oid
 			and PGC.relnamespace = PGN.oid;
 
 		-- constrain the data
-		execute &#39;alter table schemadoc.sl_sequence alter column seq_relname set NOT NULL&#39;;
-		execute &#39;alter table schemadoc.sl_sequence alter column seq_nspname set NOT NULL&#39;;
+		execute &#39;alter table sl_sequence alter column seq_relname set NOT NULL&#39;;
+		execute &#39;alter table sl_sequence alter column seq_nspname set NOT NULL&#39;;
 	end if;
 
 	-- ----
@@ -9130,12 +9138,17 @@
 	-- ----
 	if p_old = &#39;1.0.2&#39; or p_old = &#39;1.0.5&#39; then
 		-- Add new column sl_node.no_spool for virtual spool nodes
-		execute &#39;alter table schemadoc.sl_node add column no_spool boolean&#39;;
-		update schemadoc.sl_node set no_spool = false;
+		execute &#39;alter table sl_node add column no_spool boolean&#39;;
+		update sl_node set no_spool = false;
 	end if;
 
 	return p_old;
 end;
 </programlisting>
       </para>
+    </section>
+
+  </chapter>
+
+
 
Index: concepts.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/concepts.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/concepts.sgml -Ldoc/adminguide/concepts.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/concepts.sgml
+++ doc/adminguide/concepts.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <sect1 id="concepts">
 <title><productname>Slony-I</productname> Concepts</title>
 
Index: faq.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/faq.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/faq.html -Ldoc/adminguide/faq.html -u -w -r1.3 -r1.4
--- doc/adminguide/faq.html
+++ doc/adminguide/faq.html
@@ -1,30 +1,29 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >Slony-I FAQ</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="PREVIOUS"
-TITLE=" More Slony-I Help "
-HREF="help.html"><LINK
+HREF="t2563.html"><LINK
+REL="NEXT"
+HREF="t2593.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
-CLASS="ARTICLE"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
+CLASS="PART"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -35,1719 +34,82 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="help.html"
+HREF="t2563.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="slonyadmin.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
->&nbsp;</TD
+VALIGN="top"
+><A
+HREF="developer.html"
+>Fast Forward</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="t2593.html"
+ACCESSKEY="N"
+>Next</A
+></TD
 ></TR
 ></TABLE
 ><HR
 ALIGN="LEFT"
 WIDTH="100%"></DIV
 ><DIV
-CLASS="ARTICLE"
+CLASS="PART"
+><A
+NAME="FAQ"
+></A
 ><DIV
 CLASS="TITLEPAGE"
 ><H1
 CLASS="TITLE"
-><A
-NAME="AEN1247"
->Slony-I FAQ</A
-></H1
-><H3
-CLASS="CORPAUTHOR"
->The Slony Global Development Group</H3
-><H3
-CLASS="AUTHOR"
-><A
-NAME="AEN1250"
->Christopher  Browne</A
-></H3
-><HR></DIV
-><P
-> Not all of these are, strictly speaking, <SPAN
-CLASS="QUOTE"
->"frequently
-asked;"</SPAN
-> some represent <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->trouble found that seemed
-worth documenting</I
-></SPAN
->.</P
+>IV. Slony-I FAQ</H1
 ><DIV
-CLASS="QANDASET"
+CLASS="TOC"
 ><DL
 ><DT
->Q: <A
-HREF="faq.html#AEN1258"
->I looked for the <CODE
-CLASS="ENVAR"
->_clustername</CODE
-> namespace, and
-it wasn't there.</A
+><B
+>Table of Contents</B
 ></DT
 ><DT
->Q: <A
-HREF="faq.html#AEN1270"
->Some events moving around, but no replication&#13;</A
-></DT
-></DL
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1258"
-></A
-><B
->Q: I looked for the <CODE
-CLASS="ENVAR"
->_clustername</CODE
-> namespace, and
-it wasn't there.</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> If the DSNs are wrong, then slon instances can't
-connect to the nodes.&#13;</P
-><P
->This will generally lead to nodes remaining entirely untouched.&#13;</P
-><P
->Recheck the connection configuration.  By the way, since <A
-HREF="app-slon.html#SLON"
-> <B
-CLASS="APPLICATION"
->slon</B
-> </A
-> links to libpq, you could
-have password information stored in <TT
-CLASS="FILENAME"
-><CODE
-CLASS="ENVAR"
->$HOME</CODE
->/.pgpass</TT
->, partially filling in
-right/wrong authentication information there.</P
-></DIV
-></DIV
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1270"
-></A
-><B
->Q: Some events moving around, but no replication&#13;</B
-></BIG
-></P
-><P
-> Slony logs might look like the following:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    DEBUG1 remoteListenThread_1: connected to 'host=host004 dbname=pgbenchrep user=postgres port=5432'
-    ERROR  remoteListenThread_1: "select ev_origin, ev_seqno, ev_timestamp,		  ev_minxid, ev_maxxid, ev_xip,		  ev_type,		  ev_data1, ev_data2,		  ev_data3, ev_data4,		  ev_data5, ev_data6,		  ev_data7, ev_data8 from "_pgbenchtest".sl_event e where (e.ev_origin = '1' and e.ev_seqno &#62; '1') order by e.ev_origin, e.ev_seqno" - could not receive data from server: Operation now in progress</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
->On AIX and Solaris (and possibly elsewhere), both <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->and <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-></I
-></SPAN
-> must be compiled with the <CODE
-CLASS="OPTION"
->--enable-thread-safety</CODE
-> option.  The above results when <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> isn't so compiled.&#13;</P
-><P
->What breaks here is that the libc (threadsafe) and libpq (non-threadsafe) use different memory locations for errno, thereby leading to the request failing.&#13;</P
-><P
->Problems like this crop up with disadmirable regularity on AIX
-and Solaris; it may take something of an <SPAN
-CLASS="QUOTE"
->"object code audit"</SPAN
-> to
-make sure that <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->ALL</I
-></SPAN
-> of the necessary components have been
-compiled and linked with <CODE
-CLASS="OPTION"
->--enable-thread-safety</CODE
->.&#13;</P
-><P
->For instance, I ran into the problem one that
-<CODE
-CLASS="ENVAR"
->LD_LIBRARY_PATH</CODE
-> had been set, on Solaris, to point to
-libraries from an old <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> compile.  That meant that even though
-the database <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->had</I
-></SPAN
-> been compiled with
-<CODE
-CLASS="OPTION"
->--enable-thread-safety</CODE
->, and <B
-CLASS="APPLICATION"
->slon</B
-> had been
-compiled against that, <B
-CLASS="APPLICATION"
->slon</B
-> was being dynamically linked
-to the <SPAN
-CLASS="QUOTE"
->"bad old thread-unsafe version,"</SPAN
-> so slon didn't work.  It
-wasn't clear that this was the case until I ran <TT
-CLASS="COMMAND"
->ldd</TT
-> against
-<B
-CLASS="APPLICATION"
->slon</B
->.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1297"
-></A
-><B
->Q: I tried creating a CLUSTER NAME with a "-" in it.
-That didn't work.&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> uses the same rules for unquoted identifiers as the <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
->
-main parser, so no, you probably shouldn't put a "-" in your
-identifier name.&#13;</P
-><P
-> You may be able to defeat this by putting "quotes" around
-identifier names, but it's liable to bite you some, so this is
-something that is probably not worth working around.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1305"
-></A
-><B
->Q:  slon does not restart after crash&#13;</B
-></BIG
-></P
-><P
-> After an immediate stop of postgresql (simulation of system crash)
-in pg_catalog.pg_listener a tuple with
-relname='_${cluster_name}_Restart' exists. slon doesn't start cause it
-thinks another process is serving the cluster on this node.  What can
-I do? The tuples can't be dropped from this relation.&#13;</P
-><P
-> The logs claim that "Another slon daemon is serving this node already"&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
->It's handy to keep a slonik script like the following one around to
-run in such cases:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->    twcsds004[/opt/twcsds004/OXRS/slony-scripts]$ cat restart_org.slonik 
-    cluster name = oxrsorg ;
-    node 1 admin conninfo = 'host=32.85.68.220 dbname=oxrsorg user=postgres port=5532';
-    node 2 admin conninfo = 'host=32.85.68.216 dbname=oxrsorg user=postgres port=5532';
-    node 3 admin conninfo = 'host=32.85.68.244 dbname=oxrsorg user=postgres port=5532';
-    node 4 admin conninfo = 'host=10.28.103.132 dbname=oxrsorg user=postgres port=5532';
-    restart node 1;
-    restart node 2;
-    restart node 3;
-    restart node 4;</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
-> <TT
-CLASS="COMMAND"
->restart node n</TT
-> cleans up dead notifications so that you can restart the node.&#13;</P
-><P
->As of version 1.0.5, the startup process of slon looks for this
-condition, and automatically cleans it up.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1316"
-></A
-><B
->Q: ps finds passwords on command line&#13;</B
-></BIG
-></P
-><P
-> If I run a <TT
-CLASS="COMMAND"
->ps</TT
-> command, I, and everyone else, can see passwords
-on the command line.&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
->Take the passwords out of the Slony configuration, and put them into
-<TT
-CLASS="FILENAME"
-><CODE
-CLASS="ENVAR"
->$(HOME)</CODE
->/.pgpass.</TT
->&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
 ><A
-NAME="AEN1325"
+HREF="t2593.html"
 ></A
-><B
->Q: Slonik fails - cannot load <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> library - <TT
-CLASS="COMMAND"
->PGRES_FATAL_ERROR load '$libdir/xxid';</TT
->&#13;</B
-></BIG
-></P
-><P
-> When I run the sample setup script I get an error message similar
-to:
-
-<TT
-CLASS="COMMAND"
->stdin:64: PGRES_FATAL_ERROR load '$libdir/xxid';  - ERROR:  LOAD:
-could not open file '$libdir/xxid': No such file or directory</TT
->&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> Evidently, you haven't got the <TT
-CLASS="FILENAME"
->xxid.so</TT
->
-library in the <CODE
-CLASS="ENVAR"
->$libdir</CODE
-> directory that the <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> instance
-is using.  Note that the <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> components need to be installed in
-the <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> software installation for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->each and every one</I
-></SPAN
->
-of the nodes, not just on the origin node.&#13;</P
-><P
->This may also point to there being some other mismatch between
-the <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> binary instance and the <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> instance.  If you
-compiled <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> yourself, on a machine that may have multiple
-<SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> builds <SPAN
-CLASS="QUOTE"
->"lying around,"</SPAN
-> it's possible that the slon or
-slonik binaries are asking to load something that isn't actually in
-the library directory for the <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> database cluster that it's
-hitting.&#13;</P
-><P
->Long and short: This points to a need to <SPAN
-CLASS="QUOTE"
->"audit"</SPAN
-> what
-installations of <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> and <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
->
-you have in place on the machine(s).  Unfortunately, just about any
-mismatch will cause things not to link up quite right.  See also <A
-HREF="faq.html#SLONYFAQ02"
-> SlonyFAQ02 </A
-> concerning threading issues
-on Solaris ...&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1352"
-></A
-><B
->Q: Table indexes with FQ namespace names
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->    set add table (set id = 1, origin = 1, id = 27, 
-                   full qualified name = 'nspace.some_table', 
-                   key = 'key_on_whatever', 
-                   comment = 'Table some_table in namespace nspace with a candidate primary key');</PRE
-></TD
-></TR
-></TABLE
->&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> If you have <TT
-CLASS="COMMAND"
-> key = 'nspace.key_on_whatever'</TT
->
-the request will <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->FAIL</I
-></SPAN
->.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1360"
-></A
-><B
->Q: I'm trying to get a slave subscribed, and get the following
-messages in the logs:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    DEBUG1 copy_set 1
-    DEBUG1 remoteWorkerThread_1: connected to provider DB
-    WARN	remoteWorkerThread_1: transactions earlier than XID 127314958 are still in progress
-    WARN	remoteWorkerThread_1: data copy for set 1 failed - sleep 60 seconds</PRE
-></TD
-></TR
-></TABLE
->&#13;</B
-></BIG
-></P
-><P
->Oops.  What I forgot to mention, as well, was that I was trying
-to add <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->TWO</I
-></SPAN
-> subscribers, concurrently.&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> That doesn't work out: <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> won't work on the
-<TT
-CLASS="COMMAND"
->COPY</TT
-> commands concurrently.  See
-<TT
-CLASS="FILENAME"
->src/slon/remote_worker.c</TT
->, function
-<CODE
-CLASS="FUNCTION"
->copy_set()</CODE
->&#13;</P
-><P
->This has the (perhaps unfortunate) implication that you cannot
-populate two slaves concurrently.  You have to subscribe one to the
-set, and only once it has completed setting up the subscription
-(copying table contents and such) can the second subscriber start
-setting up the subscription.&#13;</P
-><P
->It could also be possible for there to be an old outstanding
-transaction blocking <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> from processing the sync.  You might want
-to take a look at pg_locks to see what's up:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    sampledb=# select * from pg_locks where transaction is not null order by transaction;
-     relation | database | transaction |  pid    |     mode      | granted 
-    ----------+----------+-------------+---------+---------------+---------
-              |          |   127314921 | 2605100 | ExclusiveLock | t
-              |          |   127326504 | 5660904 | ExclusiveLock | t
-    (2 rows)</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->See?  127314921 is indeed older than 127314958, and it's still running.
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    $ ps -aef | egrep '[2]605100'
-    
-    postgres 2605100  205018	0 18:53:43  pts/3  3:13 postgres: postgres sampledb localhost COPY </PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->This happens to be a <TT
-CLASS="COMMAND"
->COPY</TT
-> transaction involved in setting up the
-subscription for one of the nodes.  All is well; the system is busy
-setting up the first subscriber; it won't start on the second one
-until the first one has completed subscribing.&#13;</P
-><P
->By the way, if there is more than one database on the <SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
->
-cluster, and activity is taking place on the OTHER database, that will
-lead to there being <SPAN
-CLASS="QUOTE"
->"transactions earlier than XID whatever"</SPAN
-> being
-found to be still in progress.  The fact that it's a separate database
-on the cluster is irrelevant; <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> will wait until those old
-transactions terminate.</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1384"
-></A
-><B
->Q: ERROR: duplicate key violates unique constraint "sl_table-pkey"&#13;</B
-></BIG
-></P
-><P
->I tried setting up a second replication set, and got the following error:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    stdin:9: Could not create subscription set 2 for oxrslive!
-    stdin:11: PGRES_FATAL_ERROR select "_oxrslive".setAddTable(2, 1, 'public.replic_test', 'replic_test__Slony-I_oxrslive_rowID_key', 'Table public.replic_test without primary key');  - ERROR:  duplicate key violates unique constraint "sl_table-pkey"
-    CONTEXT:  PL/pgSQL function "setaddtable_int" line 71 at SQL statement</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
->The table IDs used in SET ADD TABLE are required to be unique <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->ACROSS
-ALL SETS</I
-></SPAN
->.  Thus, you can't restart numbering at 1 for a second set; if
-you are numbering them consecutively, a subsequent set has to start
-with IDs after where the previous set(s) left off.</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1392"
-></A
-><B
->Q: I need to drop a table from a replication set</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
->This can be accomplished several ways, not all equally desirable ;-).
-
-<P
-></P
-><UL
-><LI
-><P
-> You could drop the whole replication set, and recreate it with just the tables that you need.  Alas, that means recopying a whole lot of data, and kills the usability of the cluster on the rest of the set while that's happening.&#13;</P
-></LI
-><LI
-><P
-> If you are running 1.0.5 or later, there is the command SET DROP TABLE, which will "do the trick."&#13;</P
-></LI
-><LI
-><P
-> If you are still using 1.0.1 or 1.0.2, the _essential_ functionality of SET DROP TABLE involves the functionality in droptable_int().  You can fiddle this by hand by finding the table ID for the table you want to get rid of, which you can find in sl_table, and then run the following three queries, on each host:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->      select _slonyschema.alterTableRestore(40);
-      select _slonyschema.tableDropKey(40);
-      delete from _slonyschema.sl_table where tab_id = 40;</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->The schema will obviously depend on how you defined the <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
->
-cluster.  The table ID, in this case, 40, will need to change to the
-ID of the table you want to have go away.
-
-You'll have to run these three queries on all of the nodes, preferably
-firstly on the origin node, so that the dropping of this propagates
-properly.  Implementing this via a <A
-HREF="app-slonik.html#SLONIK"
-> slonik</A
-> statement with a new <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> event would do
-that.  Submitting the three queries using <TT
-CLASS="COMMAND"
->EXECUTE SCRIPT</TT
->
-could do that.  Also possible would be to connect to each database and
-submit the queries by hand.</P
-></LI
-></UL
-></P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1410"
-></A
-><B
->Q: I need to drop a sequence from a replication set&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-></P
-><P
->If you are running 1.0.5 or later, there is a
-<TT
-CLASS="COMMAND"
->SET DROP SEQUENCE</TT
-> command in Slonik to allow you to do this,
-parallelling <TT
-CLASS="COMMAND"
->SET DROP TABLE.</TT
->&#13;</P
-><P
->If you are running 1.0.2 or earlier, the process is a bit more manual.&#13;</P
-><P
->Supposing I want to get rid of the two sequences listed below,
-<CODE
-CLASS="ENVAR"
->whois_cachemgmt_seq</CODE
-> and <CODE
-CLASS="ENVAR"
->epp_whoi_cach_seq_</CODE
->, we start
-by needing the <CODE
-CLASS="ENVAR"
->seq_id</CODE
-> values.
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    oxrsorg=# select * from _oxrsorg.sl_sequence  where seq_id in (93,59);
-     seq_id | seq_reloid | seq_set |       seq_comment				 
-    --------+------------+---------+-------------------------------------
-         93 |  107451516 |       1 | Sequence public.whois_cachemgmt_seq
-         59 |  107451860 |       1 | Sequence public.epp_whoi_cach_seq_
-    (2 rows)</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->The data that needs to be deleted to stop Slony from continuing to
-replicate these are thus:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->    delete from _oxrsorg.sl_seqlog where seql_seqid in (93, 59);
-    delete from _oxrsorg.sl_sequence where seq_id in (93,59);</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->Those two queries could be submitted to all of the nodes via
-<CODE
-CLASS="FUNCTION"
->ddlscript()</CODE
-> / <TT
-CLASS="COMMAND"
->EXECUTE SCRIPT</TT
->, thus eliminating
-the sequence everywhere <SPAN
-CLASS="QUOTE"
->"at once."</SPAN
-> Or they may be applied by
-hand to each of the nodes.&#13;</P
-><P
->Similarly to <TT
-CLASS="COMMAND"
->SET DROP TABLE</TT
->, this should be in place for <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> version
-1.0.5 as <TT
-CLASS="COMMAND"
->SET DROP SEQUENCE.</TT
-></P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1434"
-></A
-><B
->Q: <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
->: cannot add table to currently subscribed set 1&#13;</B
-></BIG
-></P
-><P
-> I tried to add a table to a set, and got the following message:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    	Slony-I: cannot add table to currently subscribed set 1</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> You cannot add tables to sets that already have
-subscribers.&#13;</P
-><P
->The workaround to this is to create <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->ANOTHER</I
-></SPAN
-> set, add
-the new tables to that new set, subscribe the same nodes subscribing
-to "set 1" to the new set, and then merge the sets together.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1444"
-></A
-><B
->Q: Some nodes start consistently falling behind&#13;</B
-></BIG
-></P
-><P
->I have been running <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> on a node for a while, and am seeing
-system performance suffering.&#13;</P
-><P
->I'm seeing long running queries of the form:
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    	fetch 100 from LOG;</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> This is characteristic of pg_listener (which is the table containing
-<TT
-CLASS="COMMAND"
->NOTIFY</TT
-> data) having plenty of dead tuples in it.  That makes <TT
-CLASS="COMMAND"
->NOTIFY</TT
->
-events take a long time, and causes the affected node to gradually
-fall further and further behind.&#13;</P
-><P
->You quite likely need to do a <TT
-CLASS="COMMAND"
->VACUUM FULL</TT
-> on <CODE
-CLASS="ENVAR"
->pg_listener</CODE
->, to vigorously clean it out, and need to vacuum <CODE
-CLASS="ENVAR"
->pg_listener</CODE
-> really frequently.  Once every five minutes would likely be AOK.&#13;</P
-><P
-> Slon daemons already vacuum a bunch of tables, and
-<TT
-CLASS="FILENAME"
->cleanup_thread.c</TT
-> contains a list of tables that are
-frequently vacuumed automatically.  In <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> 1.0.2,
-<CODE
-CLASS="ENVAR"
->pg_listener</CODE
-> is not included.  In 1.0.5 and later, it is
-regularly vacuumed, so this should cease to be a direct issue.&#13;</P
-><P
->There is, however, still a scenario where this will still
-"bite."  Vacuums cannot delete tuples that were made "obsolete" at any
-time after the start time of the eldest transaction that is still
-open.  Long running transactions will cause trouble, and should be
-avoided, even on "slave" nodes.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1464"
-></A
-><B
->Q: I started doing a backup using pg_dump, and suddenly Slony stops&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
->Ouch.  What happens here is a conflict between:
-<P
-></P
-><UL
-><LI
-><P
-> <B
-CLASS="APPLICATION"
->pg_dump</B
->, which has taken out an <TT
-CLASS="COMMAND"
->AccessShareLock</TT
-> on all of the tables in the database, including the <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> ones, and&#13;</P
-></LI
-><LI
-><P
-> A <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> sync event, which wants to grab a <TT
-CLASS="COMMAND"
->AccessExclusiveLock</TT
-> on	 the table <CODE
-CLASS="ENVAR"
->sl_event</CODE
->.</P
-></LI
-></UL
->&#13;</P
-><P
->The initial query that will be blocked is thus:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    select "_slonyschema".createEvent('_slonyschema, 'SYNC', NULL);	  </PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->(You can see this in <CODE
-CLASS="ENVAR"
->pg_stat_activity</CODE
->, if you have query
-display turned on in <TT
-CLASS="FILENAME"
->postgresql.conf</TT
->)&#13;</P
-><P
->The actual query combination that is causing the lock is from
-the function <CODE
-CLASS="FUNCTION"
->Slony_I_ClusterStatus()</CODE
->, found in
-<TT
-CLASS="FILENAME"
->slony1_funcs.c</TT
->, and is localized in the code that does:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->      LOCK TABLE %s.sl_event;
-      INSERT INTO %s.sl_event (...stuff...)
-      SELECT currval('%s.sl_event_seq');</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->The <TT
-CLASS="COMMAND"
->LOCK</TT
-> statement will sit there and wait until <TT
-CLASS="COMMAND"
->pg_dump</TT
-> (or whatever else has pretty much any kind of access lock on <CODE
-CLASS="ENVAR"
->sl_event</CODE
->) completes.  &#13;</P
-><P
->Every subsequent query submitted that touches <CODE
-CLASS="ENVAR"
->sl_event</CODE
-> will block behind the <CODE
-CLASS="FUNCTION"
->createEvent</CODE
-> call.&#13;</P
-><P
->There are a number of possible answers to this:
-<P
-></P
-><UL
-><LI
-><P
-> Have pg_dump specify the schema dumped using
---schema=whatever, and don't try dumping the cluster's schema.&#13;</P
-></LI
-><LI
-><P
-> It would be nice to add an "--exclude-schema" option
-to pg_dump to exclude the Slony cluster schema.  Maybe in 8.0 or
-8.1...&#13;</P
-></LI
-><LI
-><P
->Note that 1.0.5 uses a more precise lock that is less
-exclusive that alleviates this problem.</P
-></LI
-></UL
-></P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1504"
-></A
-><B
->Q: The slons spent the weekend out of commission [for
-some reason], and it's taking a long time to get a sync through.&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> You might want to take a look at the sl_log_1/sl_log_2
-tables, and do a summary to see if there are any really enormous
-<SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> transactions in there.  Up until at least 1.0.2,
-there needs to be a slon connected to the origin in order for
-<TT
-CLASS="COMMAND"
->SYNC</TT
-> events to be generated.&#13;</P
-><P
->If none are being generated, then all of the updates until the next
-one is generated will collect into one rather enormous <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
->
-transaction.&#13;</P
-><P
->Conclusion: Even if there is not going to be a subscriber
-around, you <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->really</I
-></SPAN
-> want to have a slon running to service
-the origin node.&#13;</P
-><P
-><SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> 1.1 provides a stored procedure that
-allows <TT
-CLASS="COMMAND"
->SYNC</TT
-> counts to be updated on the origin based on a
-<B
-CLASS="APPLICATION"
->cron</B
-> job even if there is no <A
-HREF="app-slon.html#SLON"
-> slon</A
-> daemon running.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1520"
-></A
-><B
->Q: I pointed a subscribing node to a different provider
-and it stopped replicating&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
->We noticed this happening when we wanted to re-initialize a node,
-where we had configuration thus:
-
-<P
-></P
-><UL
-><LI
-><P
-> Node 1 - provider</P
-></LI
-><LI
-><P
-> Node 2 - subscriber to node 1 - the node we're reinitializing</P
-></LI
-><LI
-><P
-> Node 3 - subscriber to node 3 - node that should keep replicating</P
-></LI
-></UL
->&#13;</P
-><P
->The subscription for node 3 was changed to have node 1 as
-provider, and we did <TT
-CLASS="COMMAND"
->DROP SET</TT
->/<TT
-CLASS="COMMAND"
->SUBSCRIBE SET</TT
-> for
-node 2 to get it repopulating.&#13;</P
-><P
->Unfortunately, replication suddenly stopped to node 3.&#13;</P
-><P
->The problem was that there was not a suitable set of <SPAN
-CLASS="QUOTE"
->"listener paths"</SPAN
->
-in sl_listen to allow the events from node 1 to propagate to node 3.
-The events were going through node 2, and blocking behind the
-<TT
-CLASS="COMMAND"
->SUBSCRIBE SET</TT
-> event that node 2 was working on.&#13;</P
-><P
->The following slonik script dropped out the listen paths where node 3
-had to go through node 2, and added in direct listens between nodes 1
-and 3.
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->    cluster name = oxrslive;
-     node 1 admin conninfo='host=32.85.68.220 dbname=oxrslive user=postgres port=5432';
-     node 2 admin conninfo='host=32.85.68.216 dbname=oxrslive user=postgres port=5432';
-     node 3 admin conninfo='host=32.85.68.244 dbname=oxrslive user=postgres port=5432';
-     node 4 admin conninfo='host=10.28.103.132 dbname=oxrslive user=postgres port=5432';
-    try {
-      store listen (origin = 1, receiver = 3, provider = 1);
-      store listen (origin = 3, receiver = 1, provider = 3);
-      drop listen (origin = 1, receiver = 3, provider = 2);
-      drop listen (origin = 3, receiver = 1, provider = 2);
-    }</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->Immediately after this script was run, <TT
-CLASS="COMMAND"
->SYNC</TT
-> events started propagating
-again to node 3.
-
-This points out two principles:
-<P
-></P
-><UL
-><LI
-><P
-> If you have multiple nodes, and cascaded subscribers,
-you need to be quite careful in populating the <TT
-CLASS="COMMAND"
->STORE LISTEN</TT
->
-entries, and in modifying them if the structure of the replication
-"tree" changes.&#13;</P
-></LI
-><LI
-><P
-> Version 1.1 probably ought to provide better tools to
-help manage this.&#13;</P
-></LI
-></UL
->&#13;</P
-><P
->The issues of "listener paths" are discussed further at <A
-HREF="listenpaths.html"
-> Slony Listen Paths </A
->&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1551"
-></A
-><B
->Q: After dropping a node, sl_log_1 isn't getting purged out anymore.&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> This is a common scenario in versions before 1.0.5, as
-the "clean up" that takes place when purging the node does not include
-purging out old entries from the <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> table, sl_confirm, for the
-recently departed node.&#13;</P
-><P
-> The node is no longer around to update confirmations of what
-syncs have been applied on it, and therefore the cleanup thread that
-purges log entries thinks that it can't safely delete entries newer
-than the final sl_confirm entry, which rather curtails the ability to
-purge out old logs.&#13;</P
-><P
->Diagnosis: Run the following query to see if there are any
-"phantom/obsolete/blocking" sl_confirm entries:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    oxrsbar=# select * from _oxrsbar.sl_confirm where con_origin not in (select no_id from _oxrsbar.sl_node) or con_received not in (select no_id from _oxrsbar.sl_node);
-     con_origin | con_received | con_seqno |        con_timestamp                  
-    ------------+--------------+-----------+----------------------------
-              4 |          501 |     83999 | 2004-11-09 19:57:08.195969
-              1 |            2 |   3345790 | 2004-11-14 10:33:43.850265
-              2 |          501 |    102718 | 2004-11-14 10:33:47.702086
-            501 |            2 |      6577 | 2004-11-14 10:34:45.717003
-              4 |            5 |     83999 | 2004-11-14 21:11:11.111686
-              4 |            3 |     83999 | 2004-11-24 16:32:39.020194
-    (6 rows)</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->In version 1.0.5, the "drop node" function purges out entries in
-sl_confirm for the departing node.  In earlier versions, this needs to
-be done manually.  Supposing the node number is 3, then the query
-would be:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    delete from _namespace.sl_confirm where con_origin = 3 or con_received = 3;</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->Alternatively, to go after <SPAN
-CLASS="QUOTE"
->"all phantoms,"</SPAN
-> you could use
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    oxrsbar=# delete from _oxrsbar.sl_confirm where con_origin not in (select no_id from _oxrsbar.sl_node) or con_received not in (select no_id from _oxrsbar.sl_node);
-    DELETE 6</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->General <SPAN
-CLASS="QUOTE"
->"due diligance"</SPAN
-> dictates starting with a
-<TT
-CLASS="COMMAND"
->BEGIN</TT
->, looking at the contents of sl_confirm before,
-ensuring that only the expected records are purged, and then, only
-after that, confirming the change with a <TT
-CLASS="COMMAND"
->COMMIT</TT
->.  If you
-delete confirm entries for the wrong node, that could ruin your whole
-day.&#13;</P
-><P
->You'll need to run this on each node that remains...&#13;</P
-><P
->Note that in 1.0.5, this is no longer an issue at all, as it purges unneeded entries from sl_confirm in two places:
-<P
-></P
-><UL
-><LI
-><P
-> At the time a node is dropped</P
-></LI
-><LI
-><P
-> At the start of each "cleanupEvent" run, which is the event in which old data is purged from sl_log_1 and sl_seqlog</P
-></LI
-></UL
->&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1576"
-></A
-><B
->Q: Replication Fails - Unique Constraint Violation&#13;</B
-></BIG
-></P
-><P
->Replication has been running for a while, successfully, when a
-node encounters a "glitch," and replication logs are filled with
-repetitions of the following:
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    DEBUG2 remoteWorkerThread_1: syncing set 2 with 5 table(s) from provider 1
-    DEBUG2 remoteWorkerThread_1: syncing set 1 with 41 table(s) from provider 1
-    DEBUG2 remoteWorkerThread_1: syncing set 5 with 1 table(s) from provider 1
-    DEBUG2 remoteWorkerThread_1: syncing set 3 with 1 table(s) from provider 1
-    DEBUG2 remoteHelperThread_1_1: 0.135 seconds delay for first row
-    DEBUG2 remoteHelperThread_1_1: 0.343 seconds until close cursor
-    ERROR  remoteWorkerThread_1: "insert into "_oxrsapp".sl_log_1          (log_origin, log_xid, log_tableid,                log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '34', '35090538', 'D', '_rserv_ts=''9275244''');
-    delete from only public.epp_domain_host where _rserv_ts='9275244';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '34', '35090539', 'D', '_rserv_ts=''9275245''');
-    delete from only public.epp_domain_host where _rserv_ts='9275245';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '26', '35090540', 'D', '_rserv_ts=''24240590''');
-    delete from only public.epp_domain_contact where _rserv_ts='24240590';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '26', '35090541', 'D', '_rserv_ts=''24240591''');
-    delete from only public.epp_domain_contact where _rserv_ts='24240591';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '26', '35090542', 'D', '_rserv_ts=''24240589''');
-    delete from only public.epp_domain_contact where _rserv_ts='24240589';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '11', '35090543', 'D', '_rserv_ts=''36968002''');
-    delete from only public.epp_domain_status where _rserv_ts='36968002';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '11', '35090544', 'D', '_rserv_ts=''36968003''');
-    delete from only public.epp_domain_status where _rserv_ts='36968003';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '24', '35090549', 'I', '(contact_id,status,reason,_rserv_ts) values (''6972897'',''64'','''',''31044208'')');
-    insert into public.contact_status (contact_id,status,reason,_rserv_ts) values ('6972897','64','','31044208');insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '24', '35090550', 'D', '_rserv_ts=''18139332''');
-    delete from only public.contact_status where _rserv_ts='18139332';insert into "_oxrsapp".sl_log_1	  (log_origin, log_xid, log_tableid,		log_actionseq, log_cmdtype,		log_cmddata) values	  ('1', '919151224', '24', '35090551', 'D', '_rserv_ts=''18139333''');
-    delete from only public.contact_status where _rserv_ts='18139333';" ERROR:  duplicate key violates unique constraint "contact_status_pkey"
-     - qualification was: 
-    ERROR  remoteWorkerThread_1: SYNC aborted</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-><P
->The transaction rolls back, and <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> tries again, and again,
-and again.  The problem is with one of the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->last</I
-></SPAN
-> SQL statements, the
-one with <TT
-CLASS="COMMAND"
->log_cmdtype = 'I'</TT
->.  That isn't quite obvious; what takes
-place is that <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> groups 10 update queries together to diminish
-the number of network round trips.&#13;</P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-></P
-><P
-> A <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->certain</I
-></SPAN
-> cause for this has not yet been arrived
-at.  The factors that <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->appear</I
-></SPAN
-> to go together to contribute
-to this scenario are as follows:
-
-<P
-></P
-><UL
-><LI
-><P
-> The "glitch" seems to coincide with some sort of
-outage; it has been observed both in cases where databases were
-suffering from periodic "SIG 11" problems, where backends were falling
-over, as well as when temporary network failure seemed likely.&#13;</P
-></LI
-><LI
-><P
-> The scenario seems to involve a delete transaction
-having been missed by <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
->.&#13;</P
-></LI
-></UL
->&#13;</P
-><P
->By the time we notice that there is a problem, the missed delete
-transaction has been cleaned out of sl_log_1, so there is no recovery
-possible.&#13;</P
-><P
->What is necessary, at this point, is to drop the replication set
-(or even the node), and restart replication from scratch on that node.&#13;</P
-><P
->In <SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> 1.0.5, the handling of purges of sl_log_1 are rather
-more conservative, refusing to purge entries that haven't been
-successfully synced for at least 10 minutes on all nodes.  It is not
-certain that that will prevent the "glitch" from taking place, but it
-seems likely that it will leave enough sl_log_1 data to be able to do
-something about recovering from the condition or at least diagnosing
-it more exactly.  And perhaps the problem is that sl_log_1 was being
-purged too aggressively, and this will resolve the issue completely.&#13;</P
-><DIV
-CLASS="QANDAENTRY"
-><DIV
-CLASS="QUESTION"
-><P
-><BIG
-><A
-NAME="AEN1601"
-></A
-><B
->Q:  If you have a slonik script something like this, it
-will hang on you and never complete, because you can't have
-<TT
-CLASS="COMMAND"
->wait for event</TT
-> inside a <TT
-CLASS="COMMAND"
->try</TT
-> block. A <TT
-CLASS="COMMAND"
->try</TT
->
-block is executed as one transaction, and the event that you are
-waiting for can never arrive inside the scope of the transaction.
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->    try {
-          echo 'Moving set 1 to node 3';
-          lock set (id=1, origin=1);
-          echo 'Set locked';
-          wait for event (origin = 1, confirmed = 3);
-          echo 'Moving set';
-          move set (id=1, old origin=1, new origin=3);
-          echo 'Set moved - waiting for event to be confirmed by node 3';
-          wait for event (origin = 1, confirmed = 3);
-          echo 'Confirmed';
-    } on error {
-          echo 'Could not move set for cluster foo';
-          unlock set (id=1, origin=1);
-          exit -1;
-    }</PRE
-></TD
-></TR
-></TABLE
->&#13;</B
-></BIG
-></P
-></DIV
-><DIV
-CLASS="ANSWER"
-><P
-><B
->A: </B
-> You must not invoke <TT
-CLASS="COMMAND"
->wait for event</TT
-> inside a
-<SPAN
-CLASS="QUOTE"
->"try"</SPAN
-> block.&#13;</P
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
-></DIV
+></DT
+></DL
 ></DIV
 ></DIV
 ></DIV
@@ -1767,7 +129,7 @@
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="help.html"
+HREF="t2563.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -1776,7 +138,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -1784,14 +146,18 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->&nbsp;</TD
+><A
+HREF="t2593.html"
+ACCESSKEY="N"
+>Next</A
+></TD
 ></TR
 ><TR
 ><TD
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->More Slony-I Help</TD
+></TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -1801,7 +167,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->&nbsp;</TD
+></TD
 ></TR
 ></TABLE
 ></DIV
Index: subscribenodes.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/subscribenodes.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/subscribenodes.sgml -Ldoc/adminguide/subscribenodes.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/subscribenodes.sgml
+++ doc/adminguide/subscribenodes.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="subscribenodes"> <title>Subscribing Nodes</title>
 
Index: legal.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/legal.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/legal.sgml -Ldoc/adminguide/legal.sgml -u -w -r1.3 -r1.4
--- doc/adminguide/legal.sgml
+++ doc/adminguide/legal.sgml
@@ -1,6 +1,4 @@
-<!--
-$Id$
--->
+<!-- $Id$ -->
 
 <copyright>
  <year>2004-2005</year>
@@ -46,6 +44,7 @@
  Microsoft Corporation in the United States and other countries.
  <trademark>Solaris</trademark> is a registered trademark of Sun Microsystems,
  Inc.  <trademark>Linux</trademark> is a trademark of Linus Torvalds.
+ <trademark>AIX</trademark> is a registered trademark of IBM.
 </para>
 </legalnotice>
 
Index: reshape.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/reshape.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/reshape.sgml -Ldoc/adminguide/reshape.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/reshape.sgml
+++ doc/adminguide/reshape.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="reshape"> <title>Reshaping a Cluster</title>
 
Index: startslons.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/startslons.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ldoc/adminguide/startslons.sgml -Ldoc/adminguide/startslons.sgml -u -w -r1.5 -r1.6
--- doc/adminguide/startslons.sgml
+++ doc/adminguide/startslons.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="slonstart"> <title>Slon daemons</title>
 
Index: addthings.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/addthings.sgml,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ldoc/adminguide/addthings.sgml -Ldoc/adminguide/addthings.sgml -u -w -r1.5 -r1.6
--- doc/adminguide/addthings.sgml
+++ doc/adminguide/addthings.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="addthings">
 <title>Adding Things to Replication</title>
@@ -20,7 +20,11 @@
 linkend="stmtmergeset">MERGE SET</link></command>.</para>
 
 <para>Up to and including 1.0.2, there was a potential problem where
+<<<<<<< addthings.sgml
 if <command><link linkend="stmtmergeset">MERGE SET</link></command>
+=======
+if <command><link linkend="stmtmergeset">MERGE SET</link></command>
+>>>>>>> 1.5
 is issued while other subscription-related events are pending, it is
 possible for things to get pretty confused on the nodes where other
 things were pending.  This problem was resolved in 1.0.5.</para>
Index: app-slonik.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/app-slonik.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldoc/adminguide/app-slonik.html -Ldoc/adminguide/app-slonik.html -u -w -r1.1 -r1.2
--- doc/adminguide/app-slonik.html
+++ doc/adminguide/app-slonik.html
@@ -1,35 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 >slonik</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="UP"
-TITLE="Slony-I Commands"
-HREF="slony-commands.html"><LINK
+TITLE="Slony-I binaries"
+HREF="c383.html"><LINK
 REL="PREVIOUS"
 TITLE="slon"
 HREF="app-slon.html"><LINK
 REL="NEXT"
-HREF="slonyadmin.html"><LINK
+TITLE="Slonik Command Summary"
+HREF="slonikcommands.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
 CLASS="REFENTRY"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -40,31 +39,51 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
 HREF="app-slon.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="app-slon.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
+><A
+HREF="slonikcommands.html"
+>Fast Forward</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
 ><A
-HREF="slonyadmin.html"
+HREF="slonikcommands.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -77,29 +96,32 @@
 ><A
 NAME="APP-SLONIK"
 ></A
-><B
+><SPAN
 CLASS="APPLICATION"
->slonik</B
+>slonik</SPAN
 ></H1
 ><DIV
 CLASS="REFNAMEDIV"
 ><A
-NAME="AEN454"
+NAME="AEN503"
 ></A
 ><H2
 >Name</H2
-><B
+><SPAN
 CLASS="APPLICATION"
->slonik</B
+>slonik</SPAN
 >&nbsp;--&nbsp;      <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
 > command processor
     </DIV
+><A
+NAME="AEN508"
+></A
 ><DIV
 CLASS="REFSYNOPSISDIV"
 ><A
-NAME="AEN461"
+NAME="AEN510"
 ></A
 ><H2
 >Synopsis</H2
@@ -107,25 +129,22 @@
 ><TT
 CLASS="COMMAND"
 >slonik</TT
-> [<TT
+> [<VAR
 CLASS="REPLACEABLE"
-><I
->filename</I
-></TT
->
-  ]</P
+>filename</VAR
+>]</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN466"
+NAME="AEN515"
 ></A
 ><H2
 >Description</H2
 ><P
->     <B
+>     <SPAN
 CLASS="APPLICATION"
->slonik</B
+>slonik</SPAN
 > is the command processor
      application that is used to set up and modify configurations of
      <SPAN
@@ -137,14 +156,14 @@
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN471"
+NAME="AEN520"
 ></A
 ><H2
 > Outline</H2
 ><P
->The <B
+>The <SPAN
 CLASS="APPLICATION"
->slonik</B
+>slonik</SPAN
 > command line utility is
   supposed to be used embedded into shell scripts and reads commands
   from files or stdin.</P
@@ -159,20 +178,20 @@
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
 >
-  support base into a database.  <B
+  support base into a database.  <SPAN
 CLASS="APPLICATION"
->Slonik</B
+>Slonik</SPAN
 > was created
   because these stored procedures have special requirements as to on
   which particular node in the replication system they are called.
   The absence of named parameters for stored procedures makes it
-  rather hard to do this from the <B
+  rather hard to do this from the <SPAN
 CLASS="APPLICATION"
->psql</B
+>psql</SPAN
 > prompt, and
-  <B
+  <SPAN
 CLASS="APPLICATION"
->psql</B
+>psql</SPAN
 > lacks the ability to maintain multiple
   connections with open transactions to multiple databases.</P
 ><P
@@ -201,23 +220,23 @@
   these sorts of scripting languages already have perfectly good ways
   of managing variables, doing iteration, and such.</P
 ><P
->A detailed list of Slonik commands can be found here: <A
-HREF="http://gborg.postgresql.org/project/slony1/genpage.php?slonik_commands"
-TARGET="_top"
->  slonik commands </A
-></P
+>See also <A
+HREF="slonikcommands.html"
+> Slonik Commands
+  </A
+>. </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN487"
+NAME="AEN536"
 ></A
 ><H2
 >Exit Status</H2
 ><P
->   <B
+>   <SPAN
 CLASS="APPLICATION"
->slonik</B
+>slonik</SPAN
 > returns 0 to the shell if it
    finished normally.  Scripts may specify return codes.   
   </P
@@ -247,7 +266,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -256,7 +275,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="slonyadmin.html"
+HREF="slonikcommands.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -266,16 +285,16 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
-><B
+><SPAN
 CLASS="APPLICATION"
->slon</B
+>slon</SPAN
 ></TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony-commands.html"
+HREF="c383.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
@@ -283,7 +302,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
-></TD
+>Slonik Command Summary</TD
 ></TR
 ></TABLE
 ></DIV
Index: intro.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/intro.sgml,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ldoc/adminguide/intro.sgml -Ldoc/adminguide/intro.sgml -u -w -r1.4 -r1.5
--- doc/adminguide/intro.sgml
+++ doc/adminguide/intro.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article id="introduction">
 	<title>Introduction to <productname>Slony-I</productname></title>
 	<sect1>
Index: installation.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/installation.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/installation.html -Ldoc/adminguide/installation.html -u -w -r1.3 -r1.4
--- doc/adminguide/installation.html
+++ doc/adminguide/installation.html
@@ -1,35 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
 > Slony-I Installation</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="UP"
+TITLE="Slony-I Introduction"
 HREF="slonyintro.html"><LINK
 REL="PREVIOUS"
-TITLE=" Requirements"
+TITLE="System Requirements"
 HREF="requirements.html"><LINK
 REL="NEXT"
-TITLE="Slony-I Concepts"
-HREF="concepts.html"><LINK
+TITLE="Short Version"
+HREF="x225.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
-CLASS="SECT1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
+CLASS="ARTICLE"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -40,31 +39,51 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
 HREF="requirements.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="requirements.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="concepts.html"
+HREF="commandreferencec.html"
+>Fast Forward</A
+></TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="x225.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -74,12 +93,23 @@
 ALIGN="LEFT"
 WIDTH="100%"></DIV
 ><DIV
+CLASS="ARTICLE"
+><DIV
+CLASS="TITLEPAGE"
+><H1
+CLASS="TITLE"
+><A
+NAME="INSTALLATION"
+>Slony-I Installation</A
+></H1
+><HR></DIV
+><DIV
 CLASS="SECT1"
 ><H1
 CLASS="SECT1"
 ><A
-NAME="INSTALLATION"
->3. Slony-I Installation</A
+NAME="AEN218"
+>1. Slony-I Installation</A
 ></H1
 ><P
 >You should have obtained the <SPAN
@@ -87,19 +117,10 @@
 >Slony-I</SPAN
 > source from
 the previous step. Unpack it.</P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="SCREEN"
 >    gunzip slony.tar.gz;
     tar xf slony.tar</PRE
-></TD
-></TR
-></TABLE
 ><P
 > This will create a directory under the current directory with
 the <SPAN
@@ -107,166 +128,6 @@
 >Slony-I</SPAN
 > sources.  Head into that that directory for the rest of
 the installation procedure.</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN196"
->3.1. Short Version</A
-></H2
-><P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    ./configure --with-pgsourcetree=/whereever/the/source/is 
-    gmake all; gmake install </PRE
-></TD
-></TR
-></TABLE
->&#13;</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN200"
->3.2. Configuration</A
-></H2
-><P
->The first step of the installation procedure is to configure the
-source tree for your system.  This is done by running the
-<B
-CLASS="APPLICATION"
->configure</B
-> script.  In early versions,
-<B
-CLASS="APPLICATION"
->Configure</B
-> needed to know where your
-<SPAN
-CLASS="PRODUCTNAME"
->PostgreSQL</SPAN
-> source tree is, is done with the
-<CODE
-CLASS="OPTION"
->--with-pgsourcetree=</CODE
-> option.  As of version 1.1,
-<SPAN
-CLASS="PRODUCTNAME"
->Slony-I</SPAN
-> is configured by pointing it to the various
-library, binary, and include directories; for a full list of these
-options, use the command <TT
-CLASS="COMMAND"
-> ./configure --help </TT
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN209"
->3.3. Example</A
-></H2
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    ./configure --with-pgsourcetree=/usr/local/src/postgresql-7.4.3</PRE
-></TD
-></TR
-></TABLE
-><P
->This script will run a number of tests to guess values for
-various dependent variables and try to detect some quirks of your
-system.  Slony-I is known to need a modified version of libpq on
-specific platforms such as Solaris2.X on SPARC this patch can be found
-at <A
-HREF="http://developer.postgresql.org/~wieck/slony1/download/threadsafe-libpq-742.diff.gz"
-TARGET="_top"
->http://developer.postgresql.org/~wieck/slony1/download/threadsafe-libpq-742.diff.gz</A
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN214"
->3.4. Build</A
-></H2
-><P
->To start the build process, type
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="SCREEN"
->    gmake all</PRE
-></TD
-></TR
-></TABLE
-></P
-><P
-> Be sure to use GNU make; on BSD systems, it is called
-<B
-CLASS="APPLICATION"
->gmake</B
->; on Linux, GNU make is typically the native
-<B
-CLASS="APPLICATION"
->make</B
->, so the name of the command you type in may vary
-somewhat. The build may take anywhere from a few seconds to 2 minutes
-depending on how fast your hardware is at compiling things.  The last
-line displayed should be</P
-><P
-> <TT
-CLASS="COMMAND"
-> All of Slony-I is successfully made.  Ready to
-install.  </TT
-></P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN223"
->3.5. Installing Slony-I</A
-></H2
-><P
-> To install Slony-I, enter
-
-<TT
-CLASS="COMMAND"
->gmake install</TT
-></P
-><P
->This will install files into postgresql install directory as
-specified by the <CODE
-CLASS="OPTION"
->--prefix</CODE
-> option used in the
-PostgreSQL configuration.  Make sure you have appropriate permissions
-to write into that area.  Normally you need to do this either as root
-or as the postgres user.  </P
 ></DIV
 ></DIV
 ><DIV
@@ -294,7 +155,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -303,7 +164,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="concepts.html"
+HREF="x225.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -313,7 +174,7 @@
 WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
->Requirements</TD
+>System Requirements</TD
 ><TD
 WIDTH="34%"
 ALIGN="center"
@@ -327,7 +188,7 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Slony-I Concepts</TD
+>Short Version</TD
 ></TR
 ></TABLE
 ></DIV
Index: failover.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/failover.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/failover.sgml -Ldoc/adminguide/failover.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/failover.sgml
+++ doc/adminguide/failover.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="failover">
 <title>Doing switchover and failover with Slony-I</title>
Index: installation.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/installation.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/installation.sgml -Ldoc/adminguide/installation.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/installation.sgml
+++ doc/adminguide/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article id="installation">
 <title>Slony-I Installation</title>
 <sect1>
Index: monitoring.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/monitoring.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/monitoring.sgml -Ldoc/adminguide/monitoring.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/monitoring.sgml
+++ doc/adminguide/monitoring.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="monitoring">
 <title>Monitoring</title>
Index: slonik.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slonik.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/slonik.sgml -Ldoc/adminguide/slonik.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/slonik.sgml
+++ doc/adminguide/slonik.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <refentry id="app-slonik">
 <refmeta>
     <refentrytitle id="app-slonik-title"><application>slonik</application></refentrytitle>
Index: dropthings.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/dropthings.sgml,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/adminguide/dropthings.sgml -Ldoc/adminguide/dropthings.sgml -u -w -r1.6 -r1.7
--- doc/adminguide/dropthings.sgml
+++ doc/adminguide/dropthings.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 <article>
 <sect1 id="dropthings"> <title>Dropping things from Slony Replication</title>
 
Index: definingsets.html
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/definingsets.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldoc/adminguide/definingsets.html -Ldoc/adminguide/definingsets.html -u -w -r1.1 -r1.2
--- doc/adminguide/definingsets.html
+++ doc/adminguide/definingsets.html
@@ -1,36 +1,34 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <HTML
 ><HEAD
 ><TITLE
->Defining Slony-I Replication
-Sets</TITLE
+>Defining Slony-I Replication Sets</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
 REV="MADE"
-HREF="mailto:cbbrowne at gmail.com"><LINK
+HREF="mailto:slony1-general at gborg.postgresql.org"><LINK
 REL="HOME"
-TITLE="Slony-I 1.1 Administration"
-HREF="slony.html"><LINK
+TITLE="Slony-I HEAD_20041221 Documentation"
+HREF="index.html"><LINK
 REL="UP"
-HREF="slonyintro.html"><LINK
+TITLE="Slony-I Installation"
+HREF="installation.html"><LINK
 REL="PREVIOUS"
 TITLE="Defining Slony-I Clusters"
 HREF="cluster.html"><LINK
 REL="NEXT"
-TITLE="Slony-I Commands"
-HREF="slony-commands.html"><LINK
+TITLE="Core Slony-I Programs"
+HREF="commandreferencec.html"><LINK
 REL="STYLESHEET"
 TYPE="text/css"
-HREF="stdstyle.css"><META
-HTTP-EQUIV="Content-Type"></HEAD
+HREF="stylesheet.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"><META
+NAME="creation"
+CONTENT="2004-12-22T22:53:46"></HEAD
 ><BODY
 CLASS="SECT1"
-BGCOLOR="#FFFFFF"
-TEXT="#000000"
-LINK="#0000FF"
-VLINK="#840084"
-ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -41,31 +39,51 @@
 CELLSPACING="0"
 ><TR
 ><TH
-COLSPAN="3"
+COLSPAN="5"
 ALIGN="center"
->Slony-I 1.1 Administration</TH
+VALIGN="bottom"
+><SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> HEAD_20041221 Documentation</TH
 ></TR
 ><TR
 ><TD
 WIDTH="10%"
 ALIGN="left"
-VALIGN="bottom"
+VALIGN="top"
 ><A
 HREF="cluster.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
 ><TD
-WIDTH="80%"
+WIDTH="10%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Fast Backward</A
+></TD
+><TD
+WIDTH="60%"
 ALIGN="center"
 VALIGN="bottom"
+>Slony-I Installation</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="installation.html"
+>Fast Forward</A
 ></TD
 ><TD
 WIDTH="10%"
 ALIGN="right"
-VALIGN="bottom"
+VALIGN="top"
 ><A
-HREF="slony-commands.html"
+HREF="commandreferencec.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -80,8 +98,7 @@
 CLASS="SECT1"
 ><A
 NAME="DEFININGSETS"
->6. Defining Slony-I Replication
-Sets</A
+>9. Defining Slony-I Replication Sets</A
 ></H1
 ><P
 >Defining the nodes indicated the shape of the cluster of
@@ -90,10 +107,10 @@
 as <SPAN
 CLASS="QUOTE"
 >"sets."</SPAN
->&#13;</P
+></P
+><P
+>A replication set consists of the following:</P
 ><P
->A replication set consists of the following:
-<P
 ></P
 ><UL
 ><LI
@@ -110,14 +127,13 @@
 > Sequences that are to be replicated</P
 ></LI
 ></UL
->&#13;</P
 ><DIV
 CLASS="SECT2"
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN297"
->6.1. Primary Keys</A
+NAME="AEN339"
+>9.1. Primary Keys</A
 ></H2
 ><P
 ><SPAN
@@ -136,23 +152,25 @@
 <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
-> to use a primary key:
-
-<P
+> to use a primary key:</P
+><P
 ></P
 ><UL
 ><LI
 ><P
-> If the table has a formally identified primary key,
-<TT
+> If the table has a formally identified primary key, <TT
 CLASS="COMMAND"
->SET ADD TABLE</TT
-> can be used without any need to
-reference the primary key.  <SPAN
+><A
+HREF="stmtsetaddtable.html"
+>SET ADD
+TABLE</A
+></TT
+> can be used without any need to reference the
+primary key.  <SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
-> will pick up that
-there is a primary key, and use it.&#13;</P
+> will pick up that there is a
+primary key, and use it.</P
 ></LI
 ><LI
 ><P
@@ -165,24 +183,13 @@
 ></SPAN
 > primary key, that is, some index on a
 combination of fields that is UNIQUE and NOT NULL, then you can
-specify the key, as in
-
-<TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="90%"
-><TR
-><TD
+specify the key, as in</P
 ><PRE
 CLASS="PROGRAMLISTING"
 >    SET ADD TABLE (set id = 1, origin = 1, id = 42, 
                    full qualified name = 'public.this_table', 
                    key = 'this_by_that', 
          comment='this_table has this_by_that as a candidate primary key');</PRE
-></TD
-></TR
-></TABLE
->&#13;</P
 ><P
 > Notice that while you need to specify the namespace for the
 table, you must <SPAN
@@ -192,7 +199,7 @@
 >not</I
 ></SPAN
 > specify the namespace for the
-key, as it infers the namespace from the table.&#13;</P
+key, as it infers the namespace from the table.</P
 ></LI
 ><LI
 ><P
@@ -203,27 +210,31 @@
 > to provide one.  This is done by
 first using <TT
 CLASS="COMMAND"
->TABLE ADD KEY</TT
-> to add a column populated
-using a <SPAN
+><A
+HREF="stmttableaddkey.html"
+> TABLE ADD KEY</A
+> </TT
+> to add a column populated using a
+<SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
-> sequence, and then having the
-<TT
+> sequence, and then having the <TT
 CLASS="COMMAND"
->SET ADD TABLE</TT
-> include the directive
-<CODE
+> <A
+HREF="stmtsetaddtable.html"
+> SET ADD TABLE</A
+></TT
+> include the
+directive <TT
 CLASS="OPTION"
->key=serial</CODE
->, to indicate that <SPAN
+>key=serial</TT
+>, to indicate that
+<SPAN
 CLASS="PRODUCTNAME"
 >Slony-I</SPAN
->'s
-own column should be used.</P
+>'s own column should be used.</P
 ></LI
 ></UL
->&#13;</P
 ><P
 > It is not terribly important whether you pick a
 <SPAN
@@ -252,8 +263,8 @@
 ><H2
 CLASS="SECT2"
 ><A
-NAME="AEN327"
->6.2. Grouping tables into sets</A
+NAME="AEN372"
+>9.2. Grouping tables into sets</A
 ></H2
 ><P
 > It will be vital to group tables together into a single set if
@@ -316,7 +327,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slony.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -325,7 +336,7 @@
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="slony-commands.html"
+HREF="commandreferencec.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -341,7 +352,7 @@
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="slonyintro.html"
+HREF="installation.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
@@ -349,7 +360,10 @@
 WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
->Slony-I Commands</TD
+>Core <SPAN
+CLASS="PRODUCTNAME"
+>Slony-I</SPAN
+> Programs</TD
 ></TR
 ></TABLE
 ></DIV
Index: slony.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slony.sgml,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ldoc/adminguide/slony.sgml -Ldoc/adminguide/slony.sgml -u -w -r1.7 -r1.8
--- doc/adminguide/slony.sgml
+++ doc/adminguide/slony.sgml
@@ -1,4 +1,4 @@
-<!-- $Id -->
+<!-- $Id$ -->
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
   <!entity % version SYSTEM "version.sgml">
@@ -65,9 +65,7 @@
 
   <part id="developer">
     <title>Slony-I Internals</title>
-    <article id="schemadoc">  
       &schemadoc;
-    </article>
   </part>
 &bookindex;
 


More information about the Slony1-commit mailing list