From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C16A7138334 for ; Sun, 8 Dec 2019 19:38:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0505AE083B; Sun, 8 Dec 2019 19:38:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A90FBE083B for ; Sun, 8 Dec 2019 19:38:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 432FD34D6E7 for ; Sun, 8 Dec 2019 19:38:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9573B7FE for ; Sun, 8 Dec 2019 19:38:09 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1575833862.e6f72b695d14d289ea97d0db54935eb234b6d057.ulm@gentoo> Subject: [gentoo-commits] data/glep:master commit in: / X-VCS-Repository: data/glep X-VCS-Files: glep-0001.rst glep-0002.rst X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: e6f72b695d14d289ea97d0db54935eb234b6d057 X-VCS-Branch: master Date: Sun, 8 Dec 2019 19:38:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d2737a4d-f2be-4da9-b440-51702aadd653 X-Archives-Hash: 444bb941da468336a2d1c2f543519220 commit: e6f72b695d14d289ea97d0db54935eb234b6d057 Author: Ulrich Müller gentoo org> AuthorDate: Sun Nov 24 10:41:48 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sun Dec 8 19:37:42 2019 +0000 URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=e6f72b69 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 gentoo.org> glep-0001.rst | 23 ++++++++++------------- glep-0002.rst | 12 ++++++------ 2 files changed, 16 insertions(+), 19 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 , Ulrich Müller 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/. diff --git a/glep-0002.rst b/glep-0002.rst index 67ce3ce..6ef72ca 100644 --- a/glep-0002.rst +++ b/glep-0002.rst @@ -6,10 +6,10 @@ Author: Grant Goodyear , Ulrich Müller Type: Informational Status: Active -Version: 3 +Version: 4 Created: 2003-05-31 Last-Modified: 2019-11-24 -Post-History: 2003-06-02, 2013-12-17, 2017-09-17 +Post-History: 2003-06-02, 2013-12-17, 2017-09-17, 2019-11-24 Content-Type: text/x-rst --- @@ -128,7 +128,7 @@ directions below. - Update your References section. You should leave the Copyright section as-is, since all new GLEPs are to be licensed under the Creative Commons - Attribution-ShareAlike License, Version 3.0. + Attribution-ShareAlike 4.0 International License (CC-BY-SA-4.0). - Send your GLEP submission to the GLEP editors at glep@gentoo.org. @@ -602,6 +602,6 @@ References 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/.