Fixing up various tagging issues causing errors in the documentation build

(cherry picked from commit 4235c5373f2831e0646ce1b8aafc5f468b51330e)

diff --git a/doc/adminguide/filelist.sgml b/doc/adminguide/filelist.sgml
index 4b4afc0a131766fd5c66867d6e8db0b1d7d8094d..101c5327a531858909c686980d9aad64ada5fd98 100644 (file)
--- a/doc/adminguide/filelist.sgml
+++ b/doc/adminguide/filelist.sgml
@@ -23,7 +23,6 @@
 <!entity help               SYSTEM "help.sgml">
 <!entity faq                SYSTEM "faq.sgml">
 <!entity reference          SYSTEM "reference.sgml">
-<!entity slonik             SYSTEM "slonik.sgml">
 <!entity usingslonik        SYSTEM "usingslonik.sgml">
 <!entity versionupgrade     SYSTEM "versionupgrade.sgml">
 <!entity slonikref          SYSTEM "slonik_ref.sgml">

diff --git a/doc/adminguide/slon.sgml b/doc/adminguide/slon.sgml
index a06ed0e336be566e59dcc5e0809a4451e353de6f..44fb2bddeafe64fb84655f9774c2b7015357c52a 100644 (file)
--- a/doc/adminguide/slon.sgml
+++ b/doc/adminguide/slon.sgml
@@ -424,7 +424,6 @@
   </para>
  </refsect1>
 </refentry>
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

diff --git a/doc/adminguide/slonconf.sgml b/doc/adminguide/slonconf.sgml
index 5b34cef9328b265720ab63e1b1a0286cca365f1d..af357cbdb5cb14a8d6b353ed14a501622ae4a030 100644 (file)
--- a/doc/adminguide/slonconf.sgml
+++ b/doc/adminguide/slonconf.sgml
@@ -1,6 +1,6 @@
 <article id="runtime-config">
   <title>Run-time Configuration</title>
-  <indexterm>
+<indexterm>
     <primary>configuration</primary>
     <secondary>of the slon daemon</secondary>
   </indexterm>
@@ -36,6 +36,7 @@
   </para>
 
 
+
 <sect1 id="slon-config-logging">
   <title>Logging</title>
 <indexterm><primary>slon configuration: logging</primary></indexterm>
@@ -542,7 +543,10 @@
     </varlistentry>
   </variablelist>
 </sect1>
-</article>
+
+</article  
+
+
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml

diff --git a/doc/adminguide/slonik.sgml b/doc/adminguide/slonik.sgml
index 9d4848116445d5342a2045b202509fb954aeb2a4..ed0ddcb566dbc87cd2404ab437b4396992a300a2 100644 (file)
--- a/doc/adminguide/slonik.sgml
+++ b/doc/adminguide/slonik.sgml
@@ -1,4 +1,5 @@
 <!--  -->
+
 <refentry id="slonik">
 <refmeta>
     <refentrytitle id="app-slonik-title"><application>slonik</application></refentrytitle>

diff --git a/doc/adminguide/slonik_ref.sgml b/doc/adminguide/slonik_ref.sgml
index 6c57ce3ca5cb26ed42932d8d8a5137a5f72719ab..60814ea8151497a0c5d93257e45834dec7465078 100644 (file)
--- a/doc/adminguide/slonik_ref.sgml
+++ b/doc/adminguide/slonik_ref.sgml
@@ -1,6 +1,6 @@
-<article> id="slonikref">
+   <article id="slonikref">
+<sect1>
 <title>Slonik Command Summary</title>
-   <sect1><title>Introduction</title>
     
     <para>
      <application>Slonik</application> is a command line utility designed
@@ -100,7 +100,9 @@
      each will be run individually, in separate transactions, on other
      nodes in the cluster. </para>
 
-<!-- ************************************************************ --></sect3></sect2></sect1></article>
+<!-- ************************************************************ --></sect3></sect2>
+</sect1>
+</article>
 
  <reference id="metacmds">
   <title>Slonik Meta Commands</title>
@@ -213,7 +215,6 @@ echo 'But @sakaiMovies will display as a string, and is not expanded';
   </refentry>
 
  </reference>  
-  
 <!-- **************************************** -->
 
  <reference id="hdrcmds"> 

diff --git a/doc/adminguide/slony.sgml b/doc/adminguide/slony.sgml
index 085ce1e2de205cd2e3c0a88e9ff187c3c7db7684..f8cd21b96854f40696071e8ffd2971809f23c68f 100644 (file)
--- a/doc/adminguide/slony.sgml
+++ b/doc/adminguide/slony.sgml
@@ -108,25 +108,31 @@
     &security;
 </chapter>
 
-<chapter id="reference">
-  <title>Reference</title>
-       &slon;
-        &slonconf;
-       &slonik;
-        &slonikref;
-</chapter>
 
- 
+
 
 <chapter id="appendix">
 <title>Appendix</title>
-&faq;
-&supportedplatforms;
-&releasechecklist;
-&help;
+    &faq;
+    &supportedplatforms;
+    &releasechecklist;
+    &help;
 </chapter>
+
+
+<part id="reference">
+<title>Reference</title>
+   &slon; 
+   &slonconf;
+   &slonik;
+   &slonikref;
+</part>
+ 
+
+
+
 &schemadoc;
-&bookindex
+&bookindex;
 
 
 </book>

diff --git a/doc/adminguide/slonyupgrade.sgml b/doc/adminguide/slonyupgrade.sgml
index 44f646ae7c54133520687c20d9fd68c08274871c..2c212937487839ca98b630c84cf788646cf81753 100644 (file)
--- a/doc/adminguide/slonyupgrade.sgml
+++ b/doc/adminguide/slonyupgrade.sgml
@@ -48,8 +48,8 @@ nothing prevents one from carefully copying &slony1; components for
 the new version into place to overwrite the old version as
 the <quote>install</quote> step.  That might <emphasis>not</emphasis>
 work on <trademark>Windows</trademark> if it locks library files that
-are in use.</para> It is also important to make sure that any connections
-to the database are restarted after the new binary is installed.
+are in use. It is also important to make sure that any connections 
+to the database are restarted after the new binary is installed. </para>
 
 <variablelist>