summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2019-11-24 11:41:48 +0100
committerUlrich Müller <ulm@gentoo.org>2019-12-08 20:37:42 +0100
commite6f72b695d14d289ea97d0db54935eb234b6d057 (patch)
tree260b7adec180ff5ab723c8acb1f308dc7710c277 /glep-0001.rst
parentglep-0014: Mark as Deferred. (diff)
downloadglep-e6f72b695d14d289ea97d0db54935eb234b6d057.tar.gz
glep-e6f72b695d14d289ea97d0db54935eb234b6d057.tar.bz2
glep-e6f72b695d14d289ea97d0db54935eb234b6d057.zip
glep-{0001,0002}: New GLEPs are to be licensed under CC-BY-SA-4.0.
GLEP 76 says that new documentation must be released under CC-BY-SA version 4.0. Update the guidelines (GLEP 1) and the template (GLEP 2) to agree with this policy. Drop the wording about older GLEPs in the public domain or released under the OPL, because all of them have been updated. Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'glep-0001.rst')
-rw-r--r--glep-0001.rst23
1 files changed, 10 insertions, 13 deletions
diff --git a/glep-0001.rst b/glep-0001.rst
index 15deccb..61a08a4 100644
--- a/glep-0001.rst
+++ b/glep-0001.rst
@@ -6,11 +6,11 @@ Author: Grant Goodyear <g2boojum@gentoo.org>,
Ulrich Müller <ulm@gentoo.org>
Type: Informational
Status: Active
-Version: 3
+Version: 4
Created: 2003-05-31
Last-Modified: 2019-11-24
Post-History: 2003-06-01, 2003-07-02, 2008-01-19, 2008-06-05, 2011-03-09,
- 2013-12-14, 2017-09-17, 2018-07-10
+ 2013-12-14, 2017-09-17, 2018-07-10, 2019-11-24
Content-Type: text/x-rst
---
@@ -211,13 +211,10 @@ Each GLEP should have the following parts:
specification and rationale first and reach consensus on it before writing
code or significantly modifying ebuilds.
-8. Copyright -- Every new GLEP must be explicitly labelled
- as licensed under the Creative Commons Attribution-ShareAlike (CC-BY-SA)
- license, version 3.0 [#CC-BY-SA3.0]_. Older GLEPs in the public domain
- should be relicensed to CC-BY-SA 3.0 when they are updated.
- GLEPs released under the Open Publication License (OPL) may remain
- as-is, but are strongly encouraged to be relicensed under CC-BY-SA
- 3.0 with the consent of all authors.
+8. Copyright -- Every new GLEP must be explicitly labelled as licensed under
+ the Creative Commons Attribution-ShareAlike 4.0 International License
+ (CC-BY-SA-4.0) [#CC-BY-SA-4.0]_. Older GLEPs released under CC-BY-SA-3.0
+ should be relicensed to CC-BY-SA-4.0 when they are updated.
GLEP Formating and Template
@@ -374,7 +371,7 @@ References and Footnotes
.. [#COUNCIL] https://www.gentoo.org/glep/glep-0039.html
-.. [#CC-BY-SA3.0] https://creativecommons.org/licenses/by-sa/3.0/
+.. [#CC-BY-SA-4.0] https://creativecommons.org/licenses/by-sa/4.0/
.. [#ReSTHOME] http://docutils.sourceforge.net/rst.html
@@ -388,6 +385,6 @@ References and Footnotes
Copyright
=========
-This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
-Unported License. To view a copy of this license, visit
-https://creativecommons.org/licenses/by-sa/3.0/.
+This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
+International License. To view a copy of this license, visit
+https://creativecommons.org/licenses/by-sa/4.0/.