diff --git a/HISTORY b/HISTORY
index b0831b02bd89d7bd7c8fa7596eaf431532d5fdad..274e89b73c24f7e996fa5bb467fc45ccf61ed63d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,42 @@
   ------------------------------------------------------------------------
                                 Release Notes
   ------------------------------------------------------------------------
+
+Release 7.0.1
+
+This is basically a cleanup release for 7.0.1
+
+Migration to v7.0.1
+
+A dump/restore is not required for those running 7.0.
+
+Changes
+-------
+Fix many CLUSTER failures (Tom)
+Allow ALTER TABLE RENAME works on indexes (Tom)
+Fix plpgsql to handle datetime->timestamp and timespan->interval (Bruce)
+New configure --with-setproctitle switch to use setproctitle() (Marc, Bruce)
+Fix the off by one errors in ResultSet from 6.5.3, and more.
+jdbc ResultSet fixes (Joseph Shraibman)
+optimizer tunings (Tom)
+Fix create user for pgaccess
+Fix for UNLISTEN failure
+IRIX fixes (David Kaelbling)
+QNX fixes (Andreas Kardos)
+Reduce COPY IN lock level (Tom)
+Change libpqeasy to use PQconnectdb() style parameters (Bruce)
+Fix pg_dump to handle OID indexes (Tom)
+Fix small memory leak (Tom)
+Solaris fix for createdb/dropdb
+Fix for non-blocking connections (Alfred Perlstein)
+Fix improper recovery after RENAME TABLE failures (Tom)
+Copy pg_ident.conf.sample into /lib directory in install (Bruce)
+
+
+  ------------------------------------------------------------------------
+                                                               Release 7.0
+                                Release Notes
+  ------------------------------------------------------------------------
           
 Release 7.0
 
@@ -35,7 +71,7 @@ Migration to v7.0
    data from any previous release. For those upgrading from 6.5.*, you
    can use pg_upgrade to upgrade to this release.
    
-Detailed Change List
+
 Bug Fixes
 ---------
 Prevent function calls with more than maximum number of arguments (Tom)
@@ -362,6 +398,10 @@ Fixes for Alpha compiles
 New multibyte encodings
 
 
+  ------------------------------------------------------------------------
+                                                               Release 6.5.3
+                                Release Notes
+  ------------------------------------------------------------------------
 
 Release 6.5.3
 
@@ -372,11 +412,12 @@ Migration to v6.5.3
 
 A dump/restore is not required for those running 6.5.*.
 
-Detailed Change List
-
+Changes
+-------
 Updated version of pgaccess 0.98
 NT-specific patch
 
+
   ------------------------------------------------------------------------
                                                                Release 6.5.2
                                 Release Notes
@@ -391,8 +432,8 @@ Migration to v6.5.2
 
 A dump/restore is not required for those running 6.5.*.
 
-Detailed Change List
-
+Changes
+-------
 subselect+CASE fixes(Tom)
 Add SHLIB_LINK setting for solaris_i386 and solaris_sparc ports(Daren Sefcik)
 Fixes for CASE in WHERE join clauses(Tom)
@@ -418,6 +459,7 @@ Repair logic error in LIKE: should not return LIKE_ABORT
 Repair incorrect cleanup of heap memory allocation during transaction abort(Tom)
 Updated version of pgaccess 0.98
 
+
   ------------------------------------------------------------------------
 Release Notes                                                  Release 6.5.1
                                 Release Notes
@@ -432,8 +474,8 @@ Migration to v6.5.1
 
 A dump/restore is not required for those running 6.5.
 
-Detailed Change List
-
+Changes
+-------
 Add NT README file
 Portability fixes for linux_ppc, Irix, linux_alpha, OpenBSD, alpha
 Remove QUERY_LIMIT, use SELECT...LIMIT
@@ -458,6 +500,7 @@ Fixed glitches affecting GROUP BY in subselects(Tom)
 Fix some compiler warnings (Tomoaki Nishiyama)
 Add Win1250 (Czech) support (Pavel Behal)
 
+
   ------------------------------------------------------------------------
 Release 6.5.2                                                    Release 6.5
                                 Release Notes
@@ -576,7 +619,6 @@ These inconveniences will disappear in the future when the ability to read
 dirty (uncommitted) data (regardless of isolation level) and true
 referential integrity will be implemented.
 
-Detailed Change List
 
 Bug Fixes
 ---------
@@ -755,10 +797,11 @@ Migration to v6.4.2
 
 A dump/restore is not required for those running 6.4.*.
 
-Detailed Change List
-
+Changes
+-------
 Fix for datetime constant problem on some platforms(Thomas)
 
