1 |
GLEP 76 says that new documentation must be released under CC-BY-SA |
2 |
version 4.0. Update the guidelines (GLEP 1) and the template (GLEP 2) |
3 |
to agree with this policy. |
4 |
|
5 |
Drop the wording about older GLEPs in the public domain or released |
6 |
under the OPL, because all of them have been updated. |
7 |
|
8 |
Signed-off-by: Ulrich Müller <ulm@g.o> |
9 |
--- |
10 |
glep-0001.rst | 23 ++++++++++------------- |
11 |
glep-0002.rst | 12 ++++++------ |
12 |
2 files changed, 16 insertions(+), 19 deletions(-) |
13 |
|
14 |
diff --git a/glep-0001.rst b/glep-0001.rst |
15 |
index 15deccb..61a08a4 100644 |
16 |
--- a/glep-0001.rst |
17 |
+++ b/glep-0001.rst |
18 |
@@ -6,11 +6,11 @@ Author: Grant Goodyear <g2boojum@g.o>, |
19 |
Ulrich Müller <ulm@g.o> |
20 |
Type: Informational |
21 |
Status: Active |
22 |
-Version: 3 |
23 |
+Version: 4 |
24 |
Created: 2003-05-31 |
25 |
Last-Modified: 2019-11-24 |
26 |
Post-History: 2003-06-01, 2003-07-02, 2008-01-19, 2008-06-05, 2011-03-09, |
27 |
- 2013-12-14, 2017-09-17, 2018-07-10 |
28 |
+ 2013-12-14, 2017-09-17, 2018-07-10, 2019-11-24 |
29 |
Content-Type: text/x-rst |
30 |
--- |
31 |
|
32 |
@@ -211,13 +211,10 @@ Each GLEP should have the following parts: |
33 |
specification and rationale first and reach consensus on it before writing |
34 |
code or significantly modifying ebuilds. |
35 |
|
36 |
-8. Copyright -- Every new GLEP must be explicitly labelled |
37 |
- as licensed under the Creative Commons Attribution-ShareAlike (CC-BY-SA) |
38 |
- license, version 3.0 [#CC-BY-SA3.0]_. Older GLEPs in the public domain |
39 |
- should be relicensed to CC-BY-SA 3.0 when they are updated. |
40 |
- GLEPs released under the Open Publication License (OPL) may remain |
41 |
- as-is, but are strongly encouraged to be relicensed under CC-BY-SA |
42 |
- 3.0 with the consent of all authors. |
43 |
+8. Copyright -- Every new GLEP must be explicitly labelled as licensed under |
44 |
+ the Creative Commons Attribution-ShareAlike 4.0 International License |
45 |
+ (CC-BY-SA-4.0) [#CC-BY-SA-4.0]_. Older GLEPs released under CC-BY-SA-3.0 |
46 |
+ should be relicensed to CC-BY-SA-4.0 when they are updated. |
47 |
|
48 |
|
49 |
GLEP Formating and Template |
50 |
@@ -374,7 +371,7 @@ References and Footnotes |
51 |
|
52 |
.. [#COUNCIL] https://www.gentoo.org/glep/glep-0039.html |
53 |
|
54 |
-.. [#CC-BY-SA3.0] https://creativecommons.org/licenses/by-sa/3.0/ |
55 |
+.. [#CC-BY-SA-4.0] https://creativecommons.org/licenses/by-sa/4.0/ |
56 |
|
57 |
.. [#ReSTHOME] http://docutils.sourceforge.net/rst.html |
58 |
|
59 |
@@ -388,6 +385,6 @@ References and Footnotes |
60 |
Copyright |
61 |
========= |
62 |
|
63 |
-This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 |
64 |
-Unported License. To view a copy of this license, visit |
65 |
-https://creativecommons.org/licenses/by-sa/3.0/. |
66 |
+This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 |
67 |
+International License. To view a copy of this license, visit |
68 |
+https://creativecommons.org/licenses/by-sa/4.0/. |
69 |
diff --git a/glep-0002.rst b/glep-0002.rst |
70 |
index 67ce3ce..6ef72ca 100644 |
71 |
--- a/glep-0002.rst |
72 |
+++ b/glep-0002.rst |
73 |
@@ -6,10 +6,10 @@ Author: Grant Goodyear <g2boojum@g.o>, |
74 |
Ulrich Müller <ulm@g.o> |
75 |
Type: Informational |
76 |
Status: Active |
77 |
-Version: 3 |
78 |
+Version: 4 |
79 |
Created: 2003-05-31 |
80 |
Last-Modified: 2019-11-24 |
81 |
-Post-History: 2003-06-02, 2013-12-17, 2017-09-17 |
82 |
+Post-History: 2003-06-02, 2013-12-17, 2017-09-17, 2019-11-24 |
83 |
Content-Type: text/x-rst |
84 |
--- |
85 |
|
86 |
@@ -128,7 +128,7 @@ directions below. |
87 |
|
88 |
- Update your References section. You should leave the Copyright section |
89 |
as-is, since all new GLEPs are to be licensed under the Creative Commons |
90 |
- Attribution-ShareAlike License, Version 3.0. |
91 |
+ Attribution-ShareAlike 4.0 International License (CC-BY-SA-4.0). |
92 |
|
93 |
- Send your GLEP submission to the GLEP editors at glep@g.o. |
94 |
|
95 |
@@ -602,6 +602,6 @@ References |
96 |
Copyright |
97 |
========= |
98 |
|
99 |
-This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 |
100 |
-Unported License. To view a copy of this license, visit |
101 |
-https://creativecommons.org/licenses/by-sa/3.0/. |
102 |
+This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 |
103 |
+International License. To view a copy of this license, visit |
104 |
+https://creativecommons.org/licenses/by-sa/4.0/. |
105 |
-- |
106 |
2.24.0 |