Fixing documentation build errors

diff --git a/doc/adminguide/ddlchanges.sgml b/doc/adminguide/ddlchanges.sgml
index af6fa3bc55a2088d26aa7ad55efbcfd76913c9d9..549e576cf4f3e47da68cedfbf8d0abe657005e4f 100644 (file)
--- a/doc/adminguide/ddlchanges.sgml
+++ b/doc/adminguide/ddlchanges.sgml
@@ -123,7 +123,7 @@ be relaxed first.</para>
 <listitem><para>DDL changes that rename a replicated table do not
 inform &slony1; of the new table name.  If you change then name of
 a replicated table you must allow &slony1; to find the new table name
-by calling <xref linkend="function.updaterelname-p-only-on-node-integer-p-set-id-integer">
+by calling <xref linkend="function.updaterelname">
 </para>
 </listitem>
 

diff --git a/doc/adminguide/faq.sgml b/doc/adminguide/faq.sgml
index 2010a446ba4123bfd88e2192bbf6a61560ba7b73..48330ec769f492479b137a888b946a02db0795e8 100644 (file)
--- a/doc/adminguide/faq.sgml
+++ b/doc/adminguide/faq.sgml
@@ -320,7 +320,7 @@ sees no activity. </listitem>
 <listitem><para> <link linkend="startslon">start_slon.sh</link>,
 written with a view to managing the &lslon; configuration via the
 <link linkend="runtime-config"> slon runtime configuraiton
-</file>.</para></listitem>
+</link>.</para></listitem>
 
 <listitem><para> <link linkend=
 "launchclusters">launch_clusters.sh</link>, which can start up

diff --git a/doc/adminguide/slonik_ref.sgml b/doc/adminguide/slonik_ref.sgml
index 5b10e77d8fb1604115f21ced4c8d1f7e940f40c0..b8322c00f913681642c1bd388c1b1f95bfcab436 100644 (file)
--- a/doc/adminguide/slonik_ref.sgml
+++ b/doc/adminguide/slonik_ref.sgml
@@ -2353,8 +2353,7 @@ SUBSCRIBE SET (
        
       </varlistentry>
      </variablelist>
-    </para>
-    <para> This uses &fununsubscribeset;. </para>
+    </para>  
    </refsect1>
    <refsect1><title>Example</title>
     <programlisting>

diff --git a/doc/adminguide/slony.sgml b/doc/adminguide/slony.sgml
index c41343bad9f9b2f47b1f9aa348fe3b5306d43e05..b57bc0ccf060805cd77b7940069b2028d9dcea66 100644 (file)
--- a/doc/adminguide/slony.sgml
+++ b/doc/adminguide/slony.sgml
@@ -24,7 +24,7 @@
   <!ENTITY funsetaddsequence "<xref linkend= function.setaddsequence-p-seq-comment-integer-p-fqname-integer-p-seq-id-text-p-set-id-text>">
   <!ENTITY funsetdropsequence "<xref linkend= function.setdropsequence-p-seq-id-integer>">
   <!ENTITY funsetmovetable "<xref linkend= function.setmovetable-p-new-set-id-integer-p-tab-id-integer>">
-<!ENTITY funddlscript "<xref linkend=function.ddlscript-complete-p-only-on-node-integer-p-script-text-p-set-id-integer>">
+<!ENTITY funddlscript "<xref linkend=function.ddlscript-complete-p-nodes-text>">
 <!ENTITY fundropnode "<xref linkend=function.dropnode-p-no-id-integer>">
 <!ENTITY funenablenode "<xref linkend=function.enablenode-p-no-id-integer>">
 <!ENTITY funfailednode "<xref linkend=function.failednode-p-backup-node-integer-p-failed-node-integer>">
@@ -33,10 +33,10 @@
 <!ENTITY funmoveset "<xref linkend=function.moveset-p-new-origin-integer-p-set-id-integer>">
 <!ENTITY funsetmovesequence "<xref linkend=function.setmovesequence-p-new-set-id-integer-p-seq-id-integer>">
 <!ENTITY funstoretrigger "<xref linkend=function.storetrigger-integer-name>">
-<!ENTITY funsubscribeset "<xref linkend=function.subscribeset-p-omit-copy-integer-p-sub-forward-integer-p-sub-receiver-integer-p-sub-provider-boolean-p-sub-set-boolean>">
+<!ENTITY fsubscribeset "<xref linkend=function.subscribeset-p-omit-copy-integer-p-sub-forward-integer-p-sub-receiver-integer-p-sub-provider-boolean-p-sub-set-boolean>">
 <!ENTITY fununinstallnode "<xref linkend=function.uninstallnode>">
 <!ENTITY fununlockset "<xref linkend=function.unlockset-p-set-id-integer>">
-<!ENTITY fununsubscribeset "<xref linkend=function.unsubscribeset-p-sub-receiver-integer-p-sub-set-integer>">
+<!ENTITY fununsubscribeset "<xref linkend=function.unsubscribeset-p-sub-set-integer-p-sub-receiver-integer-p-force-boolean>">
 <!ENTITY bestpracticelink "<link linkend=bestpractices>Best Practice</link>">
 <!ENTITY rmissingoids "<link linkend=missingoids>error messages indicating missing OIDs</link>">
 <!ENTITY slnode "<xref linkend=table.sl-node>">

diff --git a/src/backend/slony1_funcs.sql b/src/backend/slony1_funcs.sql
index c5ab3ca642e8a770270a6a631d85e48dce081502..73064ee7b8fcfb74faa9855322356af2ccdb5f4f 100644 (file)
--- a/src/backend/slony1_funcs.sql
+++ b/src/backend/slony1_funcs.sql
@@ -4184,8 +4184,8 @@ begin
                        p_sub_set::text, p_sub_receiver::text);
 end;
 $$ language plpgsql;
-comment on function @NAMESPACE@.unsubscribeSet (p_sub_set int4, p_sub_receiver int4,boolean) is
-'unsubscribeSet (sub_set, sub_receiver) 
+comment on function @NAMESPACE@.unsubscribeSet (p_sub_set int4, p_sub_receiver int4,force boolean) is
+'unsubscribeSet (sub_set, sub_receiver,force) 
 
 Unsubscribe node sub_receiver from subscription set sub_set.  This is
 invoked on the receiver node.  It verifies that this does not break