From bdf6c4f0121c1251692196d730e588d29f17eb25 Mon Sep 17 00:00:00 2001
From: "Thomas G. Lockhart" <lockhart@fourpalms.org>
Date: Tue, 11 Apr 2000 05:39:15 +0000
Subject: [PATCH] Update porting list. Fix markup to get clean compile.

---
 doc/src/sgml/advanced.sgml         | 101 +----------------------------
 doc/src/sgml/ports.sgml            |  10 ++-
 doc/src/sgml/query.sgml            |   6 +-
 doc/src/sgml/ref/comment.sgml      |   4 +-
 doc/src/sgml/ref/create_index.sgml |   6 +-
 doc/src/sgml/ref/update.sgml       |   4 +-
 6 files changed, 18 insertions(+), 113 deletions(-)

diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index af7030e392..3444abfb42 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.10 2000/04/07 13:30:58 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/advanced.sgml,v 1.11 2000/04/11 05:39:06 thomas Exp $
 -->
 
  <chapter id="advanced">
@@ -234,105 +234,6 @@ SELECT SAL_EMP.schedule[1:2][1:1]
    </sect2>
   </sect1>
 
-<!--
-
-We haven't had Time Travel for two or three years, so let's stop
-mentioning it. - thomas 2000-04-02
-
-  <sect1>
-   <title>Time Travel</title>
-
-   <para>
-    As of <productname>Postgres</productname> v6.2, <emphasis>time
-     travel is no longer supported</emphasis>. There are
-    several reasons for this: performance impact, storage size, and a
-    pg_time file which grows
-    toward infinite size in a short period of time.
-   </para>
-
-   <para>
-    New features such as triggers allow one to mimic the behavior of
-    time travel when desired, without
-    incurring the overhead when it is not needed (for most users, this
-    is most of the time).
-    See examples in the <filename>contrib</filename> directory for
-    more information.
-   </para>
-
-   <note>
-    <title>Time travel is deprecated</title>
-    <para>
-     The remaining text in this section is retained only until it can
-     be rewritten in the context
-     of new techniques to accomplish the same purpose.
-     Volunteers? - thomas 1998-01-12
-    </para>
-   </note>
-
-   <para>
-    <productname>Postgres</productname> supports the notion of time
-    travel.  This feature 
-    allows a user  to  run  historical  queries.   For
-    example,  to  find  the  current population of Mariposa
-    city, one would query:
-
-    <programlisting>
-SELECT * FROM cities WHERE name = 'Mariposa';
-
-+---------+------------+----------+
-|name     | population | altitude |
-+---------+------------+----------+
-|Mariposa | 1320       | 1953     |
-+---------+------------+----------+
-    </programlisting>
-
-    <productname>Postgres</productname> will automatically find the
-    version  of  Mariposa's 
-    record valid at the current time.
-    One can also give a time range.  For example to see the
-    past and present populations  of  Mariposa,  one  would
-    query:
-
-    <programlisting>
-SELECT name, population
-    FROM cities['epoch', 'now']
-    WHERE name = 'Mariposa';
-</programlisting>
-
-    where  "epoch"  indicates  the  beginning of the system
-    clock.
-
-    <note>
-     <para>
-      On Unix systems, this is always  midnight,  January  1, 1970 GMT.
-     </para>
-    </note>
-   </para>
-
-   <para>
-    If  you  have  executed all of the examples so
-    far, then the above query returns:
-
-    <programlisting>
-+---------+------------+
-|name     | population |
-+---------+------------+
-|Mariposa | 1200       |
-+---------+------------+
-|Mariposa | 1320       |
-+---------+------------+
-    </programlisting>
-   </para>
-
-   <para>
-    The default beginning of a time range is  the  earliest
-    time representable by the system and the default end is
-    the current time; thus, the above  time  range  can  be
-    abbreviated as ``[,].''
-   </para>
-  </sect1>
--->
-
   <sect1>
    <title>More Advanced Features</title>
 
