Add copyright mentions, per Tom Lane.

diff --git a/doc/FAQ_BSDI b/doc/FAQ_BSDI
deleted file mode 100644 (file)
index 030beb6..0000000
--- a/doc/FAQ_BSDI
+++ /dev/null
@@ -1,81 +0,0 @@
-This outlines modifications to BSD/OS for running PostgreSQL:
-
-1)  How to increase resource limits
-2)  How to increase the number of shared memory buffers
-3)  How to increasing the number of semaphores
-
-Bruce Momjian (pgman@candle.pha.pa.us)  2000-07-7
-
----------------------------------------------------------------------------
-
-1)  To increase the amount of malloc'ed memory and files opened by
-PostgreSQL, add this:
-
-          :datasize-cur=256M:\
-          :openfiles-cur=256:
-
-to your /etc/login.conf file.
-
----------------------------------------------------------------------------
-
-2a)  By default, only 4MB of shared memory is supported by BSDI. Keep in
-mind that shared memory is not pageable.  It is locked in RAM.
-
-The shared memory parameters are:
-
-#define SHMMAX         /* max shared memory segment size (bytes) */
-#define SHMMIN         /* min shared memory segment size (bytes) */
-#define SHMMNI         /* max number of shared memory identifiers */
-#define SHMSEG         /* max shared memory segments per process */
-#define SHMALL         /* max amount of shared memory (pages) */
-
-To increase the number of buffers supported by the postmaseter, add the
-following to your kernel config file.  A SHMALL value of 1024 
-represents 4MB of shared memory.  Increase it accordingly:
-
-options "SHMALL=4096"
-options "SHMMAX=\(SHMALL*PAGE_SIZE\)"
-
-For those running 4.1 or later, just recompile the kernel and reboot. 
-For those running earlier releases, see step 2b.
-
----------------------------------------------------------------------------
-
-2b)  For 4.01 and earlier, use bpatch to find the sysptsize value for
-the current kernel.  This is computed dynamically at bootup.
-
-       $ bpatch -r sysptsize
-       0x9 = 9
-
-Next, change SYSPTSIZE to a hard-coded value.  Use the bpatch value,
-plus add 1 for every additional 4MB of shared memory you desire.
-
-options "SYSPTSIZE=13"
-
-sysptsize can not be changed by sysctl on the fly.
-
----------------------------------------------------------------------------
-
-3)  How to increasing the number of semaphores.
-
-You may need to increase the number of sysv semaphores. By default,
-PostgreSQL allocates 32 semaphores, one for each backend connection. 
-This is just over half the default system total of 60.
-
-The defaults are in /sys/sys/sem.h:
-
-#define SEMMNI  10              /* # of semaphore identifiers */
-
-#define SEMMNS  60              /* # of semaphores in system */
-
-#define SEMUME  10              /* max # of undo entries per process */
-
-#define SEMMNU  30              /* # of undo structures in system */
-
-Set the values you want in your kernel config file, e.g.:
-
-options "SEMMNI=40"
-options "SEMMNS=240"
-options "SEMUME=40"
-options "SEMMNU=120"
-

diff --git a/src/bin/Makefile b/src/bin/Makefile
index fcd980b7711c2fa59378aef7cf9804b21bdb90e9..15e464ac96644f0e65f5f5db2f440cb9bbeb826c 100644 (file)
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin (client programs)
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 61cb3850ab3e91ce54409eb3ce5c90ce6e2d6f5b..6772cba091d85138c7d7775019a0aa303191313f 100644 (file)
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin/initdb
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 72d9bbc5602885eb1ac8886f0a6282090a5eabf6..4c4efb08da99303bd58d2df8ac97c869633532c6 100644 (file)
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -20,7 +20,8 @@
 # made just by copying the completed template1.
 #
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/initlocation/Makefile b/src/bin/initlocation/Makefile
index c41ac6beccd47ef2d65b622304c2322743315fca..95e664577655eb72106daadcb4db72cc77134cac 100644 (file)
--- a/src/bin/initlocation/Makefile
+++ b/src/bin/initlocation/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin/initlocation
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/initlocation/initlocation.sh b/src/bin/initlocation/initlocation.sh
index 5fdfb7edaec420b57a808bc9c998d861c0497473..81b3a90742856df46b1558e9d55b33e99879e00a 100644 (file)
--- a/src/bin/initlocation/initlocation.sh
+++ b/src/bin/initlocation/initlocation.sh
@@ -4,7 +4,8 @@
 # initlocation.sh--
 #     Create a secondary PostgreSQL database storage area.  
 # 
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION

