| 1 |
commit: 14c70ff37afffa0e96215cdb5e68c38a2be8414e |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 23 21:32:16 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 31 14:40:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=14c70ff3 |
| 7 |
|
| 8 |
glep-0076: Require CC-BY-SA-4.0 for new projects. |
| 9 |
|
| 10 |
glep-0076.rst | 11 +++++++---- |
| 11 |
1 file changed, 7 insertions(+), 4 deletions(-) |
| 12 |
|
| 13 |
diff --git a/glep-0076.rst b/glep-0076.rst |
| 14 |
index b1ab066..3ab59a6 100644 |
| 15 |
--- a/glep-0076.rst |
| 16 |
+++ b/glep-0076.rst |
| 17 |
@@ -108,9 +108,9 @@ following: |
| 18 |
a) The GNU General Public License, version 2 or later (GPL-2+) |
| 19 |
[#GPL-2]_. |
| 20 |
|
| 21 |
-b) The Creative Commons Attribution-ShareAlike 3.0 License |
| 22 |
- (CC-BY-SA-3.0, only for documentation) [#CC-BY-SA-3.0]_. |
| 23 |
- *[Note: or version 4.0, to be decided]* |
| 24 |
+b) The Creative Commons Attribution-ShareAlike 4.0 License |
| 25 |
+ (CC-BY-SA-4.0, only for documentation) [#CC-BY-SA-4.0]_. |
| 26 |
+ Existing projects may also stay with CC-BY-SA-3.0 [#CC-BY-SA-3.0]_. |
| 27 |
|
| 28 |
c) A license approved as GPL compatible by the Free Software |
| 29 |
Foundation [#GPL-COMPAT]_. |
| 30 |
@@ -244,7 +244,7 @@ The Social Contract mentions GPL-2 and CC-BY-SA-2.0, both with the |
| 31 |
option to use them in a later version ("at our discretion"). In order |
| 32 |
to facilitate interchange of software between different projects, we |
| 33 |
aim for uniformity of their licensing. Therefore, items a) and b) |
| 34 |
-explicitly recommend the use of GPL-2+ and CC-BY-SA-3.0. The latter |
| 35 |
+explicitly recommend the use of GPL-2+ and CC-BY-SA-4.0. The latter |
| 36 |
is restricted to be used for documentation, because Creative Commons |
| 37 |
themselves recommend against using their licenses for software |
| 38 |
[#CC-SOFTWARE]_. |
| 39 |
@@ -332,6 +332,9 @@ References |
| 40 |
.. [#GPL-2] GNU General Public License, version 2 or later, |
| 41 |
https://www.gnu.org/licenses/gpl-2.0.html |
| 42 |
|
| 43 |
+.. [#CC-BY-SA-4.0] Creative Commons Attribution-ShareAlike 4.0 |
| 44 |
+ International License, https://creativecommons.org/licenses/by-sa/4.0/ |
| 45 |
+ |
| 46 |
.. [#CC-BY-SA-3.0] Creative Commons Attribution-ShareAlike 3.0 |
| 47 |
Unported License, https://creativecommons.org/licenses/by-sa/3.0/ |
Archives