summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-09-03 14:40:10 (GMT)
committerGitHub <noreply@github.com>2020-09-03 14:40:10 (GMT)
commita5d0232b0d2cbcbdeb0d89ea3d8826241a53a7c7 (patch)
tree56b06d54c87ab7f6db87889a7844166c699e43ed /Doc
parent8de34cdb952a2e3b8d7a9a213845cad01a8cece3 (diff)
downloadcpython-a5d0232b0d2cbcbdeb0d89ea3d8826241a53a7c7.zip
cpython-a5d0232b0d2cbcbdeb0d89ea3d8826241a53a7c7.tar.gz
cpython-a5d0232b0d2cbcbdeb0d89ea3d8826241a53a7c7.tar.bz2
bpo-39883: Use BSD0 license for code in docs (GH-17635) (GH-22073)
The PSF board approved this use. (cherry picked from commit e223d06a8b2067c68e9f97c4628c2b0f056dcae6) Co-authored-by: Todd <toddrjen@gmail.com>
Diffstat (limited to 'Doc')
-rw-r--r--Doc/license.rst34
1 files changed, 34 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index fa6d71a..4030825 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -72,6 +72,19 @@ make these releases possible.
Terms and conditions for accessing or otherwise using Python
============================================================
+Python software and documentation are licensed under the
+:ref:`PSF License Agreement <PSF-license>`.
+
+Starting with Python 3.8.6, examples, recipes, and other code in
+the documentation are dual licensed under the PSF License Agreement
+and the :ref:`Zero-Clause BSD license <BSD0>`.
+
+Some software incorporated into Python is under different licenses.
+The licenses are listed with code falling under that license.
+See :ref:`OtherLicenses` for an incomplete list of these licenses.
+
+
+.. _PSF-license:
PSF LICENSE AGREEMENT FOR PYTHON |release|
------------------------------------------
@@ -258,6 +271,27 @@ CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
SOFTWARE.
+.. _BSD0:
+
+ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION
+----------------------------------------------------------------------
+
+.. parsed-literal::
+
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+ REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+
+.. _OtherLicenses:
+
Licenses and Acknowledgements for Incorporated Software
=======================================================