Gentoo Archives: gentoo-project

From: "Michał Górny" <mgorny@g.o>
To: gentoo-project@l.g.o
Cc: "Ulrich Müller" <ulm@g.o>
Subject: [gentoo-project] [PATCH 20/24] glep-0002: Reimport some updates on workflow from the Wiki.
Date: Sun, 17 Sep 2017 20:26:26
Message-Id: 20170917202432.7763-21-mgorny@gentoo.org
In Reply to: [gentoo-project] [PATCHES v2] New old-school GLEP workflow (GLEP 1/2 update) by "Michał Górny"
1 From: Ulrich Müller <ulm@g.o>
2
3 Therefore, restore creffett as author, and update to CC-BY-SA-3.0.
4 ---
5 glep-0002.txt | 20 +++++++++-----------
6 1 file changed, 9 insertions(+), 11 deletions(-)
7
8 diff --git a/glep-0002.txt b/glep-0002.txt
9 index 06a1964..6b8f830 100644
10 --- a/glep-0002.txt
11 +++ b/glep-0002.txt
12 @@ -2,7 +2,8 @@ GLEP: 2
13 Title: Sample ReStructuredText GLEP Template
14 Version: $Revision$
15 Last-Modified: $Date$
16 -Author: Grant Goodyear <g2boojum@g.o>,
17 +Author: Grant Goodyear <g2boojum@g.o>,
18 + Chris Reffett <creffett@g.o>
19 Status: Active
20 Type: Informational
21 Content-Type: text/x-rst
22 @@ -86,8 +87,7 @@ directions below.
23 email address. Be sure to follow the format carefully: your name must
24 appear first, and it must not be contained in parentheses. Your email
25 address may appear second (or it can be omitted) and if it appears, it must
26 - appear in angle brackets. Your e-mail address
27 - here will e automatically obfuscated.
28 + appear in angle brackets.
29
30 - If there is a forum thread or a mailing list for discussion
31 of your new feature, add a Discussions-To header right after the Author
32 @@ -133,12 +133,9 @@ directions below.
33 replacing all of this gobbledygook with your own text. Be sure to adhere to
34 the format guidelines below, specifically on the indentation requirements.
35
36 -- Update your References and Copyright section. Usually you'll place
37 - your GLEP into the public domain, in which case just leave the Copyright
38 - section alone. Alternatively, you can use the `Open Publication License`__,
39 - but public domain is still strongly preferred.
40 -
41 - __ http://www.opencontent.org/openpub/
42 +- Update your References section. You should leave the Copyright section
43 + as-is, since all new GLEPs are to be licensed under the Creative Commons
44 + Attribution-ShareAlike License, Version 3.0.
45
46 - Send your GLEP submission to the GLEP editors at glep@g.o.
47
48 @@ -612,5 +609,6 @@ References
49 Copyright
50 =========
51
52 -This document has been placed in the public domain.
53 -
54 +This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
55 +Unported License. To view a copy of this license, visit
56 +http://creativecommons.org/licenses/by-sa/3.0/.
57 --
58 2.14.1