+
   ------------------------------------------------------------------------
 Release 6.5                                                    Release 6.4.1
                                 Release Notes
@@ -773,8 +816,8 @@ Migration to v6.4.1
 
 A dump/restore is not required for those running 6.4.
 
-Detailed Change List
-
+Changes
+-------
 Add pg_dump -N flag to force double quotes around identifiers.  This is
         the default(Thomas)
 Fix for NOT in where clause causing crash(Bruce)
@@ -806,6 +849,7 @@ Add routines to help with single-byte (internal) character type(Thomas)
 Compilation of libpq for Win32 fixes(Magnus)
 Upgrade to PyGreSQL 2.2(D'Arcy)
 
+
   ------------------------------------------------------------------------
 Release 6.4.2                                                    Release 6.4
                                 Release Notes
@@ -856,7 +900,6 @@ Migration to v6.4
 A dump/restore using pg_dump or pg_dumpall is required for those wishing to
 migrate data from any previous release of Postgres.
 
-Detailed Change List
 
 Bug Fixes
 ---------
@@ -1051,6 +1094,7 @@ smarter perl configuration(Brook)
 configure uses supplied install-sh if no install script found(Tom)
 new Makefile.shlib for shared library configuration(Tom)
 
+
   ------------------------------------------------------------------------
 Release 6.4.1                                                  Release 6.3.2
                                 Release Notes
@@ -1077,7 +1121,6 @@ re-link any custom applications that use Postgres libraries.
 For upgrades from pre-v6.3 installations, refer to the installation and
 migration instructions for v6.3.
 
-Detailed Change List
 
 Changes
 -------
@@ -1100,6 +1143,7 @@ Remove DISTDIR(Bruce)
 Makefile dependency cleanup(Jeroen van Vianen)
 ASSERT fixes(Bruce)
 
+
   ------------------------------------------------------------------------
 Release 6.4                                                    Release 6.3.1
                                 Release Notes
@@ -1125,7 +1169,6 @@ applications that use Postgres libraries.
 For upgrades from pre-v6.3 installations, refer to the installation and
 migration instructions for v6.3.
 
-Detailed Change List
 
 Changes
 -------
@@ -1157,6 +1200,7 @@ Fix for text arrays containing quotes(Doug Gibson)
 Solaris compile fix(Albert Chin-A-Young)
 Better identify tcl and tk libs and includes(Bruce)
 
+
   ------------------------------------------------------------------------
 Release 6.3.2                                                    Release 6.3
                                 Release Notes
@@ -1245,7 +1289,6 @@ Migration to v6.3
 A dump/restore using pg_dump or pg_dumpall is required for those wishing to
 migrate data from any previous release of Postgres.
 
-Detailed Change List
 
 Bug Fixes
 ---------
@@ -1412,6 +1455,7 @@ Add string functions to regression suite(Thomas)
 Expand a few function names formerly truncated to 16 characters(Thomas)
 Remove un-needed malloc() calls and replace with palloc()(Bruce)
 
+
   ------------------------------------------------------------------------
 Release 6.3.1                                                  Release 6.2.1
                                 Release Notes
@@ -1449,10 +1493,9 @@ psql to update the existing system table:
 
 This will need to be done to every existing database, including template1.
 
-Detailed Change List
 
-Changes in this release
------------------------
+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)
@@ -1465,6 +1508,7 @@ Fix for specifying a column twice in ORDER/GROUP BY(Vadim)
 Documented new libpq function to return affected rows, PQcmdTuples(Bruce)
 Trigger function for inserting user names for INSERT/UPDATE(Brook Milligan)
 
+
   ------------------------------------------------------------------------
 Release 6.3                                                      Release 6.2
                                 Release Notes
@@ -1488,7 +1532,6 @@ Migration from v1.x to v6.2
 Those migrating from earlier 1.* releases should first upgrade to 1.09
 because the COPY output format was improved from the 1.02 release.
 
-Detailed Change List
 
 Bug Fixes
 ---------