diff --git a/src/bin/ipcclean/Makefile b/src/bin/ipcclean/Makefile
index 57a652a3c205eabf75ef45fddd45a1f489dba771..69dd6f03ca7a63424fcf3e593cedb9b8e9a147c5 100644 (file)
--- a/src/bin/ipcclean/Makefile
+++ b/src/bin/ipcclean/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin/ipcclean
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 1a348d39a8c41331ff1a8ce4ff0482ff1bd60081..fdb3b8aeacff6710a0c4840367472d230e1bfcf5 100644 (file)
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin/pg_dump
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 4808c2906a4d24cfc7347bc61d3cbeb280635a30..5d45cbe8459cf4a9551cfc794b9e633ddf6b7ea3 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -2,7 +2,10 @@
  *
  * pg_dump.c
  *       pg_dump is an utility for dumping out a postgres database
- * into a script file.
+ *    into a script file.
+ *
+ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
  *
  *     pg_dump will read the system catalogs in a database and
  *     dump out a script that reproduces
@@ -17,9 +20,6 @@
  *
  * the output script is SQL that is understood by PostgreSQL
  *
- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
  *
  * IDENTIFICATION
  *       $Header$

diff --git a/src/bin/pgaccess/Makefile b/src/bin/pgaccess/Makefile
index c1c4e5de76c957f308564b50c02efda00e900258..6648ec1cc2d9338a67f8830c6c33b3f007a8c7f1 100644 (file)
--- a/src/bin/pgaccess/Makefile
+++ b/src/bin/pgaccess/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin/pgaccess
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/pgaccess/README b/src/bin/pgaccess/README
index 818116ff44a053d6cb917bce3411e1ed596f217d..aa7e2744b4a64d500d3b92a811b38522816c86f0 100644 (file)
--- a/src/bin/pgaccess/README
+++ b/src/bin/pgaccess/README
@@ -1,6 +1,7 @@
 ---------------------------------------------------------------------------
 
-Copyright (c) 1994-7 Regents of the University of California
+Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+Portions Copyright (c) 1994, Regents of the University of California
 
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose, without fee, and without a written agreement

diff --git a/src/bin/pgaccess/copyright.html b/src/bin/pgaccess/copyright.html
index d67654b88e7ee4391fcbdae141f6fba9c787d8cb..6af94bd5b0d39f387ccecfe8ab65f5a4d74cc122 100644 (file)
--- a/src/bin/pgaccess/copyright.html
+++ b/src/bin/pgaccess/copyright.html
@@ -9,7 +9,8 @@
 <BR><TT></TT>&nbsp;
 <BR><TT></TT>&nbsp;<TT></TT>
 
-<P><TT>Copyright (c) 1994-7 Regents of the University of California</TT><TT></TT>
+<P><TT>Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group</TT>
+<P><TT>Portions Copyright (c) 1994, Regents of the University of California</TT>
 
 <P><TT>Permission to use, copy, modify, and distribute this software and
 its</TT>
@@ -17,7 +18,7 @@ its</TT>
 agreement</TT>
 <BR><TT>is hereby granted, provided that the above copyright notice and
 this</TT>
-<BR><TT>paragraph and the following two paragraphs appear in all copies.</TT><TT></TT>
+<BR><TT>paragraph and the following two paragraphs appear in all copies.</TT>
 
 <P><TT>IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY
 PARTY FOR</TT>
@@ -26,7 +27,7 @@ INCLUDING</TT>
 <BR><TT>LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS</TT>
 <BR><TT>DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED
 OF THE</TT>
-<BR><TT>POSSIBILITY OF SUCH DAMAGE.</TT><TT></TT>
+<BR><TT>POSSIBILITY OF SUCH DAMAGE.</TT>
 
 <P><TT>THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES,</TT>
 <BR><TT>INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY</TT>

diff --git a/src/bin/pgaccess/doc/html/copyright.html b/src/bin/pgaccess/doc/html/copyright.html
index d67654b88e7ee4391fcbdae141f6fba9c787d8cb..b624786e1a2bc7d5162495ce80d8711ecf8fa32b 100644 (file)
--- a/src/bin/pgaccess/doc/html/copyright.html
+++ b/src/bin/pgaccess/doc/html/copyright.html
@@ -9,7 +9,8 @@
 <BR><TT></TT>&nbsp;
 <BR><TT></TT>&nbsp;<TT></TT>
 
-<P><TT>Copyright (c) 1994-7 Regents of the University of California</TT><TT></TT>
+<P><TT>Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group</TT>
+<P><TT>Portions Copyright (c) 1994, Regents of the University of California</TT>
 
 <P><TT>Permission to use, copy, modify, and distribute this software and
 its</TT>

diff --git a/src/bin/pgaccess/lib/help/copyrights.hlp b/src/bin/pgaccess/lib/help/copyrights.hlp
index d81fd160a8b2f3b929ff90920f73164bba946a75..ffa49c7b2c20f3a5fe30051a72b672ddd7bfb6f7 100644 (file)
--- a/src/bin/pgaccess/lib/help/copyrights.hlp
+++ b/src/bin/pgaccess/lib/help/copyrights.hlp
@@ -1,9 +1,11 @@
 .pgaw:Help.f.t insert end \
 "Copyrights\n\n" {title} \
 "
