Skip to content

Commit 1c107a4

Browse files
authored
Merge pull request #19704 from timhoffm/license-cleanup
Cleanup license page in docs
2 parents 0bc924d + 4e74b2a commit 1c107a4

File tree

1 file changed

+12
-107
lines changed

1 file changed

+12
-107
lines changed

doc/users/license.rst

Lines changed: 12 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
.. _license:
22

3-
***********************************************
3+
*******
44
License
5-
***********************************************
6-
5+
*******
76

87
Matplotlib only uses BSD compatible code, and its license is based on
98
the `PSF <https://python.org/psf/license>`_ license. See the Open
@@ -16,21 +15,21 @@ licencing choice, see :ref:`license-discussion`.
1615
Copyright Policy
1716
================
1817

19-
John Hunter began matplotlib around 2003. Since shortly before his
18+
John Hunter began Matplotlib around 2003. Since shortly before his
2019
passing in 2012, Michael Droettboom has been the lead maintainer of
21-
matplotlib, but, as has always been the case, matplotlib is the work
20+
Matplotlib, but, as has always been the case, Matplotlib is the work
2221
of many.
2322

2423
Prior to July of 2013, and the 1.3.0 release, the copyright of the
2524
source code was held by John Hunter. As of July 2013, and the 1.3.0
2625
release, matplotlib has moved to a shared copyright model.
2726

28-
matplotlib uses a shared copyright model. Each contributor maintains
29-
copyright over their contributions to matplotlib. But, it is important to
27+
Matplotlib uses a shared copyright model. Each contributor maintains
28+
copyright over their contributions to Matplotlib. But, it is important to
3029
note that these contributions are typically only changes to the
31-
repositories. Thus, the matplotlib source code, in its entirety, is not
30+
repositories. Thus, the Matplotlib source code, in its entirety, is not
3231
the copyright of any single person or institution. Instead, it is the
33-
collective copyright of the entire matplotlib Development Team. If
32+
collective copyright of the entire Matplotlib Development Team. If
3433
individual contributors want to maintain a record of what
3534
changes/contributions they have specific copyright on, they should
3635
indicate their copyright in the commit message of the change, when
@@ -40,102 +39,8 @@ The Matplotlib Development Team is the set of all contributors to the
4039
matplotlib project. A full list can be obtained from the git version
4140
control logs.
4241

43-
License agreement for matplotlib |version|
44-
==============================================
45-
46-
1. This LICENSE AGREEMENT is between the Matplotlib Development Team
47-
("MDT"), and the Individual or Organization ("Licensee") accessing and
48-
otherwise using matplotlib software in source or binary form and its
49-
associated documentation.
50-
51-
2. Subject to the terms and conditions of this License Agreement, MDT
52-
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
53-
to reproduce, analyze, test, perform and/or display publicly, prepare
54-
derivative works, distribute, and otherwise use matplotlib |version|
55-
alone or in any derivative version, provided, however, that MDT's
56-
License Agreement and MDT's notice of copyright, i.e., "Copyright (c)
57-
2012-2013 Matplotlib Development Team; All Rights Reserved" are retained in
58-
matplotlib |version| alone or in any derivative version prepared by
59-
Licensee.
60-
61-
3. In the event Licensee prepares a derivative work that is based on or
62-
incorporates matplotlib |version| or any part thereof, and wants to
63-
make the derivative work available to others as provided herein, then
64-
Licensee hereby agrees to include in any such work a brief summary of
65-
the changes made to matplotlib |version|.
66-
67-
4. MDT is making matplotlib |version| available to Licensee on an "AS
68-
IS" basis. MDT MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
69-
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, MDT MAKES NO AND
70-
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
71-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB |version|
72-
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
73-
74-
5. MDT SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
75-
|version| FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
76-
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
77-
MATPLOTLIB |version|, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
78-
THE POSSIBILITY THEREOF.
79-
80-
6. This License Agreement will automatically terminate upon a material
81-
breach of its terms and conditions.
82-
83-
7. Nothing in this License Agreement shall be deemed to create any
84-
relationship of agency, partnership, or joint venture between MDT and
85-
Licensee. This License Agreement does not grant permission to use MDT
86-
trademarks or trade name in a trademark sense to endorse or promote
87-
products or services of Licensee, or any third party.
88-
89-
8. By copying, installing or otherwise using matplotlib |version|,
90-
Licensee agrees to be bound by the terms and conditions of this License
91-
Agreement.
92-
93-
License agreement for matplotlib versions prior to 1.3.0
94-
========================================================
95-
96-
1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
97-
Individual or Organization ("Licensee") accessing and otherwise using
98-
matplotlib software in source or binary form and its associated
99-
documentation.
100-
101-
2. Subject to the terms and conditions of this License Agreement, JDH
102-
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
103-
to reproduce, analyze, test, perform and/or display publicly, prepare
104-
derivative works, distribute, and otherwise use matplotlib |version|
105-
alone or in any derivative version, provided, however, that JDH's
106-
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
107-
2002-2009 John D. Hunter; All Rights Reserved" are retained in
108-
matplotlib |version| alone or in any derivative version prepared by
109-
Licensee.
110-
111-
3. In the event Licensee prepares a derivative work that is based on or
112-
incorporates matplotlib |version| or any part thereof, and wants to
113-
make the derivative work available to others as provided herein, then
114-
Licensee hereby agrees to include in any such work a brief summary of
115-
the changes made to matplotlib |version|.
116-
117-
4. JDH is making matplotlib |version| available to Licensee on an "AS
118-
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
119-
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
120-
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
121-
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB |version|
122-
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
123-
124-
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
125-
|version| FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
126-
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
127-
MATPLOTLIB |version|, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
128-
THE POSSIBILITY THEREOF.
129-
130-
6. This License Agreement will automatically terminate upon a material
131-
breach of its terms and conditions.
132-
133-
7. Nothing in this License Agreement shall be deemed to create any
134-
relationship of agency, partnership, or joint venture between JDH and
135-
Licensee. This License Agreement does not grant permission to use JDH
136-
trademarks or trade name in a trademark sense to endorse or promote
137-
products or services of Licensee, or any third party.
42+
License agreement
43+
=================
13844

139-
8. By copying, installing or otherwise using matplotlib |version|,
140-
Licensee agrees to be bound by the terms and conditions of this License
141-
Agreement.
45+
.. literalinclude:: ../../LICENSE/LICENSE
46+
:language: none

0 commit comments

Comments
 (0)