From 1618124399b3ae4aba998d400bd9865493a97970 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 5 Jul 2019 13:31:55 -0700 Subject: [PATCH 1/2] use a dual license of public domain or CC0-1.0-Universal Closes #123 --- pep-0001.txt | 10 +++++----- pep-0012.rst | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pep-0001.txt b/pep-0001.txt index 4eacc670ed0..8d60b02dfeb 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -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 @@ -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. .. diff --git a/pep-0012.rst b/pep-0012.rst index efc905415fd..15b71c09e69 100644 --- a/pep-0012.rst +++ b/pep-0012.rst @@ -1,7 +1,8 @@ PEP: 12 Title: Sample reStructuredText PEP Template Author: David Goodger , - Barry Warsaw + Barry Warsaw , + Brett Cannon 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. From d9413c3ce34292e086174dbf2969f4b8250a20ec Mon Sep 17 00:00:00 2001 From: Brett Cannon <54418+brettcannon@users.noreply.github.com> Date: Mon, 8 Jul 2019 13:38:16 -0700 Subject: [PATCH 2/2] Update pep-0001.txt Co-Authored-By: Aliaksei Urbanski --- pep-0001.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pep-0001.txt b/pep-0001.txt index 8d60b02dfeb..cb20ff6c60a 100644 --- a/pep-0001.txt +++ b/pep-0001.txt @@ -486,7 +486,7 @@ Each PEP should have the following parts/sections: 12. References -- A collection of URLs used as references through the PEP. -13. Copyright/license -- Each PEP must be placed under a dual license of +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).