diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index faa79189ab..4c45cb01af 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1634,6 +1634,7 @@ the time zone becomes GMT (on most systems anyway).
        which has an offset of +10:00 hours from UTC.
       </para>
      </note>
+</para>
 
     <para>
      Australian time zones and their naming variants
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index cdeba13dd2..6c946ff066 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -487,6 +487,7 @@ conflicts.
 </ListItem>
 </VarListEntry>
 </VariableList>
+</Para>
 </sect1>
 
 <Sect1>
diff --git a/doc/src/sgml/libpq++.sgml b/doc/src/sgml/libpq++.sgml
index 39c026a41a..a7cd9b288b 100644
--- a/doc/src/sgml/libpq++.sgml
+++ b/doc/src/sgml/libpq++.sgml
@@ -38,10 +38,12 @@
     <filename>src/libpq++/examples</filename>, including the source
     code for the three examples in this chapter.
   </para>
+
   <sect1>
     <title>Control and Initialization</title>
     
     <para>
+    </para>
       
       <sect2>
 	<title>Environment Variables</title>
@@ -189,10 +191,12 @@
 	</Para>
       </sect2>
   </sect1>
+
   <sect1>
     <title>Database Connection Functions</title>
     
     <para>
+    </para>
       
       <sect2>
 	<title>Database Environment Class: <classname>PGenv</classname></title>
@@ -271,6 +275,7 @@
 	</para>
       </sect2>
   </sect1>
+
   <sect1>
     <title>Query Execution Functions</title>
     
@@ -443,6 +448,7 @@
       </itemizedlist>
     </para>
   </sect1>
+
   <sect1>
     <title>Asynchronous Notification</title>
     
@@ -507,6 +513,7 @@
       notification.
     </para>
   </sect1>
+
   <sect1>
     <title>Functions Associated with the COPY Command</title>
     
@@ -613,6 +620,7 @@
       </programlisting>
     </para>
   </sect1>
+
   <sect1>
     <title>Caveats</title>
     
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 5ffbfa5957..21c783773b 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,11 +1,15 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.19 1999/03/30 15:23:03 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/postgres.sgml,v 1.20 1999/04/06 15:41:13 thomas Exp $
 
 Postgres integrated documentation.
 Other subset docs should be copied and shrunk from here.
 thomas 1998-02-23
 
 $Log: postgres.sgml,v $
+Revision 1.20  1999/04/06 15:41:13  thomas
+Fix markup to include all closing tags.
+Required by newest versions of DocBook and style sheets.
+
 Revision 1.19  1999/03/30 15:23:03  thomas
 Include libpq+.sgml in the doc set.
 Had been omitted from the integrated doc for no good reason.
@@ -351,7 +355,7 @@ Omit index until we have some index entries.
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-omittag:t
+sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
 sgml-always-quote-attributes:t
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 96f2f58f39..148b0b63b7 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -1482,6 +1482,7 @@ disallow this.
     <synopsis>
      [ CONSTRAINT name ] NULL 
     </synopsis>
+</para>
    </REFSECT3>
    
    <REFSECT3 ID="R3-SQL-NOTNULL-4">
@@ -1850,7 +1851,7 @@ but with perhaps a more obvious syntax.
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
-sgml-omittag:t
+sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
 sgml-always-quote-attributes:t
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index a3dc22fa28..d4c8356355 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -213,8 +213,8 @@ SELECT [ALL|DISTINCT [ON <replaceable class="PARAMETER">column</replaceable>] ]
    selection.
    <command>DISTINCT ON <replaceable class="PARAMETER">column</replaceable></command> will eliminate all duplicates in the specified column; this is
 equivalent to using <command>GROUP BY <replaceable class="PARAMETER">column</replaceable></command>.  <command>ALL</command> will return all candidate rows,
-including duplicates.
-   
+including duplicates.</para>
+
   <para>
    The GROUP BY clause allows a user to divide a table
    conceptually into groups. (See GROUP BY clause).</para>
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index 3cf05a8b52..65f46cd24d 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,4 +1,4 @@
-<chapter id="syntax">
+<chapter>
 <title>SQL Syntax</title>
 
 <sect1>
@@ -13,6 +13,7 @@ restricted to appear in only certain contexts. Other key words are
 <firstterm>not restricted</firstterm>, which indicates that in certain 
 contexts they
 have a specific meaning but are not otherwise constrained.
+</para>
 
 <para>
 <productname>Postgres</productname> implements an extended subset of the
@@ -20,15 +21,17 @@ have a specific meaning but are not otherwise constrained.
 elements are not as restricted in this implementation as is
 called for in the language standards, in part due
 to the extensibility features of <productname>Postgres</productname>. 
