[Python-checkins] r77208 - in python/branches/release31-maint: Doc/copyright.rst Doc/license.rst LICENSE Python/getcopyright.c README

[ezio.melotti]

Author: ezio.melotti
Date: Fri Jan  1 05:55:33 2010
New Revision: 77208

Log:
Merged revisions 77206-77207 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77206 | benjamin.peterson | 2010-01-01 06:47:54 +0200 (Fri, 01 Jan 2010) | 9 lines
  
  Merged revisions 77203 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r77203 | benjamin.peterson | 2009-12-31 22:00:55 -0600 (Thu, 31 Dec 2009) | 1 line
    
    update copyright year
  ........
................
  r77207 | benjamin.peterson | 2010-01-01 06:49:25 +0200 (Fri, 01 Jan 2010) | 9 lines
  
  Merged revisions 77204 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r77204 | ezio.melotti | 2009-12-31 22:16:42 -0600 (Thu, 31 Dec 2009) | 1 line
    
    more copyright year updates
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Doc/copyright.rst
   python/branches/release31-maint/Doc/license.rst
   python/branches/release31-maint/LICENSE
   python/branches/release31-maint/Python/getcopyright.c
   python/branches/release31-maint/README

Modified: python/branches/release31-maint/Doc/copyright.rst
==============================================================================
--- python/branches/release31-maint/Doc/copyright.rst	(original)
+++ python/branches/release31-maint/Doc/copyright.rst	Fri Jan  1 05:55:33 2010
@@ -4,7 +4,7 @@
 
 Python and this documentation is:
 
-Copyright © 2001-2009 Python Software Foundation. All rights reserved.
+Copyright © 2001-2010 Python Software Foundation. All rights reserved.
 
 Copyright © 2000 BeOpen.com. All rights reserved.
 

Modified: python/branches/release31-maint/Doc/license.rst
==============================================================================
--- python/branches/release31-maint/Doc/license.rst	(original)
+++ python/branches/release31-maint/Doc/license.rst	Fri Jan  1 05:55:33 2010
@@ -135,7 +135,7 @@
    analyze, test, perform and/or display publicly, prepare derivative works,
    distribute, and otherwise use Python |release| alone or in any derivative
    version, provided, however, that PSF's License Agreement and PSF's notice of
-   copyright, i.e., "Copyright © 2001-2009 Python Software Foundation; All Rights
+   copyright, i.e., "Copyright © 2001-2010 Python Software Foundation; All Rights
    Reserved" are retained in Python |release| alone or in any derivative version
    prepared by Licensee.
 

Modified: python/branches/release31-maint/LICENSE
==============================================================================
--- python/branches/release31-maint/LICENSE	(original)
+++ python/branches/release31-maint/LICENSE	Fri Jan  1 05:55:33 2010
@@ -100,9 +100,9 @@
 analyze, test, perform and/or display publicly, prepare derivative works,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Python
-Software Foundation; All Rights Reserved" are retained in Python alone or in any
-derivative version prepared by Licensee.
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python 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 or any part thereof, and wants to make

Modified: python/branches/release31-maint/Python/getcopyright.c
==============================================================================
--- python/branches/release31-maint/Python/getcopyright.c	(original)
+++ python/branches/release31-maint/Python/getcopyright.c	Fri Jan  1 05:55:33 2010
@@ -4,7 +4,7 @@
 
 static char cprt[] = 
 "\
-Copyright (c) 2001-2009 Python Software Foundation.\n\
+Copyright (c) 2001-2010 Python Software Foundation.\n\
 All Rights Reserved.\n\
 \n\
 Copyright (c) 2000 BeOpen.com.\n\

Modified: python/branches/release31-maint/README
==============================================================================
--- python/branches/release31-maint/README	(original)
+++ python/branches/release31-maint/README	Fri Jan  1 05:55:33 2010
@@ -1,7 +1,7 @@
 This is Python version 3.1.1
 ============================
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 Python Software Foundation.
 All rights reserved.