@@ -1599,6 +1642,7 @@ Massive commit to run PGINDENT on all *.c and *.h files(Bruce)
 Files moved to /src/tools directory(Bruce)
 SPI and Trigger programming guides (Vadim & D'Arcy)
 
+
   ------------------------------------------------------------------------
 Release 6.2.1                                                  Release 6.1.1
                                 Release Notes
@@ -1612,10 +1656,9 @@ This is a minor bug-fix release. A dump/reload is not required from v6.1,
 but is required from any release prior to v6.1. Refer to the release notes
 for v6.1 for more details.
 
-Detailed Change List
 
-Changes in this release
------------------------
+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
@@ -1634,8 +1677,9 @@ Fix for Solaris assembler and include files(Yoshihiko Ichikawa)
 allow underscores in usernames(Bruce)
 pg_dumpall now returns proper status, portability fix(Bruce)
 
+
   ------------------------------------------------------------------------
-Release 6.2                                                      Release 6.1
+                                                                 Release 6.1
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -1682,7 +1726,6 @@ the database in 6.1.
 Those migrating from earlier 1.* releases should first upgrade to 1.09
 because the COPY output format was improved from the 1.02 release.
 
-Detailed Change List
 
 Bug Fixes
 ---------
@@ -1779,8 +1822,9 @@ c++ include file cleanup(Bruce)
 warn about buggy flex(Bruce)
 DG-UX, Ultrix, Irix, AIX portability fixes
 
+
   ------------------------------------------------------------------------
-Release 6.1.1                                                   Release v6.0
+                                                                Release v6.0
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -1799,7 +1843,6 @@ Migration from pre-v1.09 to v6.0
 Those migrating from earlier 1.* releases should first upgrade to 1.09
 because the COPY output format was improved from the 1.02 release.
 
-Detailed Change List
 
 Bug Fixes
 ---------
@@ -1905,8 +1948,9 @@ Restructured object file generation/location(Bryan, Marc)
 Restructured port-specific file locations(Bryan, Marc)
 Unused/uninialized variables corrected
 
+
   ------------------------------------------------------------------------
-Release 6.1                                                    Release v1.09
+                                                                Release v1.09
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -2001,8 +2045,9 @@ New Ports
  * added BSDI 2.1 port
  * added DGUX port
 
+
   ------------------------------------------------------------------------
-Release v1.09                                                  Release v1.01
+                                                                 Release v1.01
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -2138,8 +2183,9 @@ Bug fixes:
  * psql now returns non-zero status on errors when using -c
  * applied public patches 1-14
 
+
   ------------------------------------------------------------------------
-Release v1.02                                                   Release v1.0
+                                                                 Release v1.0
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -2187,8 +2233,9 @@ Bug fixes:
  *  btrees with multiple index never worked, now we tell you they don't
    work when you try to use them
 
+
   ------------------------------------------------------------------------
-Release v1.01                                           Postgres95 Beta 0.03
+                                                           Postgres95 Beta 0.03
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -2302,8 +2349,9 @@ New utilities:
 New documentation:
  * the user manual has been revised and libpq documentation added.
 
+
   ------------------------------------------------------------------------
-Release v1.0                                            Postgres95 Beta 0.02
+                                                          Postgres95 Beta 0.02
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -2346,7 +2394,7 @@ The following bugs have been fixed in postgres95-beta-0.02:
  * wrong result using more than 1 aggregate in a SELECT
 
   ------------------------------------------------------------------------
-Postgres95 Beta 0.03                                    Postgres95 Beta 0.01
+                                                          Postgres95 Beta 0.01
                                 Release Notes
   ------------------------------------------------------------------------
 
@@ -2354,8 +2402,9 @@ Postgres95 Beta 0.01
 
 Initial release.
 
+
   ------------------------------------------------------------------------
-Postgres95 Beta 0.02                                          Timing Results
+                                                                Timing Results
                                 Release Notes
 Prev
   ------------------------------------------------------------------------
@@ -2421,7 +2470,3 @@ v6.1
   06:12  Pentium Pro 180, 32MB, EIDE, Linux 2.0.30, gcc 2.7.2 -O2 -m486
   12:06  P-100, 48MB, Linux 2.0.29, gcc
   39:58  Sparc IPC 32MB, Solaris 2.5, gcc 2.7.2.1 -O -g
-
-  ------------------------------------------------------------------------
-Prev                                Home
-Postgres95 Beta 0.01
diff --git a/README b/README
index dad0fe42a6486d3a86b83f1a4f11f7fc8a241062..fb6484026ab512ce7fe9475c4358f9a0947d1681 100644
--- a/README
+++ b/README
@@ -2,11 +2,11 @@
 PostgreSQL Data Base Management System (formerly known as Postgres, then
 as Postgres95).
   
-This directory contains the development version of 7.0 of the PostgreSQL
-database server.  The server is not ANSI SQL compliant, but it gets
-closer with every release.  After you unzip and untar the distribution
-file, look at file INSTALL for the installation notes and file HISTORY
-for the changes.
+This directory contains the development version of 7.0 of the
+PostgreSQL database server.  The server is not ANSI SQL compliant, but
+it gets closer with every release.  After you unzip and untar the
+distribution file, look at file INSTALL for the installation notes and
+file HISTORY for the changes.
 
 The latest version of this software may be obtained at
 ftp://ftp.postgresql.org/pub/.  For more information look at our WWW
diff --git a/doc/bug.template b/doc/bug.template
index 4eac04c442b0ae73b953140b4bbdb2db666564c0..e279c195533abe406b31ff1eba08255cd55efc32 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration
 
   Operating System (example: Linux 2.0.26 ELF) 	:
 
-  PostgreSQL version (example: PostgreSQL-7.0):   PostgreSQL-7.0
+  PostgreSQL version (example: PostgreSQL-7.0):   PostgreSQL-7.0.1
 
   Compiler used (example:  gcc 2.8.0)		:
 
diff --git a/doc/src/FAQ.html b/doc/src/FAQ.html
index 1ed10902d8882ad6198fd55e388d5f9065b14363..bbee79245fee4472b4ba86e0a6e8d7ccdce75ca4 100644
--- a/doc/src/FAQ.html
+++ b/doc/src/FAQ.html
@@ -18,12 +18,15 @@ Web site, <A HREF="http://www.Postgresql.org">http://www.PostgreSQL.org</A>.<P>
 Linux-specific questions are answered in <A
 HREF="http://www.PostgreSQL.org/docs/faq-linux.html">http://www.PostgreSQL.org/docs/faq-linux.html</A>.<P>
 
+HPUX-specific questions are answered in <A
+HREF="http://www.PostgreSQL.org/docs/faq-hpux.html">http://www.PostgreSQL.org/docs/faq-hpux.html</A>.<P>
+
+Solaris-specific questions are answered in <A
+HREF="http://www.postgresql.org/docs/faq-solaris.html">http://www.postgresql.org/docs/faq-solaris.html</A>.<P>
+
 Irix-specific questions are answered in <A
 HREF="http://www.PostgreSQL.org/docs/faq-irix.html">http://www.PostgreSQL.org/docs/faq-irix.html</A>.<P>
 
-HPUX-specific questions are answered in <A
-HREF="http://www.PostgreSQL.org/docs/faq-hpux.shtml">http://www.PostgreSQL.org/docs/faq-hpux.shtml</A>.<P>
-
 <HR><P>
 
 <H2><CENTER>General Questions</CENTER></H2>
@@ -42,7 +45,6 @@ HREF="http://www.PostgreSQL.org/docs/faq-hpux.shtml">http://www.PostgreSQL.org/d
 <A HREF="#1.12">1.12</A>) How do I join the development team?<BR>
 <A HREF="#1.13">1.13</A>) How do I submit a bug report?<BR>
 <A HREF="#1.14">1.14</A>) How does PostgreSQL compare to other DBMS's?<BR>
