iSharkFly-Open
/
python-peps
mirror of https://github.com/python/peps.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use a dual license of public domain or CC0-1.0-Universal (#1117)

This commit is contained in:
Brett Cannon 2019-07-16 15:11:36 -07:00 committed by GitHub
parent 256f4285d6
commit 5d1cab6c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pep-0001.txt
View File

@ -486,9 +486,8 @@ Each PEP should have the following parts/sections:
12. References -- A collection of URLs used as references through the PEP.
13. Copyright/public domain -- Each PEP must either be explicitly
labeled as placed in the public domain (see this PEP as an
example) or licensed under the `Open Publication License`_.
13. Copyright/license -- Each new PEP must be placed under a dual license of
public domain and CC0-1.0-Universal_ (see this PEP for an example).
PEP Formats and Templates
@ -772,7 +771,7 @@ References and Footnotes
.. _issue tracker:
http://bugs.python.org/
.. _Open Publication License: http://www.opencontent.org/openpub/
.. _CC0-1.0-Universal: https://choosealicense.com/licenses/cc0-1.0/
.. _reStructuredText: http://docutils.sourceforge.net/rst.html
@ -788,7 +787,8 @@ References and Footnotes
Copyright
=========
This document has been placed in the public domain.
This document is placed in the public domain or under the
CC0-1.0-Universal license, whichever is more permissive.
..

16
pep-0012.rst
View File

@ -1,7 +1,8 @@
PEP: 12
Title: Sample reStructuredText PEP Template
Author: David Goodger <goodger@python.org>,
Barry Warsaw <barry@python.org>
Barry Warsaw <barry@python.org>,
Brett Cannon <brett@python.org>
Status: Active
Type: Process
Content-Type: text/x-rst
@ -9,6 +10,9 @@ Created: 05-Aug-2002
Post-History: 30-Aug-2002
.. note::
For those who have written a PEP before, there is a template_.
Abstract
========
@ -607,8 +611,12 @@ above), use double-backquotes::
Suggested Sections
==================
Various sections are found to be common across PEPs and are outlined in
PEP 1 [1]_. Those sections are provided here for convenience.
.. _template:
::
Abstract
@ -680,7 +688,8 @@ PEP 1 [1]_. Those sections are provided here for convenience.
Copyright
=========
This document has been placed in the public domain.
This document is placed in the public domain or under the
CC0-1.0-Universal license, whichever is more permissive.
@ -736,7 +745,8 @@ References
Copyright
=========
This document has been placed in the public domain.
This document is placed in the public domain or under the
CC0-1.0-Universal license, whichever is more permissive.