summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2018-06-23 23:32:16 +0200
committerUlrich Müller <ulm@gentoo.org>2018-08-31 16:40:47 +0200
commit14c70ff37afffa0e96215cdb5e68c38a2be8414e (patch)
treef5a5d7dacf7b1d6e8bcc0336bde6ac8bc0b855a3
parentglep-0076: Minor fixes. (diff)
downloadglep-14c70ff37afffa0e96215cdb5e68c38a2be8414e.tar.gz
glep-14c70ff37afffa0e96215cdb5e68c38a2be8414e.tar.bz2
glep-14c70ff37afffa0e96215cdb5e68c38a2be8414e.zip
glep-0076: Require CC-BY-SA-4.0 for new projects.
-rw-r--r--glep-0076.rst11
1 files changed, 7 insertions, 4 deletions
diff --git a/glep-0076.rst b/glep-0076.rst
index b1ab066..3ab59a6 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -108,9 +108,9 @@ following:
a) The GNU General Public License, version 2 or later (GPL-2+)
[#GPL-2]_.
-b) The Creative Commons Attribution-ShareAlike 3.0 License
- (CC-BY-SA-3.0, only for documentation) [#CC-BY-SA-3.0]_.
- *[Note: or version 4.0, to be decided]*
+b) The Creative Commons Attribution-ShareAlike 4.0 License
+ (CC-BY-SA-4.0, only for documentation) [#CC-BY-SA-4.0]_.
+ Existing projects may also stay with CC-BY-SA-3.0 [#CC-BY-SA-3.0]_.
c) A license approved as GPL compatible by the Free Software
Foundation [#GPL-COMPAT]_.
@@ -244,7 +244,7 @@ The Social Contract mentions GPL-2 and CC-BY-SA-2.0, both with the
option to use them in a later version ("at our discretion"). In order
to facilitate interchange of software between different projects, we
aim for uniformity of their licensing. Therefore, items a) and b)
-explicitly recommend the use of GPL-2+ and CC-BY-SA-3.0. The latter
+explicitly recommend the use of GPL-2+ and CC-BY-SA-4.0. The latter
is restricted to be used for documentation, because Creative Commons
themselves recommend against using their licenses for software
[#CC-SOFTWARE]_.
@@ -332,6 +332,9 @@ References
.. [#GPL-2] GNU General Public License, version 2 or later,
https://www.gnu.org/licenses/gpl-2.0.html
+.. [#CC-BY-SA-4.0] Creative Commons Attribution-ShareAlike 4.0
+ International License, https://creativecommons.org/licenses/by-sa/4.0/
+
.. [#CC-BY-SA-3.0] Creative Commons Attribution-ShareAlike 3.0
Unported License, https://creativecommons.org/licenses/by-sa/3.0/