-<A HREF="#1.15">1.15</A>) What are the maximum size limits?
 
 
 <H2><CENTER>User Client Questions</CENTER></H2>
@@ -120,7 +122,8 @@ is NULL?<BR>
 various character types?<BR>
 <A HREF="#4.16.1">4.16.1</A>) How do I create a serial/auto-incrementing field?<BR>
 <A HREF="#4.16.2">4.16.2</A>) How do I get the value of a serial insert?<BR>
-<A HREF="#4.16.3">4.16.3</A>) Wouldn't use of currval() and nextval() lead to a race condition with other concurrent backend processes?<BR>
+<A HREF="#4.16.3">4.16.3</A>) Don't currval() and nextval() lead to a
+race condition with other concurrent backend processes?<BR>
 
 <A HREF="#4.17">4.17</A>) What is an oid?  What is a tid?<BR>
 <A HREF="#4.18">4.18</A>) What is the meaning of some of the terms
@@ -139,7 +142,7 @@ current time?<BR>
 <H2><CENTER>Extending PostgreSQL</CENTER></H2>
 
 <A HREF="#5.1">5.1</A>) I wrote a user-defined function.  When I run
-it in <I>psql,</I> why does it dumps core?<BR>
+it in <I>psql,</I> why does it dump core?<BR>
 <A HREF="#5.2">5.2</A>) What does the message:
 <I>NOTICE:PortalHeapMemoryFree: 0x402251d0 not in alloc set!</I> mean?<BR>
 <A HREF="#5.3">5.3</A>) How can I contribute some nifty new types and functions
@@ -353,6 +356,10 @@ http://www.postgresql.org/docs/postgres.</A>
 in the distribution.
 <P>
 
