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