aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNils Gillmann <ng0@n0.is>2018-06-28 19:32:08 +0000
committerNils Gillmann <ng0@n0.is>2018-06-28 19:32:08 +0000
commit2c6dcff9bd500678ef35eeb404995f4f56ab2136 (patch)
treee9b48f78981c3bb879285846668d45816c064184 /doc
parent1ded1c1bb3bcb16d1770f03b299fcaa0a0c2d813 (diff)
downloadgnunet-2c6dcff9bd500678ef35eeb404995f4f56ab2136.tar.gz
gnunet-2c6dcff9bd500678ef35eeb404995f4f56ab2136.zip
documentation: in chapter contributing update gpl to agpl3 when it refers to code.
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'doc')
-rw-r--r--doc/documentation/chapters/contributing.texi6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/documentation/chapters/contributing.texi b/doc/documentation/chapters/contributing.texi
index 745acca77..dc87de3d6 100644
--- a/doc/documentation/chapters/contributing.texi
+++ b/doc/documentation/chapters/contributing.texi
@@ -11,12 +11,14 @@
11@node Contributing to GNUnet 11@node Contributing to GNUnet
12@section Contributing to GNUnet 12@section Contributing to GNUnet
13 13
14@cindex licenses
15@cindex licenses of contributions
14@node Licenses of contributions 16@node Licenses of contributions
15@section Licenses of contributions 17@section Licenses of contributions
16 18
17GNUnet is a @uref{https://www.gnu.org/, GNU} package. 19GNUnet is a @uref{https://www.gnu.org/, GNU} package.
18All code contributions must thus be put under the 20All code contributions must thus be put under the
19@uref{https://www.gnu.org/copyleft/gpl.html, GNU Public License (GPL)}. 21@uref{https://www.gnu.org/licenses/agpl.html, GNU Affero Public License (AGPL)}.
20All documentation should be put under FSF approved licenses 22All documentation should be put under FSF approved licenses
21(see @uref{https://www.gnu.org/copyleft/fdl.html, fdl}). 23(see @uref{https://www.gnu.org/copyleft/fdl.html, fdl}).
22 24
@@ -40,7 +42,7 @@ rights, and in particular is allowed to dual-license the code. You
40retain non-exclusive rights to your contributions, so you can also 42retain non-exclusive rights to your contributions, so you can also
41share your contributions freely with other projects. 43share your contributions freely with other projects.
42 44
43GNUnet e.V. will publish all accepted contributions under the GPLv3 45GNUnet e.V. will publish all accepted contributions under the AGPLv3
44or any later version. The association may decide to publish 46or any later version. The association may decide to publish
45contributions under additional licenses (dual-licensing). 47contributions under additional licenses (dual-licensing).
46 48