Skip to content

Commit c2a80bf

Browse files
committed
[WIP] Use BSD0 license for code in docs
1 parent 75bb07e commit c2a80bf

File tree

2 files changed

+59
-0
lines changed

2 files changed

+59
-0
lines changed

Diff for: Doc/license.rst

+33
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@ make these releases possible.
7272
Terms and conditions for accessing or otherwise using Python
7373
============================================================
7474

75+
Python software and documentation are licensed under the
76+
:ref:`PSF License Agreement <PSF-license>`.
77+
Starting with Python X.X.X, examples, recipes, and other code in
78+
the documentation are dual licensed under the PSF License Agreement
79+
and the :ref:`Zero-Clause BSD license <BSD0>`.
80+
81+
Some software incorporated into Python is under different licenses.
82+
The licenses are listed with code falling under that license.
83+
See :ref:`OtherLicenses` for an incomplete list of these licenses.
84+
85+
86+
.. _PSF-license:
7587

7688
PSF LICENSE AGREEMENT FOR PYTHON |release|
7789
------------------------------------------
@@ -258,6 +270,27 @@ CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
258270
SOFTWARE.
259271
260272
273+
.. _BSD0:
274+
275+
ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION
276+
----------------------------------------------------------------------
277+
278+
.. parsed-literal::
279+
280+
Permission to use, copy, modify, and/or distribute this software for any
281+
purpose with or without fee is hereby granted.
282+
283+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
284+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
285+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
286+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
287+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
288+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
289+
PERFORMANCE OF THIS SOFTWARE.
290+
291+
292+
.. _OtherLicenses:
293+
261294
Licenses and Acknowledgements for Incorporated Software
262295
=======================================================
263296

Diff for: LICENSE

+26
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,16 @@ direction to make these releases possible.
5959
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
6060
===============================================================
6161

62+
Python software and documentation are licensed under the
63+
Python Software Foundation License Version 2.
64+
Starting with Python X.X.X, examples, recipes, and other code in
65+
the documentation are dual licensed under the PSF License Version 2
66+
and the Zero-Clause BSD license.
67+
68+
Some software incorporated into Python is under different licenses.
69+
The licenses are listed with code falling under that license.
70+
71+
6272
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
6373
--------------------------------------------
6474

@@ -252,3 +262,19 @@ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
252262
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
253263
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
254264
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
265+
266+
ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION
267+
----------------------------------------------------------------------
268+
269+
.. parsed-literal::
270+
271+
Permission to use, copy, modify, and/or distribute this software for any
272+
purpose with or without fee is hereby granted.
273+
274+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
275+
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
276+
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
277+
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
278+
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
279+
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
280+
PERFORMANCE OF THIS SOFTWARE.

0 commit comments

Comments
 (0)