CVS User Account cvsuser
Wed Jun 29 21:55:45 PDT 2005
Log Message:
-----------
Further formatting changes.  These are all about splitting long
quoted material into 2 lines so that literal material doesn't get too long and head off the page...

Modified Files:
--------------
    slony1-engine/doc/adminguide:
        adminscripts.sgml (r1.25 -> r1.26)
        ddlchanges.sgml (r1.16 -> r1.17)
        prerequisites.sgml (r1.19 -> r1.20)
        slonik_ref.sgml (r1.28 -> r1.29)
        usingslonik.sgml (r1.12 -> r1.13)

-------------- next part --------------
Index: adminscripts.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/adminscripts.sgml,v
retrieving revision 1.25
retrieving revision 1.26
diff -Ldoc/adminguide/adminscripts.sgml -Ldoc/adminguide/adminscripts.sgml -u -w -r1.25 -r1.26
--- doc/adminguide/adminscripts.sgml
+++ doc/adminguide/adminscripts.sgml
@@ -55,7 +55,9 @@
 		password => undef,	# password for user
 		parent => 1,		# which node is parent to this node
 		noforward => undef	# shall this node be set up to forward results?
-                sslmode => undef        # SSL mode argument - determine priority of SSL usage = disable,allow,prefer,require
+                sslmode => undef        # SSL mode argument - determine 
+                                        # priority of SSL usage
+                                        # = disable,allow,prefer,require
 );
 </programlisting>
 </sect2>
Index: slonik_ref.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/slonik_ref.sgml,v
retrieving revision 1.28
retrieving revision 1.29
diff -Ldoc/adminguide/slonik_ref.sgml -Ldoc/adminguide/slonik_ref.sgml -u -w -r1.28 -r1.29
--- doc/adminguide/slonik_ref.sgml
+++ doc/adminguide/slonik_ref.sgml
@@ -177,8 +177,10 @@
 
 create set ( @sakaiMovies, comment = 'movies' );
 
-set add table( set @sakaiMovies, id = 1, @fqn = 'public.customers', comment = 'sakai customers' );
-set add table( set @sakaiMovies, id = 2, @fqn = 'public.tapes',     comment = 'sakai tapes' );
+set add table( set @sakaiMovies, id = 1, @fqn = 'public.customers', 
+               comment = 'sakai customers' );
+set add table( set @sakaiMovies, id = 2, @fqn = 'public.tapes',     
+               comment = 'sakai tapes' );
 echo 'But @sakaiMovies will display as a string, and is not expanded';
     </programlisting>
    </refsect1>
Index: ddlchanges.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/ddlchanges.sgml,v
retrieving revision 1.16
retrieving revision 1.17
diff -Ldoc/adminguide/ddlchanges.sgml -Ldoc/adminguide/ddlchanges.sgml -u -w -r1.16 -r1.17
--- doc/adminguide/ddlchanges.sgml
+++ doc/adminguide/ddlchanges.sgml
@@ -80,7 +80,8 @@
 <screen>
 BEGIN;
 LOCK TABLE table_name;
-SELECT _oxrsorg.altertablerestore(tab_id);--tab_id is _slony_schema.sl_table.tab_id
+SELECT _oxrsorg.altertablerestore(tab_id);
+--tab_id is _slony_schema.sl_table.tab_id
 </screen></para>
 
 <para> After the script executes, each table is
@@ -88,7 +89,8 @@
 updates at the origin or that denies updates on subscribers:
 
 <screen>
-SELECT _oxrsorg.altertableforreplication(tab_id);--tab_id is _slony_schema.sl_table.tab_id
+SELECT _oxrsorg.altertableforreplication(tab_id);
+--tab_id is _slony_schema.sl_table.tab_id
 COMMIT;
 </screen></para>
 