+</para>
 
 <para>
 Information on <acronym>SQL92</acronym> and <acronym>SQL3</acronym> key words
-is derived from <xref linkend="DATE97" endterm="DATE97-full">.
+is derived from <xref linkend="DATE97" endterm="DATE97">.
+</para>
 
-<Sect2>
-<Title>Reserved Key Words</Title>
+<sect2>
+<title>Reserved Key Words</title>
 
-<Para>
+<para>
 <acronym>SQL92</acronym> and <acronym>SQL3</acronym> have 
 <firstterm>reserved key words</firstterm> which are not allowed 
 as identifiers and not allowed in any usage other than as fundamental
@@ -37,13 +40,14 @@ tokens in <acronym>SQL</acronym> statements.
 which have similar restrictions. In particular, these key words
 are not allowed as column or table names, though in some cases
 they are allowed to be column labels (i.e. in AS clauses).
+</para>
 
 <tip>
 <para>
 Any string can be specified as an identifier if surrounded by
 double quotes (<quote>like this!</quote>). Some care is required since
 such an identifier will be case sensitive
-and will retain embedded whitespace other special characters.
+and will retain embedded whitespace other special characters.</para>
 </tip>
 
 <para>
@@ -66,7 +70,9 @@ SETOF SHOW
 UNLISTEN UNTIL 
 VACUUM VERBOSE
 </programlisting>
+</para>
 
+<para>
 The following are <productname>Postgres</productname>
 reserved words which are also <acronym>SQL92</acronym> 
 or <acronym>SQL3</acronym> reserved words, and which
@@ -113,7 +119,9 @@ UNION UNIQUE UPDATE USER USING
 VALUES VARCHAR VARYING VIEW
 WHERE WITH WORK 
 </programlisting>
+</para>
 
+<para>
 The following are <acronym>SQL92</acronym> reserved key words which
 are not <productname>Postgres</productname> reserved key words, but which
 if used as function names are always translated into the function
@@ -122,7 +130,9 @@ if used as function names are always translated into the function
 <programlisting>
 CHAR_LENGTH CHARACTER_LENGTH
 </programlisting>
+</para>
 
+<para>
 The following are <acronym>SQL92</acronym> or <acronym>SQL3</acronym> 
 reserved key words which
 are not <productname>Postgres</productname> reserved key words, but
@@ -131,6 +141,7 @@ if used as type names are always translated into an alternate, native type:
 <programlisting>
 BOOLEAN DOUBLE FLOAT INT INTEGER INTERVAL REAL SMALLINT
 </programlisting>
+</para>
 
 <para>
 The following are either <acronym>SQL92</acronym>
@@ -146,6 +157,7 @@ Some of these key words represent functions in <acronym>SQL92</acronym>.
 These functions are defined in <productname>Postgres</productname>,
 but the parser does not consider the names to be key words and they are allowed
 in other contexts.
+</para>
 </note>
 
 <programlisting>
@@ -170,11 +182,13 @@ UNKNOWN UPPER USAGE
 VALUE 
 WHENEVER WRITE
 </programlisting>
+</para>
+</sect2>
 
-<Sect2>
-<Title>Non-reserved Keywords</Title>
+<sect2>
+<title>Non-reserved Keywords</title>
 
-<Para>
+<para>
 <acronym>SQL92</acronym> and <acronym>SQL3</acronym> have 
 <firstterm>non-reserved keywords</firstterm> which have
 a proscribed meaning in the language but which are also allowed
@@ -183,6 +197,7 @@ as identifiers.
 which allow similar unrestricted usage.
 In particular, these keywords
 are allowed as column or table names.
+</para>
 
 <para>
 The following are <productname>Postgres</productname>
@@ -208,6 +223,7 @@ SEQUENCE SERIAL START STATEMENT STDIN STDOUT
 TRUSTED 
 VALID VERSION
 </programlisting>
+</para>
 
 <para>
 The following are <productname>Postgres</productname>
@@ -231,6 +247,7 @@ TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TRIGGER
 YEAR
 ZONE
 </programlisting>
+</para>
 
 <para>
 The following are <productname>Postgres</productname>
@@ -240,6 +257,7 @@ or <acronym>SQL3</acronym> non-reserved key words:
 <programlisting>
 TYPE
 </programlisting>
+</para>
 
 <para>
 The following are either <acronym>SQL92</acronym>
@@ -268,3 +286,24 @@ SUBCLASS_ORIGIN
 TABLE_NAME
 UNCOMMITTED UNNAMED
 </programlisting>
+</para>
+</sect2>
+</sect1>
+</chapter>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:nil
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:"./reference.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
+sgml-local-ecat-files:nil
+End:
+-->