Skip to content

Commit

Permalink
use a dual license of public domain or CC0-1.0-Universal
Browse files Browse the repository at this point in the history
Closes python#123
  • Loading branch information
brettcannon committed Jul 5, 2019
1 parent ae932bd commit 1618124
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
10 changes: 5 additions & 5 deletions pep-0001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 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
Expand Down Expand Up @@ -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

Expand All @@ -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.


..
Expand Down
16 changes: 13 additions & 3 deletions pep-0012.rst
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
PEP: 12
Title: Sample reStructuredText PEP Template
Author: David Goodger <[email protected]>,
Barry Warsaw <[email protected]>
Barry Warsaw <[email protected]>,
Brett Cannon <[email protected]>
Status: Active
Type: Process
Content-Type: text/x-rst
Created: 05-Aug-2002
Post-History: 30-Aug-2002


.. note::
For those who have written a PEP before, there is a template_.

Abstract
========

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.


Expand Down Expand Up @@ -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.



Expand Down

0 comments on commit 1618124

Please sign in to comment.