backport my checkin of

    revision 1.19 of LICENSE
    revision 1.140 of README

Add 2002 to PSF copyrights.

+ some other branch specific stuff.

diff --git a/LICENSE b/LICENSE
index f7c869124075710b8323ed3333fb743379f67227..b11a335f9d8bf8b8c2a561a6b086ddb51e0ef2ef 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -36,6 +36,7 @@ the various releases.
     2.0.1           2.0+1.6.1   2001        PSF         yes
     2.1.1           2.1+2.0.1   2001        PSF         yes
     2.2             2.1.1       2001        PSF         yes
+    2.2.1           2.2         2002        PSF         yes
 
 Footnotes:
 
@@ -66,8 +67,9 @@ license to reproduce, analyze, test, perform and/or display publicly,
 prepare derivative works, distribute, and otherwise use Python 2.2
 alone or in any derivative version, provided, however, that PSF's
 License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001 Python Software Foundation; All Rights Reserved" are retained in
-Python 2.2 alone or in any derivative version prepared by Licensee.
+2001, 2002 Python Software Foundation; All Rights Reserved" are
+retained in Python 2.2 alone or in any derivative version prepared by
+Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python 2.2 or any part thereof, and wants to make

diff --git a/README b/README
index 277d3e07aca70e0588d58dbd71e3631f4cba5989..ee57182b663c984e6521af533be4cbee621c2711 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is Python version 2.2
-==========================
+This is Python version 2.2.1
+============================
 
-Copyright (c) 2001 Python Software Foundation.
+Copyright (c) 2001, 2002 Python Software Foundation.
 All rights reserved.
 
 Copyright (c) 2000 BeOpen.com.