| 1 |
commit: 105f5eae63082df4cd4e79d05c88711e8429cf94 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 20 22:50:10 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 10 18:42:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/data/glep.git/commit/?id=105f5eae |
| 7 |
|
| 8 |
glep-0076: Disambiguate which FLA is discussed, and link to FSFe FLA. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
glep-0076.rst | 15 +++++++++------ |
| 13 |
1 file changed, 9 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/glep-0076.rst b/glep-0076.rst |
| 16 |
index 569cc63..31b8c35 100644 |
| 17 |
--- a/glep-0076.rst |
| 18 |
+++ b/glep-0076.rst |
| 19 |
@@ -45,9 +45,9 @@ files that were not created internally. |
| 20 |
|
| 21 |
Finally, since the early days of Gentoo new ideas around copyright |
| 22 |
licensing have become more popular, such as the FSFE's Fiduciary |
| 23 |
-License Agreement, which takes a copyleft approach to copyright |
| 24 |
-licensing, while also better complying with copyright laws in nations |
| 25 |
-that have author's rights. |
| 26 |
+License Agreement [#FLA]_, which takes a copyleft approach to |
| 27 |
+copyright licensing, while also better complying with copyright laws |
| 28 |
+in nations that have author's rights. |
| 29 |
|
| 30 |
The goal here was to create a policy that was both flexible enough to |
| 31 |
cover forks and situations where Gentoo would not own the majority of |
| 32 |
@@ -175,10 +175,10 @@ for their contributions to the Gentoo Foundation. Doing so makes |
| 33 |
compliance with this policy easier (fewer copyright holders to list), |
| 34 |
and allows the Foundation to enforce copyrights and re-license content |
| 35 |
if appropriate (this will only be done in accordance with the social |
| 36 |
-contract and the FLA). |
| 37 |
+contract and the Gentoo FLA). |
| 38 |
|
| 39 |
Copyright is assigned to the Foundation by electronically signing the |
| 40 |
-Gentoo Fiduciary License Agreement (FLA) [#FLA]_. |
| 41 |
+Gentoo Fiduciary License Agreement (FLA) [#GFLA]_. |
| 42 |
|
| 43 |
The agreement may be signed BY **TODO...** If the scope of the signed |
| 44 |
agreement included future contributions, the contributor may document |
| 45 |
@@ -214,7 +214,10 @@ References |
| 46 |
.. [#OSDL-DCO] Developer's Certificate of Origin 1.1, |
| 47 |
https://web.archive.org/web/20060524185355/http://www.osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html |
| 48 |
|
| 49 |
-.. [#FLA] Gentoo Fiduciary License Agreement, |
| 50 |
+.. [#FLA] FSFE Legal: Fiduciary Licence Agreement (FLA), |
| 51 |
+ https://fsfe.org/activities/ftf/fla.en.html |
| 52 |
+ |
| 53 |
+.. [#GFLA] Gentoo Fiduciary License Agreement, |
| 54 |
https://dev.gentoo.org/~rich0/fla.pdf |
Archives