diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index ecda5b8aaad792e993fdc43b23a5d03c3f28c957..efb7f15de059a6ba76100c25b8598773bb09a3a5 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -892,10 +892,9 @@
 
      <listitem>
       <para>
-	<entry>9</entry>
-	<entry>value with the specified number of digits, and if digit is
-	 not available use blank space</entry>
-       </row>
+       <literal>9</literal> specifies a value with the same number of 
+       digits as there are <literal>9</literal>s. If a digit is
+       not available use blank space.
       </para>
      </listitem>
 
diff --git a/doc/src/sgml/install.sgml b/doc/src/sgml/install.sgml
index 6d3fe63fd0db956495c35f4a76a30d74429ecf3f..ef58efd41ec78faaad8fa19b2fdb2f8dc1bb6ad5 100644
--- a/doc/src/sgml/install.sgml
+++ b/doc/src/sgml/install.sgml
@@ -162,7 +162,7 @@ For a complete list of options, type:
     installed into the usual place for Perl modules (typically under
     <filename>/usr/lib/perl</filename>), so you must have root access
     to perform the installation step.  (It is often easiest to leave out
-    <term>--with-perl</term> initially, and then build and install the
+    <option>--with-perl</option> initially, and then build and install the
     Perl interface after completing the installation of PostgreSQL
     itself.)
    </para>
