diff --git a/docs/source/about/credits.txt b/docs/source/about/credits.txt index c54e389..95c7b0c 100644 --- a/docs/source/about/credits.txt +++ b/docs/source/about/credits.txt @@ -37,6 +37,12 @@ developers: * **Jörgen Stenarson** Maintainer of the PyReadline project, which is needed for IPython under windows. +* **Thomas Kluyver** Port of IPython and its necessary ZeroMQ + infrastructure to Python3, IPython core. + +* **Evan Patterson** Qt console frontend with ZeroMQ. + + Special thanks ============== @@ -109,11 +115,6 @@ let us know if we have omitted your name by accident: * Mark Voorhies Printing support in Qt console. -* Thomas Kluyver Port of IPython and its necessary ZeroMQ - infrastructure to Python3. - -* Evan Patterson Qt console frontend with ZeroMQ. - * Justin Riley Contributions to parallel support, Amazon EC2, Sun Grid Engine, documentation. diff --git a/docs/source/about/license_and_copyright.txt b/docs/source/about/license_and_copyright.txt index e88da84..a8adca2 100644 --- a/docs/source/about/license_and_copyright.txt +++ b/docs/source/about/license_and_copyright.txt @@ -10,7 +10,7 @@ License IPython is licensed under the terms of the new or revised BSD license, as follows:: - Copyright (c) 2008, IPython Development Team + Copyright (c) 2011, IPython Development Team All rights reserved. @@ -56,7 +56,9 @@ currently active contributors: * Ondrej Certik * Laurent Dufrechou * Robert Kern +* Thomas Kluyver * Brian E. Granger +* Evan Patterson * Fernando Perez (project leader) * Benjamin Ragan-Kelley * Ville M. Vainio