-PostgreSQL is Copyright © 1996-9 by the PostgreSQL Global Development Group, and is distributed under the terms of the Berkeley license. 
+PostgreSQL is Copyright © 1996-2001,  PostgreSQL Global Development Group.
 
-Postgres95 is Copyright © 1994-5 by the Regents of the University of California. Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. 
+Postgres95 is Copyright © 1994, Regents of the University of California.
+
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. 
 
 In no event shall the University of California be liable to any party for direct, indirect, special, incidental, or consequential damages, including lost profits, arising out of the use of this software and its documentation, even if the University of California has been advised of the possibility of such damage. 
 

diff --git a/src/bin/pgtclsh/Makefile b/src/bin/pgtclsh/Makefile
index 9776b750c6c234a1d47b900442b27fbd4e2f1c82..cdc7f9139233a16d803e51fdfcf73f22b28b0328 100644 (file)
--- a/src/bin/pgtclsh/Makefile
+++ b/src/bin/pgtclsh/Makefile
@@ -3,7 +3,8 @@
 # Makefile for src/bin/pgtclsh
 # (a tclsh workalike with pgtcl commands installed)
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/pgtclsh/pgtclAppInit.c b/src/bin/pgtclsh/pgtclAppInit.c
index 8967a4a5c21583456bcdab433a9e3ff898fcd522..487e11eaf5e2ee35801687b012f9891688495253 100644 (file)
--- a/src/bin/pgtclsh/pgtclAppInit.c
+++ b/src/bin/pgtclsh/pgtclAppInit.c
@@ -1,6 +1,5 @@
 /*
  * pgtclAppInit.c
- *
  *             a skeletal Tcl_AppInit that provides pgtcl initialization
  *       to create a tclsh that can talk to pglite backends
  *

diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 9acb30423c0b57218062197b5294cb40b75bb05a..f434c70af8d8ec2bb2bf9ce22765ce1abd151f7c 100644 (file)
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin/psql
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index 8c50ed8ca5a8187fd01fe89225a044062d537ece..e826c386ecbdf76d02da6af9e1e66404446d12e7 100644 (file)
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -2,7 +2,8 @@
 #
 # Makefile for src/bin/scripts
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 # $Header$
 #

diff --git a/src/bin/scripts/createlang.sh b/src/bin/scripts/createlang.sh
index 113bb09247f1f3292120e2f4ed2f138d6697603e..7e9249c22382e44de34368b38fbe1e1ceebdce94 100644 (file)
--- a/src/bin/scripts/createlang.sh
+++ b/src/bin/scripts/createlang.sh
@@ -4,7 +4,8 @@
 # createlang.sh--
 #    Install a procedural language in a database
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION

diff --git a/src/bin/scripts/createuser b/src/bin/scripts/createuser
index e3b9d4384f3e7b1c090f7ca1d06fc4c27d993496..bcacb595234ec181c1c6288ce308d84bab8b147e 100644 (file)
--- a/src/bin/scripts/createuser
+++ b/src/bin/scripts/createuser
@@ -4,7 +4,8 @@
 # createuser--
 #    Utility for creating a user in the PostgreSQL database
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION

diff --git a/src/bin/scripts/dropdb b/src/bin/scripts/dropdb
index b9179b1d84cd5274bd282ca2024da31171f8bfb7..5f24e9a74ef4b7de3b8fdf4a48a333fe14232637 100644 (file)
--- a/src/bin/scripts/dropdb
+++ b/src/bin/scripts/dropdb
@@ -6,7 +6,8 @@
 #
 #    this program runs psql to drop the requested database.
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION

diff --git a/src/bin/scripts/droplang b/src/bin/scripts/droplang
index e986f0af5e3a9b2ffb6aa6d394a24e54a0562403..c6196b8ae0f3162c70bf7551ae4bcf7516f097ba 100644 (file)
--- a/src/bin/scripts/droplang
+++ b/src/bin/scripts/droplang
@@ -4,7 +4,8 @@
 # createlang--
 #    Remove a procedural language from a database
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION

diff --git a/src/bin/scripts/dropuser b/src/bin/scripts/dropuser
index 96d3565defc0ae8a3457bc4eb741842878e64c61..ef392888ee06f820fa2ca80d67ad02b6eef40f2c 100644 (file)
--- a/src/bin/scripts/dropuser
+++ b/src/bin/scripts/dropuser
@@ -4,7 +4,8 @@
 # dropuser--
 #    Utility for removing a user from the PostgreSQL database.
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION

diff --git a/src/bin/scripts/vacuumdb b/src/bin/scripts/vacuumdb
index 46ab61d404eab7ce86667a1b968da090edd52150..f6de59b3810b6d3422c6128a3611a47106d8554f 100644 (file)
--- a/src/bin/scripts/vacuumdb
+++ b/src/bin/scripts/vacuumdb
@@ -7,7 +7,8 @@
 #    This script runs psql with the "-c" option to vacuum
 #    the requested database.
 #
-# Copyright (c) 1994, Regents of the University of California
+# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION