Update psql's \copyright to match the text we have in the COPYRIGHT file.

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index a00038b8f87019a8b04c5574caa1931f1a642347..2647b1081fab8d1855b553395501c418090429aa 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -425,24 +425,23 @@ void
 print_copyright(void)
 {
    puts(
-        "PostgreSQL Data Base Management System\n\n"
+        "PostgreSQL Database Management System\n"
+        "(formerly known as Postgres, then as Postgres95)\n\n"
         "Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group\n\n"
-        "This software is based on Postgres95, formerly known as Postgres, which\n"
-        "contains the following notice:\n\n"
-   "Portions Copyright(c) 1994, Regents of the University of California\n\n"
+        "Portions Copyright (c) 1994, The Regents of the University of California\n\n"
    "Permission to use, copy, modify, and distribute this software and its\n"
         "documentation for any purpose, without fee, and without a written agreement\n"
-        "is hereby granted, provided that the above copyright notice and this paragraph\n"
-        "and the following two paragraphs appear in all copies.\n\n"
+    "is hereby granted, provided that the above copyright notice and this\n"
+      "paragraph and the following two paragraphs appear in all copies.\n\n"
         "IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR\n"
-        "DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST\n"
-        "PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF\n"
-        "THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n"
-        "DAMAGE.\n\n"
-        "THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,\n"
-        "BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\n"
-        "PARTICULAR PURPOSE.THE SOFTWARE PROVIDED HEREUNDER IS ON AN \"AS IS\" BASIS,\n"
-        "AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,\n"
-        "SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS."
+        "DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING\n"
+        "LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS\n"
+        "DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE\n"
+        "POSSIBILITY OF SUCH DAMAGE.\n\n"
+     "THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,\n"
+        "INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY\n"
+        "AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS\n"
+        "ON AN \"AS IS\" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO\n"
+   "PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.\n"
        );
 }