summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2018-09-03 16:44:34 +0200
committerUlrich Müller <ulm@gentoo.org>2018-09-08 15:41:12 +0200
commit2c4ee9591a6c6d0d086534638a6959df29f8a8d7 (patch)
tree4a72f3683d0c242f36398c19738421674f86ef66
parentglep-0076: Update Post-History. (diff)
downloadglep-2c4ee9591a6c6d0d086534638a6959df29f8a8d7.tar.gz
glep-2c4ee9591a6c6d0d086534638a6959df29f8a8d7.tar.bz2
glep-2c4ee9591a6c6d0d086534638a6959df29f8a8d7.zip
glep-0076: Add another reference to the Linux DCO.
Explicitly refer to https://developercertificate.org/, because different wordings of DCO version 1.1 exist. Slightly reword the last paragraph in the "Certificate of Origin" section, as discussed with K_F.
-rw-r--r--glep-0076.rst14
1 files changed, 8 insertions, 6 deletions
diff --git a/glep-0076.rst b/glep-0076.rst
index 0604b43..5bb66ad 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -10,7 +10,7 @@ Type: Informational
Status: Draft
Version: 1
Created: 2013-04-23
-Last-Modified: 2018-08-31
+Last-Modified: 2018-09-03
Post-History: 2018-06-10, 2018-06-19, 2018-08-31
Content-Type: text/x-rst
---
@@ -170,11 +170,10 @@ Attribution-ShareAlike 3.0 Unported License [#CC-BY-SA-3.0]_.
It is based on the Linux Kernel DCO [#OSDL-DCO]_, released by Open
Source Development Labs, Inc. in 2005 under a CC-BY-SA-2.5 License.
-Alternatively, and if it is applicable, committers are allowed to
-certify their commits with the Linux Kernel DCO 1.1. This shall be
-clearly indicated by adding ``(Linux DCO 1.1)`` at the end of the
-``Signed-off-by`` line. Using the Gentoo Certificate of Origin is
-strongly preferred, though.
+Alternatively, and if it is applicable, committers can certify their
+commits with the Linux Kernel DCO 1.1 [#DCO-1.1]_. This shall be
+indicated by adding ``(DCO-1.1)`` at the end of the ``Signed-off-by``
+line. Using the Gentoo Certificate of Origin is strongly preferred.
Copyright Attribution
@@ -360,6 +359,9 @@ References
Developer's Certificate of Origin 1.1,
https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
+.. [#DCO-1.1] Developer's Certificate of Origin 1.1,
+ https://developercertificate.org/
+
.. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA),
https://fsfe.org/activities/ftf/fla.en.html