Fix markup to allow doc building.

doc/src/sgml/inherit.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/inherit.sgml,v 1.7 2000/05/02 20:01:51 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/inherit.sgml,v 1.7.2.1 2000/06/14 13:18:59 thomas Exp $
 -->
 
  <chapter id="inherit">
@@ -40,6 +40,7 @@ CREATE TABLE capitals (
      The inheritance hierarchy is a actually a directed acyclic graph.
     </para>
    </note>
+  </para>
 
    For example, the  following  query  finds
    all  the cities that are situated at an attitude of 500ft or higher:
@@ -87,6 +88,7 @@ SELECT c.name, c.altitude
    <command>ALTER TABLE</command>.
   </para>
  </chapter>
+  <para>
 
 <!-- Keep this comment at the end of the file
 Local variables:

doc/src/sgml/query.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.11 2000/04/11 05:39:06 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.11.2.1 2000/06/14 13:18:59 thomas Exp $
 -->
 
  <chapter id="query">
@@ -154,7 +154,7 @@ INSERT INTO weather
    </para>
 
    <para>
-    You can also use the <command>COPY</command> command to perform load large
+    You can also use <command>COPY</command> to load large
     amounts of data from flat (<acronym>ASCII</acronym>) files.
     This is usually faster because the data is read (or written) as a
     single atomic

doc/src/sgml/release.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.49.2.5 2000/06/05 10:59:16 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.49.2.6 2000/06/14 13:18:59 thomas Exp $
 -->
 
  <chapter id="release">
@@ -20,10 +20,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.49.2.5 2000/06/05 10:59:16
    -->
 
    <para>
-2000-06-05
+    Release date 2000-06-05. This is a repackaging of 7.0.1 with added documentation.
-</para>
-<para>
-This is a repackaging of 7.0.1 with added documentation.
    </para>
 
 
@@ -32,9 +29,10 @@ This is a repackaging of 7.0.1 with added documentation.
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
-7.*.
+     v7.*.
     </para>
    </sect2>
+
    <sect2>
     <title>Changes</title>
 
@@ -62,21 +60,19 @@ Added documentation to tarball.
    -->
 
    <para>
-2000-06-01
+    Release date 2000-06-01.
+    This is a cleanup release for 7.0.
    </para>
-<para>
-This is basically a cleanup release for 7.0.
-</para>
-
 
    <sect2>
     <title>Migration to v7.0.1</title>
 
     <para>
      A dump/restore is <emphasis>not</emphasis> required for those running
-7.0.
+     v7.0.
     </para>
    </sect2>
+
    <sect2>
     <title>Changes</title>
 
@@ -111,7 +107,6 @@ ecpg changes (Michael)
    </sect2>
   </sect1>
 
-
   <sect1>
    <title>Release 7.0</title>
    <!--
@@ -126,9 +121,7 @@ ecpg changes (Michael)
   </docinfo>
    -->
    <para> 
-2000-05-08
+    Released 2000-05-08.
-   </para>
-   <para>
     This release contains improvements in many areas, demonstrating
     the continued growth of <productname>PostgreSQL</productname>.
     There are more improvements and fixes in 7.0 than in any previous
@@ -287,6 +280,8 @@ Ack! This isn't yet in the code?? - thomas 2000-04-30
    </sect2>
 
    <sect2>
+    <title>Changes</title>
+
     <para>
      <programlisting>
 Bug Fixes
@@ -626,9 +621,7 @@ New multibyte encodings
    -->
 
    <para>
-1999-10-13
+    Released 1999-10-13.
-</para>
-<para>
     This is basically a cleanup release for 6.5.2.  We have added a new
     pgaccess that was missing in 6.5.2, and installed an NT-specific fix.
    </para>
@@ -671,9 +664,7 @@ Fix dumping rules on inherited tables
    -->
 
    <para>
-1999-09-15
+    Released 1999-09-15.
-</para>
-<para>
     This is basically a cleanup release for 6.5.1.  We have fixed a variety of
     problems reported by 6.5.1 users.
    </para>
@@ -687,6 +678,7 @@ A dump/restore is <emphasis>not</emphasis> required for those running
      6.5.*.
     </para>
    </sect2>
+
    <sect2>
     <title>Changes</title>
 
@@ -721,7 +713,6 @@ Updated version of pgaccess 0.98
    </sect2>
   </sect1>
 
-
   <sect1>
    <title>Release 6.5.1</title>
    <!--
@@ -737,14 +728,13 @@ Updated version of pgaccess 0.98
    -->
 
    <para>
-1999-07-15
+    Released 1999-07-15.
    </para>
    <para>
     This is basically a cleanup release for 6.5.  We have fixed a variety of
     problems reported by 6.5 users.
    </para>
 
-
    <sect2>
     <title>Migration to v6.5.1</title>
 
@@ -753,6 +743,7 @@ A dump/restore is <emphasis>not</emphasis> required for those running
      6.5.
     </para>
    </sect2>
+
    <sect2>
     <title>Changes</title>
 
@@ -786,7 +777,6 @@ Add Win1250 (Czech) support (Pavel Behal)
    </sect2>
   </sect1>
 
-
   <sect1>
    <title>Release 6.5</title>
    <!--
@@ -802,9 +792,7 @@ Add Win1250 (Czech) support (Pavel Behal)
    -->
 
    <para>
-1999-06-09
+    Released 1999-06-09.
-</para>
-<para>
     This release marks a major step in the development team's mastery of the source
     code we inherited from Berkeley.  You will see we are now easily adding
     major features, thanks to the increasing size and experience of our
@@ -1023,6 +1011,8 @@ Add Win1250 (Czech) support (Pavel Behal)
     </sect2>
 
    <sect2>
+    <title>Changes</title>
+
     <para>
      <programlisting>
 Bug Fixes
@@ -1412,7 +1402,9 @@ is required for those wishing to migrate data from any
 previous release of <productname>Postgres</productname>.
 </para>
 </sect2>
+
    <sect2>
+<title>Changes</title>
 
     <para>
      <programlisting>
@@ -1665,11 +1657,10 @@ refer to the installation and migration instructions for v6.3.
 </para>
 
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>
-Changes
--------
 Configure detection improvements for tcl/tk(Brook Milligan, Alvin)
 Manual page improvements(Bruce)
 BETWEEN and LIKE fix(Thomas)
@@ -1692,6 +1683,7 @@ ASSERT fixes(Bruce)
     </para>
    </sect2>
   </sect1>
+
   <sect1>
    <title>Release 6.3.1</title>
    <!--
@@ -1707,9 +1699,7 @@ ASSERT fixes(Bruce)
    -->
 
    <para>
-1998-03-23
+    Released 1998-03-23.
-</para>
-<para>
     Summary:
 
 <itemizedlist>
@@ -1751,11 +1741,10 @@ refer to the installation and migration instructions for v6.3.
 </para>
 
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>
-Changes
--------
 ecpg cleanup/fixes, now version 1.1(Michael Meskes)
 pg_user cleanup(Bruce)
 large object fix for pg_dump and tclsh (alvin)
@@ -1787,6 +1776,7 @@ Better identify tcl and tk libs and includes(Bruce)
     </para>
    </sect2>
   </sect1>
+
   <sect1>
    <title>Release 6.3</title>
    <!--
@@ -1802,9 +1792,7 @@ Better identify tcl and tk libs and includes(Bruce)
    -->
 
    <para>
-1998-03-01
+    Released 1998-03-01.
-</para>
-<para>
     There are <emphasis>many</emphasis> new features and improvements in this release.
     Here is a brief, incomplete summary:
 
@@ -1843,7 +1831,6 @@ Better password authorization mechanisms. Default table permissions have changed
        has been removed. Performance has been improved.
       </para>
      </listitem>
-
     </itemizedlist>
    </para>
 
@@ -1935,6 +1922,7 @@ previous release of <productname>Postgres</productname>.
    </sect2>
 
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>
@@ -2176,12 +2164,12 @@ from psql to update the existing system table:
 This will need to be done to every existing database, including template1.
 </para>
 </sect2>
+
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>
-Changes
--------
 Allow TIME and TYPE column names(Thomas)
 Allow larger range of true/false as boolean values(Thomas)
 Support output of "now" and "current"(Thomas)
@@ -2244,6 +2232,7 @@ because the COPY output format was improved from the 1.02 release.
 </sect2>
 
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>
@@ -2389,11 +2378,10 @@ Refer to the release notes for v6.1 for more details.
 </sect2>
 
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>
-Changes
--------
 fix for SET with options (Thomas)
 allow pg_dump/pg_dumpall to preserve ownership of all tables/objects(Bruce)
 new psql \connect option allows changing usernames without changing databases
@@ -2493,6 +2481,7 @@ because the COPY output format was improved from the 1.02 release.
 </sect2>
 
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>
@@ -2636,6 +2625,7 @@ because the COPY output format was improved from the 1.02 release.
 </sect2>
 
    <sect2>
+    <title>Changes</title>
 
     <para>
      <programlisting>

doc/src/sgml/sql.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.9 2000/05/02 20:01:52 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.9.2.1 2000/06/14 13:18:59 thomas Exp $
 -->
 
  <chapter id="sql">
@@ -155,16 +155,18 @@ $Header: /cvsroot/pgsql/doc/src/sgml/sql.sgml,v 1.9 2000/05/02 20:01:52 thomas E
     <example>
      <title id="supplier-fig">The Suppliers and Parts Database</title>
      <programlisting>
-   SUPPLIER   SNO |  SNAME  |  CITY      SELLS   SNO | PNO
+SUPPLIER:                   SELLS:
-             -----+---------+--------           -----+-----
+ SNO |  SNAME  |  CITY       SNO | PNO
+----+---------+--------     -----+-----
  1  |  Smith  | London        1  |  1
  2  |  Jones  | Paris         1  |  2
  3  |  Adams  | Vienna        2  |  4
  4  |  Blake  | Rome          3  |  1
                               3  |  3
                               4  |  2
-   PART       PNO |  PNAME  |  PRICE              4  |  3 
+PART:                         4  |  3
-             -----+---------+---------            4  |  4
+ PNO |  PNAME  |  PRICE       4  |  4
+----+---------+---------
  1  |  Screw  |   10
  2  |  Nut    |    8
  3  |  Bolt   |   15
@@ -474,7 +476,7 @@ attributes are taken from. We often write a relation scheme as
 	INTERSECT (&cap;): builds the set-theoretic intersection of two
 	tables. Given the tables <classname>R</classname> and
 	<classname>S</classname>,
-	<classname>R</classname> &cup; <classname>S</classname> is the
+	<classname>R</classname> &cap; <classname>S</classname> is the
 	set of tuples
 	that are in <classname>R</classname> and in
 	<classname>S</classname>.
@@ -532,7 +534,8 @@ attributes are taken from. We often write a relation scheme as
 	 Let the following two tables be given:
 
 	 <programlisting>
-         R   A | B | C      S   C | D | E
+R:                 S:
+ A | B | C          C | D | E
 ---+---+---        ---+---+---
  1 | 2 | 3          3 | a | b
  4 | 5 | 6          6 | c | d
@@ -547,7 +550,8 @@ attributes are taken from. We often write a relation scheme as
 	get:
 
 	<programlisting>
-       R x S   A | B | R.C | S.C | D | E
+R x S:
+ A | B | R.C | S.C | D | E
 ---+---+-----+-----+---+---
  1 | 2 |  3  |  3  | a | b
  1 | 2 |  3  |  6  | c | d
@@ -595,8 +599,9 @@ attributes are taken from. We often write a relation scheme as
 	C and D.
 	Then we define the division as:
 
-R &divide; S = {t &mid; &forall; t<subscript>s</subscript> &isin; S
+	<programlisting>
-	 &exist; t<subscript>r</subscript> &isin; R
+R &divide; S = {t &mid; &forall; t<subscript>s</subscript> &isin; S &exist; t<subscript>r</subscript> &isin; R
+	</programlisting>
 
 	such that
 t<subscript>r</subscript>(A,B)=t&and;t<subscript>r</subscript>(C,D)=t<subscript>s</subscript>}
@@ -614,7 +619,8 @@ t<subscript>r</subscript>(A,B)=t&and;t<subscript>r</subscript>(C,D)=t<subscript>
 	Given the following tables
 
 	<programlisting>
-          R   A | B | C | D        S   C | D
+R:                    S:
+ A | B | C | D         C | D
 ---+---+---+---       ---+---
  a | b | c | d         c | d
  a | b | e | f         e | f
@@ -720,7 +726,10 @@ t<subscript>r</subscript>(A,B)=t&and;t<subscript>r</subscript>(C,D)=t<subscript>
     <para>
      The queries used in <acronym>TRC</acronym> are of the following
      form:
+
+     <programlisting>
 x(A) &mid; F(x)
+     </programlisting>
 
      where <literal>x</literal> is a tuple variable
      <classname>A</classname> is a set of attributes and <literal>F</literal> is a
@@ -734,10 +743,10 @@ t<subscript>r</subscript>(A,B)=t&and;t<subscript>r</subscript>(C,D)=t<subscript>
      using <acronym>TRC</acronym> we formulate the following query:
 
      <programlisting>
-     {x(SNAME) &mid; x &isin; SUPPLIER &and; \nonumber
+{x(SNAME) &mid; x &isin; SUPPLIER &and;
-                       &exist; y &isin; SELLS &exist; z &isin; PART (y(SNO)=x(SNO) &and; \nonumber
+    &exist; y &isin; SELLS &exist; z &isin; PART (y(SNO)=x(SNO) &and;
-                        z(PNO)=y(PNO) &and; \nonumber
+    z(PNO)=y(PNO) &and;
-                        z(PNAME)='Screw')} \nonumber
+    z(PNAME)='Screw')}
      </programlisting>
     </para>
 
@@ -806,7 +815,9 @@ t<subscript>r</subscript>(A,B)=t&and;t<subscript>r</subscript>(C,D)=t<subscript>
        to involve
        arithmetic operations as well as comparisons, e.g.
 
+       <programlisting>
 A &lt; B + 3.
+       </programlisting>
 
        Note
        that + or other arithmetic operators appear neither in relational
@@ -1348,8 +1359,9 @@ gives the result:
  SNO | SNAME |  CITY
 -----+-------+--------
   2  | Jones | Paris
-The only tuple returned by both parts of the query is the one having $SNO=2$.
 	</programlisting>
+
+	The only tuple returned by both parts of the query is the one having $SNO=2$.
        </para>
 
        <para>
@@ -1463,7 +1475,7 @@ The only tuple returned by both parts of the query is the one having $SNO=2$.
 	 <replaceable class="parameter">q</replaceable>
 	 of them right to the decimal point.
 
-(15 &ge; <replaceable class="parameter">p</replaceable> &ge; <replaceable class="parameter">q</replaceable>q &ge; 0).
+(15 &ge; <replaceable class="parameter">p</replaceable> &ge; <replaceable class="parameter">q</replaceable> &ge; 0).
 
 	 If <replaceable class="parameter">q</replaceable>
 	 is omitted it is assumed to be 0.
@@ -1528,8 +1540,7 @@ The only tuple returned by both parts of the query is the one having $SNO=2$.
 	we use the following statement:
 
       <programlisting>
-   CREATE INDEX I
+CREATE INDEX I ON SUPPLIER (SNAME);
-   ON SUPPLIER (SNAME);
       </programlisting>
      </para>
 
@@ -1612,8 +1623,7 @@ The only tuple returned by both parts of the query is the one having $SNO=2$.
       if it were another base table:
 
       <programlisting>
-   SELECT *
+SELECT * FROM London_Suppliers
-   FROM London_Suppliers
     WHERE P.PNAME = 'Screw';
       </programlisting>
 
@@ -1691,8 +1701,7 @@ The only tuple returned by both parts of the query is the one having $SNO=2$.
       <programlisting>
 INSERT INTO <replaceable class="parameter">table_name</replaceable> (<replaceable class="parameter">name_of_attr_1</replaceable> 
     [, <replaceable class="parameter">name_of_attr_2</replaceable> [,...]])
-   VALUES (<replaceable class="parameter">val_attr_1</replaceable> 
+    VALUES (<replaceable class="parameter">val_attr_1</replaceable> [, <replaceable class="parameter">val_attr_2</replaceable> [, ...]]);
-           [, <replaceable class="parameter">val_attr_2</replaceable> [, ...]]);
       </programlisting>
      </para>