+There is a PostgreSQL book availiable at <A
+HREF="http://www.postgresql.org/docs/awbook.html">
+http://www.postgresql.org/docs/awbook.html</A><P>
+
 <I>psql</I> has some nice \d commands to show information about types,
 operators, functions, aggregates, etc.<P>
 
@@ -367,6 +374,10 @@ TODO</A> for a list of known bugs, missing features, and future plans.<P>
 
 <H4><A NAME="1.10">1.10</A>) How can I learn SQL?</H4><P>
 
+The PostgreSQL book at <A
+HREF="http://www.postgresql.org/docs/awbook.html">
+http://www.postgresql.org/docs/awbook.html</A> teaches SQL.
+
 There is a nice tutorial at <A
 HREF="http://w3.one.net/~jhoffman/sqltut.htm">
 http://w3.one.net/~jhoffman/sqltut.htm</A> and at <A
@@ -378,8 +389,8 @@ HREF="http://members.tripod.com/er4ebus/sql/index.htm">
 http://members.tripod.com/er4ebus/sql/index.htm </A><P>
 
 Many of our users like <I>The Practical SQL Handbook</I>, Bowman et al.,
-Addison Wesley.  Others like <I>Lan Times Guide to SQL</I>, Groff et al.,
-Osborne McGraw-Hill.<P>
+Addison Wesley.  Others like <I>The Complete Reference SQL</I>, Groff et al.,
+McGraw-Hill.<P>
 
 
 <H4><A NAME="1.11">1.11</A>) Is PostgreSQL Y2K compliant?</H4><P>
@@ -484,20 +495,6 @@ add our code to your product with no limitations, except those outlined
 in our BSD-style license stated above.<BR><BR>
 </DL>
 
-<H4><A NAME="1.15">1.15</A>) What are the maximum size limits?</H4><P>
-
-These are the limits:
-
-<PRE>
-Maximum size for a database? 	         unlimited (60GB databases exist)
-Maximum size for a table?                unlimited on all operating systems
-Maximum size for a row?                  8k, configurable to 32k
-Maximum number of rows in a table?	 unlimited
-Maximum number of columns table?         unlimited
-Maximun number of indexes on a table?	 unlimited
-</PRE>
-The row length limit will be removed in 7.1.<P>
-
 <HR>
 
 <H2><CENTER>User Client Questions</CENTER></H2>
@@ -580,9 +577,8 @@ We have:
 
 <UL>
 <LI> check that you don't have any of the previous version's binaries in
-your path   (If you see the message <CODE>WARN:heap_modifytuple: repl is
-\  9</CODE>, this is the problem.)
-<Li> check to see that you have the proper paths set
+your path   
+<LI> check to see that you have the proper paths set
 <LI> check that the <I>postgres</I> user owns the proper files
 </UL><P>
 
@@ -848,15 +844,23 @@ this:
 <H4><A NAME="4.6">4.6</A>) What is the maximum size for a
 row, table, database?</H4><P>
 
-Rows are limited to 8K bytes, but this can be changed by editing
-<I>include/config.h</I> and changing <SMALL>BLCKSZ.</SMALL> To use attributes
-larger than 8K, you can also use the large object interface.<P>
+These are the limits:
 
-Rows do not cross 8k boundaries so a 5k row will require 8k of
-storage.<P>
+<PRE>
+Maximum size for a database? 	         unlimited (60GB databases exist)
+Maximum size for a table?                unlimited on all operating systems
+Maximum size for a row?                  8k, configurable to 32k
+Maximum number of rows in a table?	 unlimited
+Maximum number of columns table?         unlimited
+Maximun number of indexes on a table?	 unlimited
+</PRE>
+
+To change the maximum row size, edit <I>include/config.h</I> and change
+<SMALL>BLCKSZ.</SMALL> To use attributes larger than 8K, you can also
+use the large object interface.<P>
+
+Row length limit will be removed in 7.1.<P>
 
-Table and database sizes are unlimited.  There are many databases that
-are tens of gigabytes, and probably some that are hundreds.
 
 <H4><A NAME="4.7">4.7</A>)How much database disk space is required to
 store data from a typical flat file?<BR></H4><P>
@@ -1056,7 +1060,8 @@ Similarly, you could retrieve the just-assigned SERIAL value with the <I>currval
 </PRE>
 Finally, you could use the <A HREF="#4.17">oid</A> returned from the INSERT statement to lookup the default value, though this is probably the least portable approach.  In perl, using DBI with Edmund Mergl's DBD::Pg module, the oid value is made available via $sth->{pg_oid_status} after $sth->execute().
 
