Show More
@@ -3,12 +3,12 b'' | |||||
3 | ============================= |
|
3 | ============================= | |
4 |
|
4 | |||
5 | IPython is licensed under the terms of the Modified BSD License (also known as |
|
5 | IPython is licensed under the terms of the Modified BSD License (also known as | |
6 | New or Revised BSD), as follows: |
|
6 | New or Revised or 3-Clause BSD), as follows: | |
7 |
|
7 | |||
8 |
Copyright (c) 2008-201 |
|
8 | - Copyright (c) 2008-2014, IPython Development Team | |
9 |
Copyright (c) 2001-2007, Fernando Perez |
|
9 | - Copyright (c) 2001-2007, Fernando Perez <fernando.perez@colorado.edu> | |
10 | Copyright (c) 2001, Janko Hauser <jhauser@zscout.de> |
|
10 | - Copyright (c) 2001, Janko Hauser <jhauser@zscout.de> | |
11 | Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu> |
|
11 | - Copyright (c) 2001, Nathaniel Gray <n8gray@caltech.edu> | |
12 |
|
12 | |||
13 | All rights reserved. |
|
13 | All rights reserved. | |
14 |
|
14 | |||
@@ -50,15 +50,7 b' details is kept in the documentation directory, in the file' | |||||
50 | ``about/credits.txt``. |
|
50 | ``about/credits.txt``. | |
51 |
|
51 | |||
52 | The core team that coordinates development on GitHub can be found here: |
|
52 | The core team that coordinates development on GitHub can be found here: | |
53 | http://github.com/ipython. As of late 2010, it consists of: |
|
53 | https://github.com/ipython/. | |
54 |
|
||||
55 | * Brian E. Granger |
|
|||
56 | * Jonathan March |
|
|||
57 | * Evan Patterson |
|
|||
58 | * Fernando Perez |
|
|||
59 | * Min Ragan-Kelley |
|
|||
60 | * Robert Kern |
|
|||
61 |
|
||||
62 |
|
54 | |||
63 | Our Copyright Policy |
|
55 | Our Copyright Policy | |
64 | -------------------- |
|
56 | -------------------- | |
@@ -73,13 +65,10 b' changes/contributions they have specific copyright on, they should indicate' | |||||
73 | their copyright in the commit message of the change, when they commit the |
|
65 | their copyright in the commit message of the change, when they commit the | |
74 | change to one of the IPython repositories. |
|
66 | change to one of the IPython repositories. | |
75 |
|
67 | |||
76 | With this in mind, the following banner should be used in any source code file |
|
68 | With this in mind, the following banner should be used in any source code file | |
77 | to indicate the copyright and license terms: |
|
69 | to indicate the copyright and license terms: | |
78 |
|
70 | |||
79 | #----------------------------------------------------------------------------- |
|
71 | :: | |
80 | # Copyright (c) 2010, IPython Development Team. |
|
72 | ||
81 | # |
|
73 | # Copyright (c) IPython Development Team. | |
82 |
|
|
74 | # Distributed under the terms of the Modified BSD License. | |
83 | # |
|
|||
84 | # The full license is in the file COPYING.txt, distributed with this software. |
|
|||
85 | #----------------------------------------------------------------------------- |
|
@@ -1,5 +1,5 b'' | |||||
1 | include README.rst |
|
1 | include README.rst | |
2 |
include COPYING. |
|
2 | include COPYING.rst | |
3 | include setupbase.py |
|
3 | include setupbase.py | |
4 | include setupegg.py |
|
4 | include setupegg.py | |
5 |
|
5 |
@@ -14,7 +14,7 b' requires utilities which are not available under Windows."""' | |||||
14 | # |
|
14 | # | |
15 | # Distributed under the terms of the Modified BSD License. |
|
15 | # Distributed under the terms of the Modified BSD License. | |
16 | # |
|
16 | # | |
17 |
# The full license is in the file COPYING. |
|
17 | # The full license is in the file COPYING.rst, distributed with this software. | |
18 | #----------------------------------------------------------------------------- |
|
18 | #----------------------------------------------------------------------------- | |
19 |
|
19 | |||
20 | #----------------------------------------------------------------------------- |
|
20 | #----------------------------------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now