diff --git a/doc/src/sgml/ports.sgml b/doc/src/sgml/ports.sgml
index ee558308289b041d30e1db2c50057bd6078c2b13..c90eb4cc4175f5a8a7c2e6316570dc47e51f2ed7 100644
--- a/doc/src/sgml/ports.sgml
+++ b/doc/src/sgml/ports.sgml
@@ -43,14 +43,6 @@
 	<entry>1999-05-25</entry>
 	<entry>(<ulink url="mailto:maillist@candle.pha.pa.us">Bruce Momjian</ulink></entry>
        </row>
-       <row>
-	<entry>FreeBSD 2.2.x-4.0</entry>
-	<entry>x86</entry>
-	<entry>v6.5</entry>
-	<entry>1999-05-25</entry>
-	<entry>(<ulink url="mailto:t-ishii@sra.co.jp">Tatsuo Ishii</ulink>,
-	 <ulink url="mailto:scrappy@hub.org">Marc Fournier</ulink>)</entry>
-       </row>
        <row>
 	<entry>DGUX 5.4R4.11</entry>
 	<entry>m88k</entry>
@@ -67,6 +59,14 @@
 	<entry>
 	 (<ulink url="mailto:pjlobo@euitt.upm.es">Pedro J. Lobo</ulink>)</entry>
        </row>
+       <row>
+	<entry>FreeBSD 2.2.x-4.0</entry>
+	<entry>x86</entry>
+	<entry>v6.5</entry>
+	<entry>1999-05-25</entry>
+	<entry>(<ulink url="mailto:t-ishii@sra.co.jp">Tatsuo Ishii</ulink>,
+	 <ulink url="mailto:scrappy@hub.org">Marc Fournier</ulink>)</entry>
+       </row>
        <row>
 	<entry>HPUX</entry>
 	<entry>PA-RISC</entry>
@@ -91,7 +91,7 @@
 	-->
        </row>
        <row>
-	<entry>linux 2.0.x</entry>
+	<entry>Linux 2.0.x</entry>
 	<entry>Alpha</entry>
 	<entry>v6.5.3</entry>
 	<entry>1999-11-05</entry>
@@ -99,7 +99,7 @@
 	 (<ulink url="mailto:pgsql@rkirkpat.net">Ryan Kirkpatrick</ulink>)</entry>
        </row>
        <row>
-	<entry>linux 2.2.x</entry>
+	<entry>Linux 2.2.x</entry>
 	<entry>arm41</entry>
 	<entry>v6.5.3</entry>
 	<entry>1999-11-05</entry>
@@ -112,7 +112,7 @@
        separately.
        - thomas 1999-11-06
        <row>
-	<entry>linux 2.0.x/libc5</entry>
+	<entry>Linux 2.0.x/libc5</entry>
 	<entry>x86</entry>
 	<entry>v6.4</entry>
 	<entry>1998-10-27</entry>
@@ -121,14 +121,14 @@
        -->
 
        <row>
-	<entry>linux 2.2.x/glibc2</entry>
+	<entry>Linux 2.2.x/glibc2</entry>
 	<entry>x86</entry>
-	<entry>v6.5.3</entry>
-	<entry>1999-11-05</entry>
+	<entry>v7.0</entry>
+	<entry>2000-03-26</entry>
 	<entry>(<ulink url="mailto:lamar.owen@wgcr.org">Lamar Owens</ulink>)</entry>
        </row>
        <row>
-	<entry>linux 2.0.x</entry>
+	<entry>Linux 2.0.x</entry>
 	<entry>MIPS</entry>
 	<entry>v6.4</entry>
 	<entry>1998-12-16</entry>
@@ -136,28 +136,20 @@
 	 (<ulink url="mailto:t-ishii@sra.co.jp">Tatsuo Ishii</ulink>)</entry>
        </row>
        <row>
-	<entry>linux 2.0.x</entry>
+	<entry>Linux 2.0.x</entry>
 	<entry>Sparc</entry>
 	<entry>v6.4</entry>
 	<entry>1998-10-25</entry>
 	<entry>(<ulink url="mailto:szybist@boxhill.com">Tom Szybist</ulink>)</entry>
        </row>
        <row>
-	<entry>linuxPPC 2.1.24</entry>
+	<entry>LinuxPPC R4 2.2.1/libc5</entry>
 	<entry>PPC603e</entry>
-	<entry>v6.4</entry>
-	<entry>1998-10-26</entry>
+	<entry>v7.0</entry>
+	<entry>2000-03-26</entry>
 	<entry>Powerbook 2400c
 	 (<ulink url="mailto:t-ishii@sra.co.jp">Tatsuo Ishii</ulink>)</entry>
        </row>
-       <row>
-	<entry>mklinux DR3</entry>
-	<entry>PPC750</entry>
-	<entry>v6.4</entry>
-	<entry>1998-09-16</entry>
-	<entry>PowerMac 7600
-	 (<ulink url="mailto:t-ishii@sra.co.jp">Tatsuo Ishii</ulink>)</entry>
-       </row>
        <row>
 	<entry>NetBSD</entry>
 	<entry>arm32</entry>
@@ -166,11 +158,12 @@
 	<entry>(<ulink url="mailto:a.mcmurry1@physics.oxford.ac.uk">Andrew McMurry</ulink>)</entry>
        </row>
        <row>
-	<entry>NetBSD 1.3.2</entry>
+	<entry>NetBSD 1.4U</entry>
 	<entry>x86</entry>
-	<entry>v6.4</entry>
-	<entry>1998-10-25</entry>
-	<entry>(<ulink url="mailto:brook@trillium.NMSU.Edu">Brook Milligan</ulink>)</entry>
+	<entry>v7.0</entry>
+	<entry>2000-03-26</entry>
+	<entry>(<ulink url="mailto:prlw1@newn.cam.ac.uk">Patrick
+	  Welche</ulink>)</entry>
        </row>
        <row>
 	<entry>NetBSD</entry>
@@ -204,7 +197,7 @@
 	<entry>(<ulink url="mailto:tih@hamartun.priv.no">Tom I Helbekkmo</ulink>)</entry>
        </row>
        <row>
-	<entry>QNX-4.25</entry>
+	<entry>QNX 4.25</entry>
 	<entry>x86</entry>
 	<entry>v6.5.2</entry>
 	<entry>1999-11-08</entry>
@@ -277,11 +270,6 @@
     </table>
    </para>
 
-   <para>
-    Platforms listed for v6.3.x and v6.4.x should also work with v6.5,
-    but we did not receive explicit confirmation of such at the time this
-    list was compiled.
-   </para>
    <note>
     <para>
      For <productname>Windows NT</productname>, 
@@ -294,13 +282,55 @@
   <sect1>
    <title>Unsupported Platforms</title>
 
+   <para>
+    Platforms listed for v6.3.x-v6.5.x should also work with v7.0,
+    but we did not receive explicit confirmation of such at the time this
+    list was compiled.
+   </para>
+
+   <para>
+    At the time of publication, the following platforms have been tested:
+
+    <table tocentry="1">
+     <title>Obsolete Platforms</title>
+     <tgroup cols="4">
+      <thead>
+       <row>
+	<entry><acronym>OS</acronym></entry>
+	<entry>Processor</entry>
+	<entry>Version</entry>
+	<entry>Reported</entry>
+	<entry>Remarks</entry>
+       </row>
+      </thead>
+      <tbody>
+       <row>
+	<entry>mklinux DR3</entry>
+	<entry>PPC750</entry>
+	<entry>v6.4</entry>
+	<entry>1998-09-16</entry>
+	<entry>PowerMac 7600; mklinux merged with LinuxPPC
+	 (<ulink url="mailto:t-ishii@sra.co.jp">Tatsuo Ishii</ulink>)</entry>
+       </row>
+       <row>
+	<entry>Ultrix</entry>
+	<entry>MIPS,VAX?</entry>
+	<entry>v6.x</entry>
+	<entry>1998-03-01</entry>
+	<entry>No recent reports; obsolete?</entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </table>
+   </para>
+
    <para>
     There are a few platforms which have been attempted and which have been
     reported to not work with the standard distribution.
     Others listed here do not provide sufficient library support for an attempt.
 
     <table tocentry="1">
-     <title>Possibly Incompatible Platforms</title>
+     <title>Incompatible Platforms</title>
      <titleabbrev>Incompatibles</titleabbrev>
      <tgroup cols="4">
       <thead>
@@ -336,16 +366,6 @@
 	<entry>Confirmed with patching; v6.4.x will need TAS spinlock code
 	 (<ulink url="mailto:dlw@seavme.xroads.com">Doug Winterburn</ulink>)</entry>
        </row>
-<!--
-Obsolete afaik. Let's stop mentioning it. - thomas 1999-11-06
-       <row>
-	<entry>Ultrix</entry>
-	<entry>MIPS,VAX?</entry>
-	<entry>v6.x</entry>
-	<entry>1998-03-01</entry>
-	<entry>No recent reports; obsolete?</entry>
-       </row>
--->
       </tbody>
      </tgroup>
     </table>
@@ -357,7 +377,7 @@ Obsolete afaik. Let's stop mentioning it. - thomas 1999-11-06
 
 <!-- Keep this comment at the end of the file
 Local variables:
-mode: sgml
+mode:sgml
 sgml-omittag:nil
 sgml-shorttag:t
 sgml-minimize-attributes:nil
@@ -367,7 +387,7 @@ 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-catalogs:("/usr/lib/sgml/catalog")
 sgml-local-ecat-files:nil
 End:
 -->
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 9ce194d77aab12b58f21905f589c0311388b0580..91c2c71c3578cf0ee45e7a3296627541f9676207 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,31 +1,28 @@
  <chapter id="release">
   <title>Release Notes</title>
 
-<sect1>
-<title>Release 7.0</title>
-<!--
-<docinfo>
-<authorgroup>
-<author>
-<firstname>Bruce</firstname>
-<surname>Momjian</surname>
-</author>
-</authorgroup>
-<date>2000-04-01</date>
-</docinfo>
--->
-
-
-
+  <sect1>
+   <title>Release 7.0</title>
+   <!--
+  <docinfo>
+  <authorgroup>
+  <author>
+  <firstname>Bruce</firstname>
+  <surname>Momjian</surname>
+  </author>
+  </authorgroup>
+  <date>2000-04-01</date>
+  </docinfo>
+   -->
    <para>
-	This release shows the continued growth of PostgreSQL.  There are more
-	changes in 7.0 than in any previous release.  Don't be concerned this is
-	a dot-zero release. We do our best to put out only solid releases, and
-	this one is no exception.
+    This release shows the continued growth of PostgreSQL.  There are more
+    changes in 7.0 than in any previous release.  Don't be concerned this is
+    a dot-zero release. We do our best to put out only solid releases, and
+    this one is no exception.
    </para>
 
    <para>
-	Major changes in this release:
+    Major changes in this release:
 
     <variablelist>
      <varlistentry>
@@ -43,7 +40,7 @@
 
      <varlistentry>
       <term>
-	Optimizer Overhaul
+       Optimizer Overhaul
       </term>
       <listitem>
        <para>
@@ -56,7 +53,7 @@
 
      <varlistentry>
       <term>
-	Updated psql
+       Updated psql
       </term>
       <listitem>
        <para>
@@ -68,7 +65,21 @@
 
      <varlistentry>
       <term>
-	Upcoming Features
+       Join Syntax
+      </term>
+      <listitem>
+       <para>
+	SQL92 join syntax is now supported, though only as INNER JOINs 
+	for this release. JOIN, NATURAL JOIN, JOIN/USING, JOIN/ON are
+	available, as are column correlation names.
+       </para>
+      </listitem>
+     </varlistentry>
+
+
+     <varlistentry>
+      <term>
+       Upcoming Features
       </term>
       <listitem>
        <para>
@@ -91,7 +102,7 @@
      <application>pg_upgrade</application> to upgrade to this
      release.
     </para>
-    </sect2>
+   </sect2>
 
    <sect2>
     <title>Detailed Change List</title>
@@ -100,7 +111,7 @@
 Bug Fixes
 ---------
 Prevent function calls with more than maximum number of arguments (Tom)
-Many fixes for CASE  (Tom)
+Improve CASE construct (Tom)
 Fix SELECT coalesce(f1,0) FROM int4_tbl GROUP BY f1 (Tom)
 Fix SELECT sentence.words[0] FROM sentence GROUP BY sentence.words[0] (Tom)
 Fix GROUP BY scan bug (Tom)
@@ -119,8 +130,7 @@ Prevent DESTROY DATABASE while others accessing
 Prevent any rows from being returned by GROUP BY if no rows processed (Tom)
 Fix SELECT COUNT(1) FROM table WHERE ...' if no rows matching WHERE (Tom)
 Fix pg_upgrade so it works for MVCC(Tom)
-Fix for SELECT ... WHERE x IN (SELECT ... HAVING SUM(x) > 1) (Tom)
-Make TABLE optional keyword in LOCK TABLE (Bruce)
+Fix for SELECT ... WHERE x IN (SELECT ... HAVING SUM(x) &gt; 1) (Tom)
 Fix for "f1 datetime DEFAULT 'now'"  (Tom)
 Fix problems with CURRENT_DATE used in DEFAULT (Tom)
 Allow comment-only lines, and ;;; lines too. (Tom)
@@ -164,7 +174,7 @@ Enhancements
 ------------
 New CLI interface include file sqlcli.h, based on SQL3/SQL98
 Remove all limits on query length, row length limit still exists (Tom)
-Update jdbc protocol to 2.0 (Jens Glaser jens@jens.de)
+Update jdbc protocol to 2.0 (<ulink url="mailto:jens@jens.de">Jens Glaser</ulink>)
 Add TRUNCATE command to quickly truncate relation (Mike Mascari)
 Fix to give super user and createdb user proper update catalog rights (Peter E)
 Allow ecpg bool variables to have NULL values (Christof)
@@ -172,22 +182,21 @@ Issue ecpg error if NULL value is returned to variable with no NULL
 indicator (Christof)
 Allow ^C to cancel COPY command (Massimo)
 Add SET FSYNC and SHOW PG_OPTIONS commands(Massimo)
-Improve CREATE FUNCTION to allow type conversion specification 
-	(Bernie Frankpitt)
+Improve CREATE FUNCTION to allow type conversion (Bernie Frankpitt)
 Add CmdTuples() to libpq++(Vince)
 New CREATE CONSTRAINT TRIGGER and SET CONSTRAINTS commands(Jan)
-Allow CREATE FUNCTION WITH clause to be used for all language types
+Allow CREATE FUNCTION/WITH clause to be used for all language types
 configure --enable-debug adds -g (Peter E)
 configure --disable-debug removes -g (Peter E)
 Allow more complex default expressions (Tom)
 First real FOREIGN KEY constraint trigger functionality (Jan)
 Add FOREIGN KEY ... MATCH FULL ... ON DELETE CASCADE (Jan)
-Add FOREIGN KEY ... MATCH <unspecified> referential actions (Don Baccus)
+Add FOREIGN KEY ... MATCH &lt;unspecified&gt; referential actions (Don Baccus)
 Allow WHERE restriction on ctid (physical heap location) (Hiroshi)
 Move pginterface from contrib to interface directory, rename to pgeasy (Bruce)
-Add DEC and SESSION_USER as reserved words
+Add DEC and SESSION_USER as reserved words (Thomas)
 Require SELECT DISTINCT target list to have all ORDER BY columns (Tom)
-Add Oracle's COMMENT ON command (Mike Mascari <mascarim@yahoo.
+Add Oracle's COMMENT ON command (<ulink url="mailto:mascarim@yahoo">Mike Mascari</ulink>)
 libpq's PQsetNoticeProcessor function now returns previous hook(Peter E)
 Prevent PQsetNoticeProcessor from being set to NULL (Peter E)
 Make USING in COPY optional (Bruce)
@@ -226,18 +235,15 @@ Add postmaster.opts.default file to store startup flags (Tatsuo)
 Allow --with-mb=SQL_ASCII
 Increase maximum number of index keys to 16 (Bruce)
 Increase maximum number of function arguments to 16 (Bruce)
-Allow user configuration of maximum number of index keys and arguments
-(Bruce)
+Allow configuration of maximum number of index keys and arguments (Bruce)
 Allow unprivileged users to change their passwords (Peter E)
-With password authentication enabled, new users without passwords can't
-connect (Peter E)
+Password authentication enabled; required for new users (Peter E)
 Disallow dropping a user who owns a database (Peter E)
 Change initdb option --with-mb to --enable-multibyte
 Add option for initdb to prompts for superuser password (Peter E)
 Allow complex type casts like col::numeric(9,2) and col::int2::float8 (Tom)
-Updated user interfaces on initdb, initlocation, pg_dump, ipcclean
-(Peter E)
-New pg_char_to_encoding() and pg_encoding_to_char() functions (Tatsuo
+Updated user interfaces on initdb, initlocation, pg_dump, ipcclean (Peter E)
+New pg_char_to_encoding() and pg_encoding_to_char() functions (Tatsuo)
 Libpq non-blocking mode (Alfred Perlstein)
 Improve conversion of types in casts that don't specify a length
 New plperl internal programming language (Mark Hollomon)
@@ -245,7 +251,7 @@ Allow COPY IN to read file that do not end with a newline (Tom)
 Indicate when long identifiers are truncated (Tom)
 Allow aggregates to use type equivalency (Peter E)
 Add Oracle's to_char(), to_date(), to_datetime(), to_timestamp(), to_number()
-	conversion functions (Karel Zak <zakkr@zf.jcu.cz>)
+	conversion functions (Karel Zak &lt;zakkr@zf.jcu.cz&gt;)
 Add SELECT DISTINCT ON (expr [, expr ...]) targetlist ... (Tom)
 Check to be sure ORDER BY is compatible with the DISTINCT operation (Tom)
 Add NUMERIC and int8 types to ODBC
@@ -253,13 +259,12 @@ Improve EXPLAIN results for Append, Group, Agg, Unique (Tom)
 Add ALTER TABLE ... ADD FOREIGN KEY (Stephan Szabo)
 Allow SELECT .. FOR UPDATE in PL/pgSQL (Hiroshi)
 Enable backward sequential scan even after reaching EOF (Hiroshi)
-Add btree indexing of boolean values, >= and <= (Don Baccus)
+Add btree indexing of boolean values, &gt;= and &lt;= (Don Baccus)
 Print current line number when COPY FROM fails (Massimo)
 Recognize special case of POSIX time zone: "GMT+8" and "GMT-8" (Thomas)
 Add DEC as synonym for "DECIMAL (Thomas)
 Add SESSION_USER as SQL92 keyword, same as CURRENT_USER (Thomas)
-Implement column aliases (aka correlation names) and more join syntax
-(Thomas)
+Implement column aliases (aka correlation names) and join syntax (Thomas)
 Allow queries like SELECT a FROM t1 tx (a) (Thomas)
 Allow queries like SELECT * FROM t1 NATURAL JOIN t2 (Thomas)
 Make INTERVAL reserved word allowed as a column identifier (Thomas)
@@ -276,7 +281,7 @@ New libpq functions PQsetClientEncoding(), PQclientEncoding() (Tatsuo)
 Add support for SJIS user defined characters (Tatsuo)
 Larger views/rules supported
 Make libpq's PQconndefaults() thread-safe (Tom)
-Disable // as comment to be ANSI conforming, should use --
+Disable // as comment to be ANSI conforming, should use -- (Tom)
 Allow column aliases on views CREATE VIEW name (collist)
 Fixes for views with subqueries (Tom)
 Allow UPDATE table SET fld = (SELECT ...) (Tom)
@@ -353,7 +358,7 @@ Improve pg_statistics management for VACUUM speed improvement (Tom)
 Flush backend cache less frequently (Tom, Hiroshi)
 COPY now reuses previous memory allocation, improving performance (Tom)
 Improve optimization cost estimation (Tom)
-Improve optimizer estimate of range queries x > lowbound AND x < highbound (Tom)
+Improve optimizer estimate of range queries x &gt; lowbound AND x &lt; highbound (Tom)
 Use DNF instead of CNF where appropriate (Tom, Taral)
 Further cleanup for OR-of-AND WHERE-clauses (Tom)
 Make use of index in OR clauses (x = 1 AND y = 2) OR (x = 2 AND y = 4) (Tom)
@@ -368,22 +373,22 @@ Source Tree Changes
 Fix for linux PPC compile
 New generic expression-tree-walker subroutine (Tom)
 Change form() to varargform() to prevent portability problems.
-Improved range checking for large integers on Alpha's
+Improved range checking for large integers on Alphas
 Clean up #include in /include directory (Bruce)
 Add scripts for checking includes (Bruce)
 Remove un-needed #include's from *.c files (Bruce)
-Change #include's to use <> and "" as appropriate (Bruce)
+Change #include's to use &lt;&gt; and "" as appropriate (Bruce)
 Enable WIN32 compilation of libpq
-Alpha spinlock fix from Uncle George <gatgul@voicenet.com>
+Alpha spinlock fix from <ulink url="mailto:gatgul@voicenet.com">Uncle George</ulink>
 Overhaul of optimizer data structures (Tom)
 Fix to cygipc library (Yutaka Tanida)
 Allow pgsql to work on newer Cygwin snapshots(Dan)
 New catalog version number (Tom)
 Add Linux ARM.
 Rename heap_replace to heap_update
-Update for QNX (Kardos, Dr. Andreas)
+Update for QNX (Dr. Andreas Kardos)
 New platform-specific regression handling (Tom)
-Rename oid8 -> oidvector and int28 -> int2vector (Bruce)
+Rename oid8 -&gt; oidvector and int28 -&gt; int2vector (Bruce)
 Included all yacc and lex files into the distribution (Peter E.)
 Remove lextest, no longer needed (Peter E)
 Fix for libpq and psql on Win32 (Magnus)
@@ -392,7 +397,7 @@ Fix for plpgsql on BSDI
 Add SQL_ASCII test case to the regression test (Tatsuo)
 configure --with-mb now deprecated (Tatsuo)
 NT fixes
-NetBSD fixes Johnny C. Lam <lamj@stat.cmu.edu>
+NetBSD fixes <ulink url="mailto:lamj@stat.cmu.edu">Johnny C. Lam</ulink>
 Fixes for Alpha compiles
 New multibyte encodings
      </programlisting>