##// END OF EJS Templates
Merge pull request #4096 from ivanov/minor-doc...
Min RK -
r12294:a2efd865 merge
parent child Browse files
Show More
@@ -1,97 +1,98 b''
1 .. _license:
1 .. _license:
2
2
3 =====================
3 =====================
4 License and Copyright
4 License and Copyright
5 =====================
5 =====================
6
6
7 License
7 License
8 =======
8 =======
9
9
10 IPython is licensed under the terms of the new or revised BSD license, as
10 IPython is licensed under the terms of the new or revised BSD license, as
11 follows::
11 follows::
12
12
13 Copyright (c) 2011, IPython Development Team
13 Copyright (c) 2011, IPython Development Team
14
14
15 All rights reserved.
15 All rights reserved.
16
16
17 Redistribution and use in source and binary forms, with or without
17 Redistribution and use in source and binary forms, with or without
18 modification, are permitted provided that the following conditions are
18 modification, are permitted provided that the following conditions are
19 met:
19 met:
20
20
21 Redistributions of source code must retain the above copyright notice,
21 Redistributions of source code must retain the above copyright notice,
22 this list of conditions and the following disclaimer.
22 this list of conditions and the following disclaimer.
23
23
24 Redistributions in binary form must reproduce the above copyright notice,
24 Redistributions in binary form must reproduce the above copyright notice,
25 this list of conditions and the following disclaimer in the documentation
25 this list of conditions and the following disclaimer in the documentation
26 and/or other materials provided with the distribution.
26 and/or other materials provided with the distribution.
27
27
28 Neither the name of the IPython Development Team nor the names of its
28 Neither the name of the IPython Development Team nor the names of its
29 contributors may be used to endorse or promote products derived from this
29 contributors may be used to endorse or promote products derived from this
30 software without specific prior written permission.
30 software without specific prior written permission.
31
31
32 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
32 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
33 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
33 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
34 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
34 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
35 PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
35 PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
36 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
36 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
37 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
37 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
38 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
38 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
39 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
39 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
40 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
40 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
41 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
41 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
42 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
42 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
43
43
44 About the IPython Development Team
44 About the IPython Development Team
45 ==================================
45 ==================================
46
46
47 Fernando Perez began IPython in 2001 based on code from Janko Hauser
47 Fernando Perez began IPython in 2001 based on code from Janko Hauser
48 <jhauser-AT-zscout.de> and Nathaniel Gray <n8gray-AT-caltech.edu>. Fernando is still
48 <jhauser-AT-zscout.de> and Nathaniel Gray <n8gray-AT-caltech.edu>. Fernando is still
49 the project lead.
49 the project lead.
50
50
51 The IPython Development Team is the set of all contributors to the IPython
51 The IPython Development Team is the set of all contributors to the IPython
52 project. This includes all of the IPython subprojects. Here is a list of the
52 project. This includes all of the IPython subprojects. Here is a list of the
53 currently active contributors:
53 currently active contributors:
54
54
55 * Matthieu Brucher
55 * Matthieu Brucher
56 * Ondrej Certik
56 * Ondrej Certik
57 * Laurent Dufrechou
57 * Laurent Dufrechou
58 * Robert Kern
58 * Robert Kern
59 * Thomas Kluyver
59 * Thomas Kluyver
60 * Brian E. Granger
60 * Brian E. Granger
61 * Paul Ivanov
61 * Evan Patterson
62 * Evan Patterson
62 * Fernando Perez (project leader)
63 * Fernando Perez (project leader)
63 * Benjamin Ragan-Kelley
64 * Benjamin Ragan-Kelley
64 * Ville M. Vainio
65 * Ville M. Vainio
65 * Gael Varoququx
66 * Gael Varoququx
66 * Stefan van der Walt
67 * Stefan van der Walt
67 * Barry Wark
68 * Barry Wark
68
69
69 If your name is missing, please add it.
70 If your name is missing, please add it.
70
71
71 Our Copyright Policy
72 Our Copyright Policy
72 ====================
73 ====================
73
74
74 IPython uses a shared copyright model. Each contributor maintains copyright
75 IPython uses a shared copyright model. Each contributor maintains copyright
75 over their contributions to IPython. But, it is important to note that these
76 over their contributions to IPython. But, it is important to note that these
76 contributions are typically only changes (diffs/commits) to the repositories.
77 contributions are typically only changes (diffs/commits) to the repositories.
77 Thus, the IPython source code, in its entirety is not the copyright of any
78 Thus, the IPython source code, in its entirety is not the copyright of any
78 single person or institution. Instead, it is the collective copyright of the
79 single person or institution. Instead, it is the collective copyright of the
79 entire IPython Development Team. If individual contributors want to maintain a
80 entire IPython Development Team. If individual contributors want to maintain a
80 record of what changes/contributions they have specific copyright on, they
81 record of what changes/contributions they have specific copyright on, they
81 should indicate their copyright in the commit message of the change, when they
82 should indicate their copyright in the commit message of the change, when they
82 commit the change to one of the IPython repositories.
83 commit the change to one of the IPython repositories.
83
84
84 Any new code contributed to IPython must be licensed under the BSD license or
85 Any new code contributed to IPython must be licensed under the BSD license or
85 a similar (MIT) open source license.
86 a similar (MIT) open source license.
86
87
87 Miscellaneous
88 Miscellaneous
88 =============
89 =============
89
90
90 Some files (DPyGetOpt.py, for example) may be licensed under different
91 Some files (DPyGetOpt.py, for example) may be licensed under different
91 conditions. Ultimately each file indicates clearly the conditions under which
92 conditions. Ultimately each file indicates clearly the conditions under which
92 its author/authors have decided to publish the code.
93 its author/authors have decided to publish the code.
93
94
94 Versions of IPython up to and including 0.6.3 were released under the GNU
95 Versions of IPython up to and including 0.6.3 were released under the GNU
95 Lesser General Public License (LGPL), available at
96 Lesser General Public License (LGPL), available at
96 http://www.gnu.org/copyleft/lesser.html.
97 http://www.gnu.org/copyleft/lesser.html.
97
98
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now