-<H4><A NAME="4.16.3">4.16.3</A>) Wouldn't use of currval() and nextval() lead to a race condition with other concurrent backend processes?</H4><P>
+<H4><A NAME="4.16.3">4.16.3</A>) Don't currval() and nextval() lead to a race condition with other
+concurrent backend processes?</H4><P>
 
 No.  That has been handled by the backends.
 
@@ -1232,4 +1237,3 @@ have to do a <I>make clean</I> and then another <I>make.</I><P>
 </BODY>
 </HTML>
 
-
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index f790e1644046a9b53ac93dcdc5e70b051fa0a823..b582e9f911f3b0ae57f30b4ebe8126b35d15d4a3 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,10 +1,70 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.49 2000/05/08 23:56:50 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.50 2000/06/01 05:13:18 momjian Exp $
 -->
 
  <chapter id="release">
   <title>Release Notes</title>
 
+<sect1>
+<title>Release 7.0.1</title>
+<!--
+<docinfo>
+<authorgroup>
+<author>
+<firstname>Bruce</firstname>
+<surname>Momjian</surname>
+</author>
+</authorgroup>
+<date>2000-06-01</date>
+</docinfo>
+-->
+
+<para>
+2000-06-01
+</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.
+</para>
+</sect2>
+<sect2>
+<title>Changes</title>
+
+<para>
+<programlisting>
+Fix many CLUSTER failures (Tom)
+Allow ALTER TABLE RENAME works on indexes (Tom)
+Fix plpgsql to handle datetime->timestamp and timespan->interval (Bruce)
+New configure --with-setproctitle switch to use setproctitle() (Marc, Bruce)
+Fix the off by one errors in ResultSet from 6.5.3, and more.
+jdbc ResultSet fixes (Joseph Shraibman)
+optimizer tunings (Tom)
+Fix create user for pgaccess
+Fix for UNLISTEN failure
+IRIX fixes (David Kaelbling)
+QNX fixes (Andreas Kardos)
+Reduce COPY IN lock level (Tom)
+Change libpqeasy to use PQconnectdb() style parameters (Bruce)
+Fix pg_dump to handle OID indexes (Tom)
+Fix small memory leak (Tom)
+Solaris fix for createdb/dropdb
+Fix for non-blocking connections (Alfred Perlstein)
+Fix improper recovery after RENAME TABLE failures (Tom)
+Copy pg_ident.conf.sample into /lib directory in install (Bruce)
+</programlisting>
+</para>
+</sect2>
+</sect1>
+
+
   <sect1>
    <title>Release 7.0</title>
    <!--
@@ -18,6 +78,9 @@ $Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.49 2000/05/08 23:56:50 mom
   <date>2000-05-08</date>
   </docinfo>
    -->
+   <para> 
+2000-05-08
+   </para>
    <para>
     This release contains improvements in many areas, demonstrating
     the continued growth of <productname>PostgreSQL</productname>.
@@ -177,7 +240,6 @@ Ack! This isn't yet in the code?? - thomas 2000-04-30
    </sect2>
 
    <sect2>
-    <title>Detailed Change List</title>
     <para>
      <programlisting>
 Bug Fixes
@@ -516,10 +578,12 @@ New multibyte encodings
 </docinfo>
 -->
 
+<para>
+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.
+pgaccess that was missing in 6.5.2, and installed an NT-specific fix.
 </para>
 
 
@@ -532,7 +596,7 @@ A dump/restore is <emphasis>not</emphasis> required for those running
 </para>
 </sect2>
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
 <para>
 <programlisting>
@@ -559,6 +623,9 @@ Fix dumping rules on inherited tables
 </docinfo>
 -->
 
+<para>
+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.
@@ -574,7 +641,7 @@ A dump/restore is <emphasis>not</emphasis> required for those running
 </para>
 </sect2>
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
 <para>
 <programlisting>
@@ -622,6 +689,9 @@ Updated version of pgaccess 0.98
 </docinfo>
 -->
 
+<para>
+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.
@@ -637,7 +707,7 @@ A dump/restore is <emphasis>not</emphasis> required for those running
 </para>
 </sect2>
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
 <para>
 <programlisting>
@@ -685,6 +755,9 @@ Add Win1250 (Czech) support (Pavel Behal)
 -->
 
    <para>
+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
@@ -903,7 +976,6 @@ Add Win1250 (Czech) support (Pavel Behal)
     </sect2>
 
    <sect2>
-    <title>Detailed Change List</title>
     <para>
      <programlisting>
 Bug Fixes
@@ -1087,6 +1159,9 @@ New install commands for plpgsql(Jan)
 </docinfo>
 -->
 