Index: prerequisites.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/prerequisites.sgml,v
retrieving revision 1.19
retrieving revision 1.20
diff -Ldoc/adminguide/prerequisites.sgml -Ldoc/adminguide/prerequisites.sgml -u -w -r1.19 -r1.20
--- doc/adminguide/prerequisites.sgml
+++ doc/adminguide/prerequisites.sgml
@@ -6,14 +6,14 @@
 
 <para>The platforms that have received specific testing at the time of
 this release are FreeBSD-4X-i368, FreeBSD-5X-i386, FreeBSD-5X-alpha,
-osX-10.3, Linux-2.4X-i386 Linux-2.6X-i386 Linux-2.6X-amd64,
+OS-X-10.3, Linux-2.4X-i386 Linux-2.6X-i386 Linux-2.6X-amd64,
 <trademark>Solaris</trademark>-2.8-SPARC,
 <trademark>Solaris</trademark>-2.9-SPARC, AIX 5.1 and
 OpenBSD-3.5-sparc64.</para>
 
 <para>There have been reports of success at running &slony1; hosts
 that are running PostgreSQL on Microsoft
-<trademark>Windows</trademark>.  At this time, the
+<trademark>Windows</trademark>.  As of version 1.1.0, the
 <quote>binary</quote> applications (<emphasis>e.g.</emphasis> - <xref
 linkend="slonik">, <xref linkend="slon">) do not run on
 <trademark>Windows</trademark>, but a <xref linkend="slon"> running on
@@ -28,8 +28,9 @@
 linkend="slon">, as it uses that to have multiple threads of
 execution.  There are reports of there being a
 <filename>pthreads</filename> library for
-<trademark>Windows</trademark>, so nothing should prevent some
-interested party from volunteering to do the port.</para>
+<trademark>Windows</trademark>, and it is anticipated that
+<trademark>Windows</trademark> support will be introduced in some
+future release.</para>
 
 <sect2>
 <title> &slony1; Software Dependancies</title>
Index: usingslonik.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/usingslonik.sgml,v
retrieving revision 1.12
retrieving revision 1.13
diff -Ldoc/adminguide/usingslonik.sgml -Ldoc/adminguide/usingslonik.sgml -u -w -r1.12 -r1.13
--- doc/adminguide/usingslonik.sgml
+++ doc/adminguide/usingslonik.sgml
@@ -99,14 +99,16 @@
 	node 2 admin conninfo = 'dbname=$DB2';
 
 	try {
-		table add key (node id = 1, fully qualified name = 'public.history');
+		table add key (node id = 1, fully qualified name = 
+                               'public.history');
 	}
 	on error {
 		exit 1;
 	}
 
 	try {
-		create set (id = 1, origin = 1, comment = 'Set 1 - pgbench tables');
+		create set (id = 1, origin = 1, comment = 
+                            'Set 1 - pgbench tables');
 		set add table (set id = 1, origin = 1,
 			id = 1, fully qualified name = 'public.accounts',
 			comment = 'Table accounts');
@@ -158,12 +160,14 @@
 slonik <<_EOF_
 $PREAMBLE
 try {
-    table add key (node id = $origin, fully qualified name = 'public.history');
+    table add key (node id = $origin, fully qualified name = 
+                   'public.history');
 } on error {
     exit 1;
 }
 try {
-	create set (id = $mainset, origin = $origin, comment = 'Set $mainset - pgbench tables');
+	create set (id = $mainset, origin = $origin, 
+                    comment = 'Set $mainset - pgbench tables');
 	set add table (set id = $mainset, origin = $origin,
 		id = 1, fully qualified name = 'public.accounts',
 		comment = 'Table accounts');
@@ -205,12 +209,14 @@
 slonik <<_EOF_
 $PREAMBLE
 try {
-    table add key (node id = $origin, fully qualified name = 'public.history');
+    table add key (node id = $origin, fully qualified name = 
+                   'public.history');
 } on error {
     exit 1;
 }
 try {
-	create set (id = $mainset, origin = $origin, comment = 'Set $mainset - pgbench tables');
+	create set (id = $mainset, origin = $origin, 
+                    comment = 'Set $mainset - pgbench tables');
 $ADDTABLES
 } on error {
 	exit 1;


More information about the Slony1-commit mailing list