From f4b5fbc41843d4b00404c4f8465ea6cc689a10b4 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx <zooko@zooko.com> Date: Wed, 12 Sep 2007 11:31:57 -0700 Subject: [PATCH] README: update the wording of the "LICENCE" section to more closely follow FSF recommendations --- README | 17 +++++++++-------- setup.py | 6 ++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/README b/README index 4e495450..fb1bed8a 100644 --- 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 9d18432d..87a30257 100644 --- 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 -- 2.45.2