summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2018-04-20 15:50:10 -0700
committerUlrich Müller <ulm@gentoo.org>2018-06-10 20:42:07 +0200
commit105f5eae63082df4cd4e79d05c88711e8429cf94 (patch)
tree32612d2d94f0a464a1a939b89c458a03279121bd
parentglep-0076: Add initial text for motivation. (diff)
downloadglep-105f5eae.tar.gz
glep-105f5eae.tar.bz2
glep-105f5eae.zip
glep-0076: Disambiguate which FLA is discussed, and link to FSFe FLA.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--glep-0076.rst15
1 files changed, 9 insertions, 6 deletions
diff --git a/glep-0076.rst b/glep-0076.rst
index 569cc63..31b8c35 100644
--- a/glep-0076.rst
+++ b/glep-0076.rst
@@ -45,9 +45,9 @@ files that were not created internally.
Finally, since the early days of Gentoo new ideas around copyright
licensing have become more popular, such as the FSFE's Fiduciary
-License Agreement, which takes a copyleft approach to copyright
-licensing, while also better complying with copyright laws in nations
-that have author's rights.
+License Agreement [#FLA]_, which takes a copyleft approach to
+copyright licensing, while also better complying with copyright laws
+in nations that have author's rights.
The goal here was to create a policy that was both flexible enough to
cover forks and situations where Gentoo would not own the majority of
@@ -175,10 +175,10 @@ for their contributions to the Gentoo Foundation. Doing so makes
compliance with this policy easier (fewer copyright holders to list),
and allows the Foundation to enforce copyrights and re-license content
if appropriate (this will only be done in accordance with the social
-contract and the FLA).
+contract and the Gentoo FLA).
Copyright is assigned to the Foundation by electronically signing the
-Gentoo Fiduciary License Agreement (FLA) [#FLA]_.
+Gentoo Fiduciary License Agreement (FLA) [#GFLA]_.
The agreement may be signed BY **TODO...** If the scope of the signed
agreement included future contributions, the contributor may document
@@ -214,7 +214,10 @@ References
.. [#OSDL-DCO] 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
-.. [#FLA] Gentoo Fiduciary License Agreement,
+.. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA),
+ https://fsfe.org/activities/ftf/fla.en.html
+
+.. [#GFLA] Gentoo Fiduciary License Agreement,
https://dev.gentoo.org/~rich0/fla.pdf