aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-05-23 11:12:17 +0200
committerChristian Grothoff <christian@grothoff.org>2017-05-23 11:12:17 +0200
commit6eb69b6f3e6ece282ed7ff7f7be4d599a9eac93b (patch)
tree942f2cfbca14841a94c2e461131e13f635544fff
parenta8dc6f01ae5617b46dc9078b9ff84169bc15c45a (diff)
downloadwww-6eb69b6f3e6ece282ed7ff7f7be4d599a9eac93b.tar.gz
www-6eb69b6f3e6ece282ed7ff7f7be4d599a9eac93b.zip
explain better, add link, nicer formatting
-rw-r--r--copyright.html.j214
1 files changed, 9 insertions, 5 deletions
diff --git a/copyright.html.j2 b/copyright.html.j2
index 40011d36..3da5e1e4 100644
--- a/copyright.html.j2
+++ b/copyright.html.j2
@@ -7,15 +7,19 @@
7{% trans %} 7{% trans %}
8 <p>Contributors to GNU Taler with Git access must sign the 8 <p>Contributors to GNU Taler with Git access must sign the
9 <a href="pdf/copyright.pdf">copyright assignment</a> to 9 <a href="pdf/copyright.pdf">copyright assignment</a> to
10 ensure that the GNUnet e.V. --- Taler Systems SA agreement 10 ensure that the <a href="https://gnunet.org/git/gnunet-ev.git/tree/gnunet_taler_agreement.tex">GNUnet e.V. --- Taler Systems SA agreement
11 on licensing and collaborative development of the GNUnet and 11 on licensing and collaborative development</a> of the GNUnet and
12 GNU Taler projects is satisfied.</p> 12 GNU Taler projects is satisfied.</p>
13{% endtrans %} 13{% endtrans %}
14 </div>
15 <div class="container">
14{% trans %} 16{% trans %}
15 <p>The agreements ensure that the code will continue to be made 17 <p>The agreements ensure that the code will continue to be made
16 available under free software licenses, but gives us the freedom 18 available under free software licenses, but gives developers
17 to move code between GNUnet and GNU Taler and the ability to 19 the freedom to move code between GNUnet and GNU Taler without
18 dual-license.</p> 20 worrying about licenses and the company the ability to
21 dual-license (for example, so that we can distribute via
22 App-stores that are hostile to free software).</p>
19{% endtrans %} 23{% endtrans %}
20{% trans %} 24{% trans %}
21 <p>Minor contributions (basically, anyone without Git access) do 25 <p>Minor contributions (basically, anyone without Git access) do