Skip to content

bpo-39883: Use BSD0 license for code in docs #17635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 5 commits into from
Sep 3, 2020
Merged

bpo-39883: Use BSD0 license for code in docs #17635

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2a80bf
[WIP] Use BSD0 license for code in docs
toddrjen Dec 11, 2019
f7a1a42
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 7, 2020
334476f
Set version number for BSD0 license to 3.8.6
toddrjen Sep 2, 2020
bc59859
Requested formatting fixes
toddrjen Sep 3, 2020
4c5b396
Insert a blank line
gvanrossum Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Requested formatting fixes
  • Loading branch information
@toddrjen
toddrjen committed Sep 3, 2020
commit bc59859fa7a910a0159231b1a0dd4c72cccb66f4
1 change: 1 addition & 0 deletions Doc/license.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ 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
Comment thread
toddrjen marked this conversation as resolved.
the documentation are dual licensed under the PSF License Agreement
and the :ref:`Zero-Clause BSD license <BSD0>`.
Expand Down
4 changes: 1 addition & 3 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,11 +263,9 @@ 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.

ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON |release| DOCUMENTATION
ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
----------------------------------------------------------------------

.. parsed-literal::

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.

Expand Down