diff --git a/Doc/README b/Doc/README index 38edc80a98f..484fce61537 100644 --- a/Doc/README +++ b/Doc/README @@ -229,7 +229,7 @@ The Python source is copyrighted, but you can freely use and copy it as long as you don't change or remove the copyright notice: ---------------------------------------------------------------------- -Copyright (c) 2000-2004 Python Software Foundation. +Copyright (c) 2000-2006 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. diff --git a/Doc/commontex/license.tex b/Doc/commontex/license.tex index 6e1c0d53ff5..525ce8a1b8a 100644 --- a/Doc/commontex/license.tex +++ b/Doc/commontex/license.tex @@ -48,6 +48,7 @@ GPL-compatible; the table below summarizes the various releases. \linev{2.3.5}{2.3.4}{2005}{PSF}{yes} \linev{2.4}{2.3}{2004}{PSF}{yes} \linev{2.4.1}{2.4}{2005}{PSF}{yes} + \linev{2.4.2}{2.4.1}{2005}{PSF}{yes} \end{tablev} \note{GPL-compatible doesn't mean that we're distributing @@ -78,7 +79,7 @@ license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python \version{} alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., -``Copyright \copyright{} 2001-2004 Python Software Foundation; All +``Copyright \copyright{} 2001-2006 Python Software Foundation; All Rights Reserved'' are retained in Python \version{} alone or in any derivative version prepared by Licensee. diff --git a/LICENSE b/LICENSE index a013fb9b16e..f0fc62a6c2f 100644 --- a/LICENSE +++ b/LICENSE @@ -86,7 +86,7 @@ license to reproduce, 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 Python Software Foundation; All Rights +2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights Reserved" are retained in Python alone or in any derivative version prepared by Licensee. diff --git a/Misc/developers.txt b/Misc/developers.txt index 52ef8feaa20..8d75eb4eb48 100644 --- a/Misc/developers.txt +++ b/Misc/developers.txt @@ -27,7 +27,7 @@ Permissions History are expected to work primarily in nondist/sandbox and have their work reviewed before making updates to active code. -- Reinhold Birkenfeld was given SF tracker permissions on 28 May 2005 +- Georg Brandl was given SF tracker permissions on 28 May 2005 by RDH. Since the beginning of 2005, he has been active in discussions on python-dev and has submitted a dozen patch reviews. The permissions add the ability to change tracker status and to attach patches. On diff --git a/PC/python_nt.rc b/PC/python_nt.rc index 91e373ff8e0..a4e97fd3b65 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -61,7 +61,7 @@ BEGIN VALUE "FileDescription", "Python Core\0" VALUE "FileVersion", PYTHON_VERSION VALUE "InternalName", "Python DLL\0" - VALUE "LegalCopyright", "Copyright © 2001-2005 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" + VALUE "LegalCopyright", "Copyright © 2001-2006 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "ProductName", "Python\0" VALUE "ProductVersion", PYTHON_VERSION diff --git a/Python/getcopyright.c b/Python/getcopyright.c index 2df7d2789d6..325aee51f99 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static char cprt[] = "\ -Copyright (c) 2001-2005 Python Software Foundation.\n\ +Copyright (c) 2001-2006 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ diff --git a/README b/README index 709af6215c0..c2408bdcebb 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ This is Python version 2.5 alpha 0 ================================== -Copyright (c) 2001, 2002, 2003, 2004, 2005 Python Software Foundation. +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com.