Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reflow license file and update with link to Github IPython org page.

  • Loading branch information...
commit 5901fcd0db227da8d0f02d0f5660bd800aa146c3 1 parent 5abd884
@fperez authored
Showing with 61 additions and 53 deletions.
  1. +61 −53 COPYING.txt
View
114 COPYING.txt
@@ -1,77 +1,85 @@
-IPython is licensed under the terms of the new or revised BSD license, as follows:
+=============================
+ The IPython licensing terms
+=============================
-Copyright (c) 2008, IPython Development Team
+IPython is licensed under the terms of the Modified BSD License (also known as
+New or Revised BSD), as follows:
+
+Copyright (c) 2008-2010, IPython Development Team
+Copyright (c) 2001-2007, Fernando Perez. <fernando.perez@colorado.edu>
+Copyright (c) 2001, Janko Hauser <jhauser@zscout.de>
+Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu>
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer.
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list
-of conditions and the following disclaimer in the documentation and/or other
-materials provided with the distribution.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
-Neither the name of the IPython Development Team nor the names of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
+Neither the name of the IPython Development Team nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
About the IPython Development Team
----------------------------------
-Fernando Perez began IPython in 2001 based on code from Janko Hauser <jhauser@zscout.de>
-and Nathaniel Gray <n8gray@caltech.edu>. Fernando is still the project lead.
+Fernando Perez began IPython in 2001 based on code from Janko Hauser
+<jhauser@zscout.de> and Nathaniel Gray <n8gray@caltech.edu>. Fernando is still
+the project lead.
+
+The IPython Development Team is the set of all contributors to the IPython
+project. This includes all of the IPython subprojects. A full list with
+details is kept in the documentation directory, in the file
+``about/credits.txt``.
-The IPython Development Team is the set of all contributors to the IPython project.
-This includes all of the IPython subprojects. Here is a list of the currently active contributors:
+The core team that coordinates development on GitHub can be found here:
+http://github.com/ipython. As of late 2010, it consists of:
- * Matthieu Brucher
- * Ondrej Certik
- * Laurent Dufrechou
- * Robert Kern
- * Brian E. Granger
- * Fernando Perez (project leader)
- * Benjamin Ragan-Kelley
- * Ville M. Vainio
- * Gael Varoququx
- * Stefan van der Walt
- * Tech-X Corporation
- * Barry Wark
+* Brian E. Granger
+* Jonathan March
+* Evan Patterson
+* Fernando Perez
+* Min Ragan-Kelley
+* Robert Kern
-If your name is missing, please add it.
Our Copyright Policy
--------------------
-IPython uses a shared copyright model. Each contributor maintains copyright over
-their contributions to IPython. But, it is important to note that these
+IPython uses a shared copyright model. Each contributor maintains copyright
+over their contributions to IPython. But, it is important to note that these
contributions are typically only changes to the repositories. Thus, the IPython
source code, in its entirety is not the copyright of any single person or
-institution. Instead, it is the collective copyright of the entire IPython
-Development Team. If individual contributors want to maintain a record of what
-changes/contributions they have specific copyright on, they should indicate their
-copyright in the commit message of the change, when they commit the change to
-one of the IPython repositories.
+institution. Instead, it is the collective copyright of the entire IPython
+Development Team. If individual contributors want to maintain a record of what
+changes/contributions they have specific copyright on, they should indicate
+their copyright in the commit message of the change, when they commit the
+change to one of the IPython repositories.
-With this in mind, the following banner should be used in any source code file to
-indicate the copyright and license terms:
+With this in mind, the following banner should be used in any source code file
+to indicate the copyright and license terms:
-#-------------------------------------------------------------------------------
-# Copyright (C) 2008 The IPython Development Team
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010, IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
#
-# Distributed under the terms of the BSD License. The full license is in
-# the file COPYING, distributed as part of this software.
-#-------------------------------------------------------------------------------
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
Please sign in to comment.
Something went wrong with that request. Please try again.