summaryrefslogtreecommitdiffstats
path: root/Misc/COPYRIGHT
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1996-10-25 13:45:43 (GMT)
committerGuido van Rossum <guido@python.org>1996-10-25 13:45:43 (GMT)
commit130575dc8029bad627eac0445fcea93bd73cf2b5 (patch)
tree0919cbfedbdf379479adbd0cd8f083d7ec40e434 /Misc/COPYRIGHT
parent6240b0b7734e94cec89619745dd79b1254ffc56c (diff)
downloadcpython-130575dc8029bad627eac0445fcea93bd73cf2b5.zip
cpython-130575dc8029bad627eac0445fcea93bd73cf2b5.tar.gz
cpython-130575dc8029bad627eac0445fcea93bd73cf2b5.tar.bz2
CNRI additions, approved by the boss and his wife :-)
Diffstat (limited to 'Misc/COPYRIGHT')
-rw-r--r--Misc/COPYRIGHT25
1 files changed, 16 insertions, 9 deletions
diff --git a/Misc/COPYRIGHT b/Misc/COPYRIGHT
index 4d6bc30..20c2f87 100644
--- a/Misc/COPYRIGHT
+++ b/Misc/COPYRIGHT
@@ -8,13 +8,20 @@ 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 not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
+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.
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM 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.
+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.