README: update the wording of the "LICENCE" section to more closely follow FSF recomm...

diff --git a/README b/README
index 4e4954503f459e6e238c74267bd22d76a0a14c2e..fb1bed8aca2aba7f7ae2fd92bbabe6764e23bf87 100644 (file)
--- a/README
+++ b/README
@@ -17,14 +17,15 @@ http://allmydata.org
 
 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.  If you are obligated to release code
- under section 2.b of this licence, you are obligated to release it under
- these same terms, including the 12-month grace period clause.  See the
- COPYING file
- for details.
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version, 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.  If you are
+ obligated to release code under section 2.b of this licence, you are
+ obligated to release it under these same terms, including the 12-month grace
+ period clause.  See the COPYING file for details.
 
 
 GETTING PRECOMPILED BINARIES:

diff --git a/setup.py b/setup.py
index 9d18432d9f282bc3634144c3d094044b124cc90b..87a3025700542ba8d93e5d889d5520f042fb5424 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -11,8 +11,10 @@
 # Software Foundation; either version 2 of the License, or (at your option)
 # any later version, 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 file
-# COPYING for details.
+# delay the fulfillment of this obligation for up to 12 months.  If you are
+# obligated to release code under section 2.b of this licence, you are
+# obligated to release it under these same terms, including the 12-month grace
+# period clause.  See the COPYING file for details.
 #
 # If you would like to inquire about a commercial relationship with Allmydata,
 # Inc., please contact partnerships@allmydata.com and visit