From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 9 Aug 2007 03:44:42 +0000 (-0700)
Subject: clarify licence
X-Git-Url: https://git.rkrishnan.org/frontends/listings/running.html?a=commitdiff_plain;h=8c2ba22ad51b8dc98ac25db18c904eaa700687aa;p=tahoe-lafs%2Ftahoe-lafs.git

clarify licence
---

diff --git a/COPYING b/COPYING
index 8b01e53b..d22cb2ac 100644
--- a/COPYING
+++ b/COPYING
@@ -1,9 +1,10 @@
 In addition to the terms of the GNU General Public License, this licence also
 comes with the added permission that, if you become obligated to release a
 derived work under this licence (as per section 2.b), you may delay the
-fulfillment of this obligation for up to 12 months ("grace period").  You must 
-include this same added permission (the "grace period" clause) in the licence 
-under which your derived work is released.
+fulfillment of this obligation for up to 12 months ("grace period").  If you
+are obligated to release code under section 2.b of this licence, such code
+must be released under these same terms including the 12-month grace period
+clause.
 
 This licence also comes with the added permission that you may link this
 program with the OpenSSL library and distribute executables, as long as you
diff --git a/README b/README
index 7ca8e3e8..40257a6d 100644
--- a/README
+++ b/README
@@ -20,7 +20,10 @@ LICENCE:
  Tahoe is offered under the GNU General Public License (v2 or later), with
  the added permission that, if you become obligated to release a derived work
  under this licence (as per section 2.b), you may delay the fulfillment of
- this obligation for up to 12 months.  See the COPYING file for details.
+ this obligation for up to 12 months.  If you are obligated to release code
+ under section 2.b of this licence, such code must be released under these
+ same terms including the 12-month grace period clause.  See the COPYING file
+ for details.
 
 
 GETTING PRECOMPILED BINARIES: