Update for 7.0.2.

diff --git a/INSTALL b/INSTALL
index 243b2956ad7965eb7da8af9a1c2d4dfa80cdc728..75b9aa9a645c0c29b4cab0494fa9a1d4d0c2f921 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -199,7 +199,7 @@ For a fresh install or upgrading from previous releases of PostgreSQL:
 
           works.
 
-     If you used pg_dumpall, move the old directories out of the
+     If you used pg_dumpall, move the old directory out of the
      way.  Type the following:
 
      > mv /usr/local/pgsql /usr/local/pgsql.old
@@ -250,7 +250,8 @@ For a fresh install or upgrading from previous releases of PostgreSQL:
 
      then the above was necessary. Simply do this step then.
 
-  9. Create the database installation (the working data files). To do this
+  9. If you moved the old directory out of the way, 
+     create the database installation (the working data files). To do this
      you must log in to your PostgreSQL superuser account. It will not work
      as root.
 

diff --git a/doc/src/sgml/install.sgml b/doc/src/sgml/install.sgml
index 7d33a6575b6f73fcfc9b1e8e45d4ac5176dde30f..50fe9695d48eab265101768455fb80be14d811bf 100644 (file)
--- 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.44 2000/06/05 10:57:57 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/Attic/install.sgml,v 1.45 2000/06/05 17:07:53 momjian Exp $
 -->
 
  <chapter id="install">
@@ -326,7 +326,7 @@ All of PostgreSQL is successfully made. Ready to install.
      </tip>
 
      <para>
-      If you used pg_dumpall, move the old directories out of the way.
+      If you used pg_dumpall, move the old directory out of the way.
       Type the following:      
 <programlisting>
 &gt; mv /usr/local/pgsql /usr/local/pgsql.old
@@ -392,7 +392,8 @@ libpq.so.2.1: cannot open shared object file: No such file or directory
 
     <step performance="required">
      <para>
-      Create the database installation (the working data files).
+      If you moved the old directory out of the way, 
+      create the database installation (the working data files).
       To do this you must log in to your
       <productname>PostgreSQL</productname> superuser account. It will not
       work as root.

diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 68773ba14e710c93766b342e8a0dcf30573cd018..d495b186cc53778f9b6f44b1dac7ddc3e0ccf297 100644 (file)
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.111 2000/06/05 07:28:42 tgl Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.112 2000/06/05 17:07:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -307,7 +307,7 @@ DoCopy(char *relname, bool binary, bool oids, bool from, bool pipe,
        if (from)
        {                                                       /* copy from file to database */
                if (rel->rd_rel->relkind == RELKIND_SEQUENCE)
-                       elog(ERROR, "You can't change sequence relation %s", relname);
+                       elog(ERROR, "You cannot change sequence relation %s", relname);
                if (pipe)
                {
                        if (IsUnderPostmaster)