diff --git a/doc/src/sgml/ports.sgml b/doc/src/sgml/ports.sgml
index c4e426683c..7247ec6c18 100644
--- a/doc/src/sgml/ports.sgml
+++ b/doc/src/sgml/ports.sgml
@@ -150,11 +150,15 @@
 	 (<ulink url="mailto:t-ishii@sra.co.jp">Tatsuo Ishii</ulink>)</entry>
        </row>
        <row>
-	<entry>NetBSD</entry>
+	<entry>NetBSD 1.4</entry>
 	<entry>arm32</entry>
-	<entry>v6.5</entry>
-	<entry>1999-04-14</entry>
+	<entry>v7.0</entry>
+	<entry>2000-04-08</entry>
+	<entry>(<ulink url="mailto:prlw1@newn.cam.ac.uk">Patrick
+	  Welche</ulink>)</entry>
+<!--
 	<entry>(<ulink url="mailto:a.mcmurry1@physics.oxford.ac.uk">Andrew McMurry</ulink>)</entry>
+-->
        </row>
        <row>
 	<entry>NetBSD 1.4U</entry>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 971be24838..ef519c7346 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.10 2000/04/07 13:30:58 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.11 2000/04/11 05:39:06 thomas Exp $
 -->
 
  <chapter id="query">
@@ -21,8 +21,8 @@ $Header: /cvsroot/pgsql/doc/src/sgml/query.sgml,v 1.10 2000/04/07 13:30:58 thoma
    flavor of <acronym>SQL</acronym> and is in no way a complete  tutorial  on
    <acronym>SQL</acronym>.  Numerous  books  have  been  written  on
    <acronym>SQL92</acronym>, including
-   <xref linkend="MELT93" endterm="MELT93-title"> and
-   <xref linkend="DATE97" endterm="DATE97-title">.
+   <xref linkend="MELT93" endterm="MELT93"> and
+   <xref linkend="DATE97" endterm="DATE97">.
    You should be  aware  that  some language features 
    are extensions to the <acronym>ANSI</acronym> standard.
   </para>
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index 21f1e7b993..af127beeed 100644
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/comment.sgml,v 1.3 1999/10/26 16:36:28 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/comment.sgml,v 1.4 2000/04/11 05:39:15 thomas Exp $
 Postgres documentation
 -->
 
@@ -101,7 +101,7 @@ COMMENT
   <para>
    <command>COMMENT</command> adds a comment to an object that can be 
     easily retrieved with <application>psql's</application>
-    <emphasize>\dd</emphasize> command.
+    <emphasis>\dd</emphasis> command.
     To remove a comment, use <literal>NULL</literal>.
     Comments are automatically dropped when the object is dropped.
   </para>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 6ed340f377..13f9f612e0 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.10 2000/03/16 14:39:30 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_index.sgml,v 1.11 2000/04/11 05:39:15 thomas Exp $
 Postgres documentation
 -->
 
@@ -46,8 +46,8 @@ CREATE [ UNIQUE ] INDEX <replaceable class="parameter">index_name</replaceable>
 	Causes the system to check for
 	duplicate values in the table when the index is created (if data
 	already exist) and each time data is added. Attempts to
-	insert or update non-duplicate data will generate an
-	error.
+	insert or update data which would result in duplicate entries
+	will generate an error.
        </para>
       </listitem>
      </varlistentry>
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 8f4858de3b..ff668a6254 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/update.sgml,v 1.8 2000/03/26 18:32:27 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/update.sgml,v 1.9 2000/04/11 05:39:15 thomas Exp $
 Postgres documentation
 -->
 
@@ -182,7 +182,7 @@ SELECT * FROM films WHERE kind = 'Dramatic' OR kind = 'Drama';
     the positioned UPDATE statement:
 
     <synopsis>
-UPDATE table SET column = expression [, ...]
+UPDATE <replaceable>table</replaceable> SET <replaceable>column</replaceable> = <replaceable>expression</replaceable> [, ...]
     WHERE CURRENT OF <replaceable class="parameter">cursor</replaceable>
     </synopsis>