From: Zooko O'Whielacronx zooko@zooko.com <zooko@zooko.com>
Date: Mon, 30 Apr 2007 16:09:35 +0000 (+0530)
Subject: zfec: update licence and install docs
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/%22doc.html/flags/COPYING.GPL?a=commitdiff_plain;h=546bd80b512858d4b7e22a2096c7a0027c50b137;p=tahoe-lafs%2Fzfec.git

zfec: update licence and install docs

darcs-hash:158a647b435352a26823c13e37dc257dad96f97b
---

diff --git a/zfec/COPYING b/zfec/COPYING
index 0c5b3e3..294b73f 100644
--- a/zfec/COPYING
+++ b/zfec/COPYING
@@ -3,6 +3,11 @@ 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.
 
+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
+follow the requirements of this licence in regard to all of the software in
+the executable aside from OpenSSL.
+
 
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
diff --git a/zfec/README.txt b/zfec/README.txt
index 3e11b45..987cd3d 100644
--- a/zfec/README.txt
+++ b/zfec/README.txt
@@ -3,12 +3,10 @@
 This package implements an "erasure code", or "forward error correction
 code".
 
-It is offered under 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.  See the file COPYING
-for details.
+It 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.
 
 The most widely known example of an erasure code is the RAID-5 algorithm
 which makes it so that in the event of the loss of any one hard drive, the
@@ -32,7 +30,7 @@ build and install the package directly into your system, just run "python
 ./setup.py install".  If you prefer to keep the package limited to a specific
 directory so that you can explicitly manage it (perhaps by using the "GNU
 stow") tool, then give it these arguments: "python ./setup.py install
---prefix= --root=$specificdirectory".
+--prefix=. --root=$specificdirectory".
 
 
  * Community