Update for 7.0.2.

9 files changed, 96 insertions, 52 deletions

diff --git a/HISTORY b/HISTORY
index 784b09adb06..34fdd04f92f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,24 @@
                                 Release Notes
   ------------------------------------------------------------------------
 
+Release 7.0.2
+
+This is a repackaging of 7.0.1 with added documentation.
+
+Migration to v7.0.2
+
+A dump/restore is not required for those running 7.*.
+
+Changes
+-------
+Added documentation to tarball.
+
+
+  ------------------------------------------------------------------------
+                                                               Release 7.0.1
+                                Release Notes
+  ------------------------------------------------------------------------
+          
 Release 7.0.1
 
 This is basically a cleanup release for 7.0.1
diff --git a/INSTALL b/INSTALL
index 781b06f0deb..243b2956ad7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,11 +1,11 @@
-     Installation instructions for PostgreSQL 7.0.1.
+     Installation instructions for PostgreSQL 7.0.2.
 
 If you haven't gotten the PostgreSQL distribution, get it from
 ftp.postgresql.org, then unpack it:
 
-> gunzip postgresql-7.0.1.tar.gz
-> tar -xf postgresql-7.0.1.tar
-> mv postgresql-7.0.1 /usr/src
+> gunzip postgresql-7.0.2.tar.gz
+> tar -xf postgresql-7.0.2.tar
+> mv postgresql-7.0.2 /usr/src
 
 
 Before you start
@@ -138,10 +138,11 @@ For a fresh install or upgrading from previous releases of PostgreSQL:
      Test. (Be sure to use the "parallel regress test" method, since the
      sequential method only works with an already-installed server.)
 
-  5. If you are not upgrading an existing system then skip to step 7.
+  5. If you are not upgrading an existing system, skip to step 7.
+     If you are running 7.*, skip to step 6.
 
-     You now need to back up your existing database. To dump your fairly
-     recent post-6.0 database installation, type
+     You now need to back up your existing database. To dump your 
+     database installation, type:
 
      > pg_dumpall > db.out
 
@@ -151,13 +152,8 @@ For a fresh install or upgrading from previous releases of PostgreSQL:
      this (such as using OIDs as keys in tables), don't do it.
 
      Make sure to use the pg_dumpall command from the version you are
-     currently running. 7.0.1's pg_dumpall will not work on pre-7.0 databases.
-     However, if you are still using 6.0, do not use the pg_dumpall script
-     from 6.0 or everything will be owned by the PostgreSQL superuser after
-     you reload. In that case you should grab pg_dumpall from a later 6.x.x
-     release. If you are upgrading from a version prior to Postgres95 v1.09
-     then you must back up your database, install Postgres95 v1.09, restore
-     your database, then back it up again.
+     currently running. 7.0.2's pg_dumpall should not be used on older
+     databases.
 
                                         Caution
       You must make sure that your database is not updated in the middle of your
@@ -167,7 +163,7 @@ For a fresh install or upgrading from previous releases of PostgreSQL:
 
       Rather than using pg_dumpall, pg_upgrade can often be used.
 
-  6. If you are upgrading an existing system then kill the database server
+  6. If you are upgrading an existing system, kill the database server
      now. Type
 
      > ps ax | grep postmaster
@@ -299,7 +295,7 @@ For a fresh install or upgrading from previous releases of PostgreSQL:
 
 This concludes the installation proper. To make your life more productive
 and enjoyable you should look at the following optional steps and
-suggestions.
+suggestions:
 
    * Life will be more convenient if you set up some environment variables.
      First of all you probably want to include /usr/local/pgsql/bin (or
@@ -315,7 +311,7 @@ suggestions.
 
    * You probably want to install the man and HTML documentation. Type
 
-     > cd /usr/src/pgsql/postgresql-7.0.1/doc
+     > cd /usr/src/pgsql/postgresql-7.0.2/doc
      > gmake install
 
 
diff --git a/README b/README
index 04c0cbcb303..5bc810e387b 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
 PostgreSQL Data Base Management System (formerly known as Postgres, then
 as Postgres95).
   
-This directory contains the development version of 7.0.1 of the PostgreSQL
+This directory contains the development version of 7.0.2 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
diff --git a/doc/bug.template b/doc/bug.template
index e279c195533..211aafde949 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.1
+  PostgreSQL version (example: PostgreSQL-7.0):   PostgreSQL-7.0.2
 
   Compiler used (example:  gcc 2.8.0)		:
 
diff --git a/doc/src/sgml/install.sgml b/doc/src/sgml/install.sgml
index 0edb7a2d73c..f5df4948889 100644
--- a/doc/src/sgml/install.sgml
+++ b/doc/src/sgml/install.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/Attic/install.sgml,v 1.41.2.2 2000/06/01 05:58:56 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/install.sgml,v 1.41.2.3 2000/06/05 10:59:16 momjian Exp $
 -->
 
  <chapter id="install">
@@ -8,7 +8,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/install.sgml,v 1.41.2.2 2000/06/01 05
   <abstract>
    <para>
     Installation instructions for 
-    <productname>PostgreSQL</productname> 7.0.1.
+    <productname>PostgreSQL</productname> 7.0.2.
    </para>
   </abstract>
 
@@ -18,9 +18,9 @@ $Header: /cvsroot/pgsql/doc/src/sgml/Attic/install.sgml,v 1.41.2.2 2000/06/01 05
    then unpack it:
 
    <programlisting>
-&gt; gunzip postgresql-7.0.1.tar.gz
-&gt; tar -xf postgresql-7.0.1.tar
-&gt; mv postgresql-7.0.1 /usr/src
+&gt; gunzip postgresql-7.0.2.tar.gz
+&gt; tar -xf postgresql-7.0.2.tar
+&gt; mv postgresql-7.0.2 /usr/src
    </programlisting>
   </para>
 
@@ -241,16 +241,16 @@ All of PostgreSQL is successfully made. Ready to install.
 
     <step performance="required">
      <para>
-      If you are not upgrading an existing system then skip to 
+      If you are not upgrading an existing system, skip to 
       <xref linkend="continue">.
      </para>
      <para>
-     If you are running 7.0 or later, skip to
+     If you are running 7.*, skip to step
      <xref linkend="nodump">.
       </para>
      <para>
       You now need to back up your existing database.
-      To dump your fairly recent post-6.0 database installation, type
+      To dump your database installation, type:
       <programlisting>
 &gt; pg_dumpall > db.out
       </programlisting>
@@ -264,18 +264,8 @@ All of PostgreSQL is successfully made. Ready to install.
      <para>
       Make sure to use the <application>pg_dumpall</application>
       command from the version you are currently running.
-      7.0.1's <application>pg_dumpall</application> will not work on older databases.
-      However, if you are still using 6.0, do not use the
-      <application>pg_dumpall</application> script from 6.0 or everything will be
-      owned by the <productname>PostgreSQL</productname> superuser after you
-      reload. In that case
-      you should grab <application>pg_dumpall</application> from a later
-      6.x.x release.
-      If you are upgrading from a version prior to
-      <productname>Postgres95</productname> v1.09 then you must back
-      up your database,
-      install <productname>Postgres95</productname> v1.09, restore your database,
-      then back it up again.
+      7.0.2's <application>pg_dumpall</application> should not
+      be used on older databases.
      </para>
 
      <caution>
@@ -295,7 +285,7 @@ All of PostgreSQL is successfully made. Ready to install.
 
     <step performance="required" id="nodump">
      <para>
-      If you are upgrading an existing system then kill the database
+      If you are upgrading an existing system, kill the database
       server now. Type
       <programlisting>
 &gt; ps ax | grep postmaster
@@ -460,7 +450,7 @@ libpq.so.2.1: cannot open shared object file: No such file or directory
    <para>
     This concludes the installation proper. To make your life more
     productive and enjoyable
-    you should look at the following optional steps and suggestions.
+    you should look at the following optional steps and suggestions:
    </para>
 
    <itemizedlist>
@@ -493,7 +483,7 @@ libpq.so.2.1: cannot open shared object file: No such file or directory
       You probably want to install the <application>man</application> and
       <acronym>HTML</acronym> documentation. Type
       <programlisting>
-&gt; cd /usr/src/pgsql/postgresql-7.0.1/doc
+&gt; cd /usr/src/pgsql/postgresql-7.0.2/doc
 &gt; gmake install
       </programlisting>
       This will install files under <filename>/usr/local/pgsql/doc</filename>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 6f1884189e5..f57b7ef2780 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,11 +1,53 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.49.2.4 2000/06/02 16:34:42 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/release.sgml,v 1.49.2.5 2000/06/05 10:59:16 momjian Exp $
 -->
 
  <chapter id="release">
   <title>Release Notes</title>
 
 <sect1>
+<title>Release 7.0.2</title>
+<!--
+<docinfo>
+<authorgroup>
+<author>
+<firstname>Bruce</firstname>
+<surname>Momjian</surname>
+</author>
+</authorgroup>
+<date>2000-06-05</date>
+</docinfo>
+-->
+
+<para>
+2000-06-05
+</para>
+<para>
+This is a repackaging of 7.0.1 with added documentation.
+</para>
+
+
+<sect2>
+<title>Migration to v7.0.2</title>
+
+<para>
+A dump/restore is <emphasis>not</emphasis> required for those running
+7.*.
+</para>
+</sect2>
+<sect2>
+<title>Changes</title>
+
+<para>
+<programlisting>
+Added documentation to tarball.
+</programlisting>
+</para>
+</sect2>
+</sect1>
+
+
+<sect1>
 <title>Release 7.0.1</title>
 <!--
 <docinfo>
diff --git a/register.txt b/register.txt
index 1d6f1bb6eed..b830d3f8f30 100644
--- a/register.txt
+++ b/register.txt
@@ -1,5 +1,5 @@
 
-(2000-06-01)
+(2000-06-05)
 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.
@@ -21,5 +21,3 @@ following registration URL:
 
 Thank you for choosing PostgreSQL, the most advanced open source database 
 engine.
-
-
diff --git a/src/include/version.h.in b/src/include/version.h.in
index 37664412ae6..43fddab26b3 100644
--- a/src/include/version.h.in
+++ b/src/include/version.h.in
@@ -4,7 +4,7 @@
  *	  this file contains the interface to version.c.
  *	  Also some parameters.
  *
- * $Header: /cvsroot/pgsql/src/include/Attic/version.h.in,v 1.8.2.1 2000/06/01 05:14:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/include/Attic/version.h.in,v 1.8.2.2 2000/06/05 10:59:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@ void SetPgVersion(const char *path, char **reason_p);
 
 #define PG_RELEASE		"7"
 #define PG_VERSION		"0"
-#define PG_SUBVERSION		"1"
+#define PG_SUBVERSION		"2"
 
 #define PG_VERFILE		"PG_VERSION"
 
diff --git a/src/interfaces/libpq/libpq.rc b/src/interfaces/libpq/libpq.rc
index 79178a57a27..4ce5b215eb2 100644
--- a/src/interfaces/libpq/libpq.rc
+++ b/src/interfaces/libpq/libpq.rc
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,0,1,0
- PRODUCTVERSION 7,0,1,0
+ FILEVERSION 7,0,2,0
+ PRODUCTVERSION 7,0,2,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "7, 0, 1, 0\0"
+            VALUE "FileVersion", "7, 0, 2, 0\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2000\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "7, 0, 1, 0\0"
+            VALUE "ProductVersion", "7, 0, 2, 0\0"
         END
     END
     BLOCK "VarFileInfo"