1 |
commit: 2c4ee9591a6c6d0d086534638a6959df29f8a8d7 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 3 14:44:34 2018 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 8 13:41:12 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=2c4ee959 |
7 |
|
8 |
glep-0076: Add another reference to the Linux DCO. |
9 |
|
10 |
Explicitly refer to https://developercertificate.org/, because |
11 |
different wordings of DCO version 1.1 exist. |
12 |
|
13 |
Slightly reword the last paragraph in the "Certificate of Origin" |
14 |
section, as discussed with K_F. |
15 |
|
16 |
glep-0076.rst | 14 ++++++++------ |
17 |
1 file changed, 8 insertions(+), 6 deletions(-) |
18 |
|
19 |
diff --git a/glep-0076.rst b/glep-0076.rst |
20 |
index 0604b43..5bb66ad 100644 |
21 |
--- a/glep-0076.rst |
22 |
+++ b/glep-0076.rst |
23 |
@@ -10,7 +10,7 @@ Type: Informational |
24 |
Status: Draft |
25 |
Version: 1 |
26 |
Created: 2013-04-23 |
27 |
-Last-Modified: 2018-08-31 |
28 |
+Last-Modified: 2018-09-03 |
29 |
Post-History: 2018-06-10, 2018-06-19, 2018-08-31 |
30 |
Content-Type: text/x-rst |
31 |
--- |
32 |
@@ -170,11 +170,10 @@ Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_. |
33 |
It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open |
34 |
Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License. |
35 |
|
36 |
-Alternatively, and if it is applicable, committers are allowed to |
37 |
-certify their commits with the Linux Kernel DCO 1.1. This shall be |
38 |
-clearly indicated by adding ``(Linux DCO 1.1)`` at the end of the |
39 |
-``Signed-off-by`` line. Using the Gentoo Certificate of Origin is |
40 |
-strongly preferred, though. |
41 |
+Alternatively, and if it is applicable, committers can certify their |
42 |
+commits with the Linux Kernel DCO 1.1 [#DCO-1.1]_. This shall be |
43 |
+indicated by adding ``(DCO-1.1)`` at the end of the ``Signed-off-by`` |
44 |
+line. Using the Gentoo Certificate of Origin is strongly preferred. |
45 |
|
46 |
|
47 |
Copyright Attribution |
48 |
@@ -360,6 +359,9 @@ References |
49 |
Developer's Certificate of Origin 1.1, |
50 |
https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html |
51 |
|
52 |
+.. [#DCO-1.1] Developer's Certificate of Origin 1.1, |
53 |
+ https://developercertificate.org/ |
54 |
+ |
55 |
.. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA), |
56 |
https://fsfe.org/activities/ftf/fla.en.html |