3 files changed, 19 insertions, 74 deletions
diff --git a/BeOS/dl_export.h b/BeOS/dl_export.h
index efe7f1e..d65d534 100644
--- a/BeOS/dl_export.h
+++ b/BeOS/dl_export.h
@@ -9,28 +9,13 @@
  * This trivial header is released under the same license as the rest of
  * Python:
  *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the names of Stichting Mathematisch
- * Centrum or CWI or Corporation for National Research Initiatives or
- * CNRI not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- *
- * While CWI is the initial source for this software, a modified version
- * is made available by the Corporation for National Research Initiatives
- * (CNRI) at the Internet address ftp://ftp.python.org.
- *
- * STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
- * CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * Copyright (c) 2000, BeOpen.com.
+ * Copyright (c) 1995-2000, Corporation for National Research Initiatives.
+ * Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
+ * All rights reserved.
+ * 
+ * See the file "Misc/COPYRIGHT" for information on usage and
+ * redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * - Chris Herborth (chrish@beoscentral.com)
  *   January 11, 1999
diff --git a/Makefile.in b/Makefile.in
index fa21a91..5a333f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,31 +1,11 @@
 ########################################################################
-# Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
-# The Netherlands.
-#
-#                         All Rights Reserved
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted,
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in
-# supporting documentation, and that the names of Stichting Mathematisch
-# Centrum or CWI or Corporation for National Research Initiatives or
-# CNRI not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior
-# permission.
+# Copyright (c) 2000, BeOpen.com.
+# Copyright (c) 1995-2000, Corporation for National Research Initiatives.
+# Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
+# All rights reserved.
 # 
-# While CWI is the initial source for this software, a modified version
-# is made available by the Corporation for National Research Initiatives
-# (CNRI) at the Internet address ftp://ftp.python.org.
-# 
-# STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
-# CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
+# See the file "Misc/COPYRIGHT" for information on usage and
+# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 ########################################################################
 
 # Top-level Makefile for Python
diff --git a/Modules/cgen.py b/Modules/cgen.py
index c032962..6403eae 100644
--- a/Modules/cgen.py
+++ b/Modules/cgen.py
@@ -1,31 +1,11 @@
 ########################################################################
-# Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
-# The Netherlands.
-#
-#                         All Rights Reserved
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose and without fee is hereby granted,
-# provided that the above copyright notice appear in all copies and that
-# both that copyright notice and this permission notice appear in
-# supporting documentation, and that the names of Stichting Mathematisch
-# Centrum or CWI or Corporation for National Research Initiatives or
-# CNRI not be used in advertising or publicity pertaining to
-# distribution of the software without specific, written prior
-# permission.
-# 
-# While CWI is the initial source for this software, a modified version
-# is made available by the Corporation for National Research Initiatives
-# (CNRI) at the Internet address ftp://ftp.python.org.
+# Copyright (c) 2000, BeOpen.com.
+# Copyright (c) 1995-2000, Corporation for National Research Initiatives.
+# Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
+# All rights reserved.
 # 
-# STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
-# CENTRUM OR CNRI BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
+# See the file "Misc/COPYRIGHT" for information on usage and
+# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 ########################################################################
 
 # Python script to parse cstubs file for gl and generate C stubs.