+<para>
+1999-12-20
+</para>
 <para>
 The 6.4.1 release was improperly packaged.  This also has one additional
 bug fix.
@@ -1102,7 +1177,7 @@ A dump/restore is <emphasis>not</emphasis> required for those running
 </para>
 </sect2>
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
 <para>
 <programlisting>
@@ -1128,6 +1203,9 @@ Fix for datetime constant problem on some platforms(Thomas)
 </docinfo>
 -->
 
+<para>
+1999-12-18
+</para>
 <para>
 This is basically a cleanup release for 6.4.  We have fixed a variety of
 problems reported by 6.4 users.
@@ -1143,7 +1221,7 @@ A dump/restore is <emphasis>not</emphasis> required for those running
 </para>
 </sect2>
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
 <para>
 <programlisting>
@@ -1198,6 +1276,9 @@ Upgrade to PyGreSQL 2.2(D'Arcy)
 </docinfo>
 -->
 
+<para>
+1998-10-30
+</para>
 <para>
 There are <emphasis>many</emphasis> new features and improvements in this release.
 Thanks to our developers and maintainers, nearly every aspect of the system
@@ -1285,7 +1366,6 @@ previous release of <productname>Postgres</productname>.
 </para>
 </sect2>
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
@@ -1496,10 +1576,13 @@ new Makefile.shlib for shared library configuration(Tom)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>Tue Apr  7 16:53:16 EDT 1998</date>
+<date>1998-04-07</date>
 </docinfo>
 -->
 
+<para>
+1998-04-07
+</para>
 <para>
 This is a bugfix release for 6.3.x.
 Refer to the release notes for v6.3 for a more complete summary of new features.
@@ -1535,7 +1618,6 @@ refer to the installation and migration instructions for v6.3.
 </para>
 
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
@@ -1573,12 +1655,13 @@ ASSERT fixes(Bruce)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Mon Mar 23 10:21:52 EST 1998
-</date>
+<date>1998-03-23</date>
 </docinfo>
 -->
 
+<para>
+1998-03-23
+</para>
 <para>
 Summary:
 
@@ -1621,7 +1704,6 @@ refer to the installation and migration instructions for v6.3.
 </para>
 
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
@@ -1668,12 +1750,13 @@ Better identify tcl and tk libs and includes(Bruce)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Sun Mar  1 14:57:30 EST 1998
-</date>
+<date>1998-03-01</date>
 </docinfo>
 -->
 
+<para>
+1998-03-01
+</para>
 <para>
 There are <emphasis>many</emphasis> new features and improvements in this release.
 Here is a brief, incomplete summary:
@@ -1805,7 +1888,6 @@ previous release of <productname>Postgres</productname>.
 </sect2>
 
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
@@ -1988,12 +2070,13 @@ Remove un-needed malloc() calls and replace with palloc()(Bruce)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Fri Oct 17 00:01:27 EDT 1997
-</date>
+<date>1997-10-17</date>
 </docinfo>
 -->
 
+<para>
+1997-10-17
+</para>
 <para>
 v6.2.1 is a bug-fix and usability release on v6.2.
 </para>
@@ -2047,12 +2130,11 @@ This will need to be done to every existing database, including template1.
 </para>
 </sect2>
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
-Changes in this release
------------------------
+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)
@@ -2079,12 +2161,14 @@ Trigger function for inserting user names for INSERT/UPDATE(Brook Milligan)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Thu Oct 02 12:53:46 EDT 1997
+<date>1997-10-02
 </date>
 </docinfo>
 -->
 
+<para>
+1997-10-02
+</para>
 <para>
 A dump/restore is required for those wishing to migrate data from
 previous releases of <productname>Postgres</productname>.
@@ -2113,7 +2197,6 @@ because the COPY output format was improved from the 1.02 release.
 </sect2>
 
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
@@ -2240,9 +2323,7 @@ SPI and Trigger programming guides (Vadim & D'Arcy)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Mon Jul 22 18:04:49 EDT 1997
-</date>
+<date>1997-07-22</date>
 </docinfo>
 -->
 
@@ -2250,6 +2331,9 @@ Mon Jul 22 18:04:49 EDT 1997
 <sect2>
 <title>Migration from v6.1 to v6.1.1</title>
 
+<para>
+1997-07-22
+</para>
 <para>
 This is a minor bug-fix release. A dump/reload is not required from v6.1,
 but is required from any release prior to v6.1.
@@ -2258,12 +2342,11 @@ Refer to the release notes for v6.1 for more details.
 </sect2>
 
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
-Changes in this release
------------------------
+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
@@ -2296,12 +2379,13 @@ pg_dumpall now returns proper status, portability fix(Bruce)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Sun Jun  8 14:41:13 EDT 1997
-</date>
+<date>1997-06-08</date>
 </docinfo>
 -->
 
+<para>
+1997-06-08
+</para>
 <para>
   The regression tests have been adapted and extensively modified for the
   v6.1 release of <productname>Postgres</productname>.
@@ -2362,7 +2446,6 @@ because the COPY output format was improved from the 1.02 release.
 </sect2>
 
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
@@ -2475,12 +2558,13 @@ DG-UX, Ultrix, Irix, AIX portability fixes
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Wed Jan 29 00:19:54 EST 1997
-</date>
+<date>1997-01-29</date>
 </docinfo>
 -->
 
+<para>
+1997-01-29
+</para>
 <para>
 A dump/restore is required for those wishing to migrate data from
 previous releases of <productname>Postgres</productname>.
@@ -2505,7 +2589,6 @@ because the COPY output format was improved from the 1.02 release.
 </sect2>
 
 <sect2>
-<title>Detailed Change List</title>
 
 <para>
 <programlisting>
@@ -2634,6 +2717,8 @@ Unknown
 -->
 
 <para>
+
+Unknown
 Sorry, we stopped keeping track of changes from 1.02 to 1.09.  Some of
 the changes listed in 6.0 were actually included in the 1.02.1 to 1.09
 releases.
@@ -2650,15 +2735,16 @@ releases.
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Thu Aug  1 18:00:00 EDT 1996
-</date>
+<date>1996-08-01</date>
 </docinfo>
 -->
 
 <sect2>
 <title>Migration from v1.02 to v1.02.1</title>
 
+<para>
+1996-08-01
+</para>
 <para>
 Here is a new migration file for 1.02.1.  It includes the 'copy' change
 and a script to convert old ascii files.
@@ -2735,7 +2821,7 @@ create operator !~* (leftarg = varchar, rightarg = text, procedure = texticregex
 </sect2>
 
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
 <para>
 <programlisting>
@@ -2807,15 +2893,16 @@ Contributors (appologies to any missed)
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Fri Feb 23 18:20:36 PST 1996
-</date>
+<date>1996-02-23</date>
 </docinfo>
 -->
 
 <sect2>
 <title>Migration from v1.0 to v1.01</title>
 
+<para>
+1996-02-23
+</para>
 <para>
 The following notes are for the benefit of users who want to migrate
 databases from postgres95 1.0 to postgres95 1.01.  
@@ -2955,7 +3042,7 @@ create operator !~* (leftarg = text, rightarg = text, procedure = texticregexne)
 </sect2>
 
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
 <para>
 <programlisting>
@@ -3006,15 +3093,16 @@ Bug fixes:
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Tue Sep  5 11:24:11 PDT 1995
-</date>
+<date>1995-09-05</date>
 </docinfo>
 -->
 
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
+<para>
+1995-09-05
+</para>
 <para>
 <programlisting>
 Copyright change:
@@ -3071,15 +3159,16 @@ Bug fixes:
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Fri Jul 21 14:49:31 PDT 1995
-</date>
+<date>1995-07-21</date>
 </docinfo>
 -->
 
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
+<para>
+1995-07-21
+</para>
 <para>
 <programlisting>
 Incompatible changes:
@@ -3202,15 +3291,16 @@ New documentation:
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Thu May 25 16:54:46 PDT 1995
-</date>
+<date>1995-03-25</date>
 </docinfo>
 -->
 
 <sect2>
-<title>Detailed Change List</title>
+<title>Changes</title>
 
+<para>
+1995-03-25
+</para>
 <para>
 <programlisting>
 Incompatible changes:
@@ -3261,12 +3351,13 @@ The following bugs have been fixed in postgres95-beta-0.02:
 <surname>Momjian</surname>
 </author>
 </authorgroup>
-<date>
-Mon May 1 19:03:10 PDT 1995
-</date>
+<date>1995-05-01</date>
 </docinfo>
 -->
 
+<para>
+1995-05-01
+</para>
 <para>
 Initial release.
 </para>
diff --git a/register.txt b/register.txt
index c6590b095d49ec9a65d2bc2aaa4790782531c62a..1d6f1bb6eed81480f3f07028bcf8a5e5398399eb 100644
--- a/register.txt
+++ b/register.txt
@@ -1,5 +1,5 @@
 
-(2000-05-08)
+(2000-06-01)
 PostgreSQL has a Web site at http://www.postgresql.org/ which carries details
 on the latest release, upcoming features, and other information to make your
 work or play with PostgreSQL more productive.