From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 11 Nov 2010 04:39:26 +0000 (-0800)
Subject: docs: added permissions to avoid licence-incompatibility with other Free/Open Source... 
X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/nxhtml.html?a=commitdiff_plain;h=6e2b6c91337f087c1027dba53d5d289992fa6e88;p=tahoe-lafs%2Ftahoe-lafs.git

docs: added permissions to avoid licence-incompatibility with other Free/Open Source licences
---

diff --git a/COPYING.GPL b/COPYING.GPL
index 8701ff47..e7ba12bd 100644
--- a/COPYING.GPL
+++ b/COPYING.GPL
@@ -1,29 +1,51 @@
+This work also comes with the added permission that you may combine it
+with a work licensed under the OpenSSL license (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the OpenSSL
+license.
+
+This work also comes with the added permission that you may combine it
+with a work licensed under the Eclipse Public Licence (any version)
+and distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Eclipse
+Public Licence.
+
+This work also comes with the added permission that you may combine it
+with a work licensed under the Q Public Licence (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Q
+Public Licence.
+
 This work also comes with the added permission that you may combine it
-with the OpenSSL library and distribute the resulting combined work,
-as long as you follow the requirements of the licences of this work in
-regard to all of the software in the resulting combined work aside
-from OpenSSL.
+with a work licensed under the Apache Licence (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Apache
+Licence.
 
 This work also comes with the added permission that you may combine it
-with software licensed under the Eclipse Public Licence (any version) and distribute
-the resulting combined work, as long as you follow the requirements of
-the licences of this work in regard to all of the software in the
-resulting combined work aside from the software licensed under the
-Eclipse Public Licence.
+with a work licensed under the GNU Lesser General Public License (any
+version) and distribute the resulting combined work, as long as you
+follow the requirements of the licences of this work in regard to all
+of the the resulting combined work aside from the work licensed under
+the GNU Lesser General Public License.
 
 This work also comes with the added permission that you may combine it
-with software licensed under the Q Public Licence (any version) and distribute
-the resulting combined work, as long as you follow the requirements of
-the licences of this work in regard to all of the software in the
-resulting combined work aside from the software licensed under the
-Q Public Licence.
+with a work licensed under the Zope Public License (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Zope
+Public License.
 
 This work also comes with the added permission that you may combine it
-with software licensed under the Apache Licence (any version) and distribute
-the resulting combined work, as long as you follow the requirements of
-the licences of this work in regard to all of the software in the
-resulting combined work aside from the software licensed under the
-Apache Licence.
+with a work licensed under the Python Software Foundation License (any
+version) and distribute the resulting combined work, as long as you
+follow the requirements of the licences of this work in regard to all
+of the the resulting combined work aside from the work licensed under
+the Python Software Foundation License.
 
 
 		    GNU GENERAL PUBLIC LICENSE
diff --git a/COPYING.TGPPL.html b/COPYING.TGPPL.html
index fa943307..7cceb9fa 100644
--- a/COPYING.TGPPL.html
+++ b/COPYING.TGPPL.html
@@ -1,4 +1,4 @@
-<!DOCtype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCtype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html lang="en">
 
   <head>
@@ -8,42 +8,68 @@
 
     <link rel="stylesheet" href="style.css" type="text/css">
 
-    <meta name="description" content="an open source licence for commercial software">
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta name="description" content="a Free Software, Open Source licence">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
     <meta name="keywords" content="Zooko">
   </head>
 
   <body>
 
+
+<h1>Transitive Grace Period Public Licence ("TGPPL") v. 1.0</h1>
+
+
 <p>This work also comes with the added permission that you may combine it
-with the OpenSSL library and distribute the resulting combined work,
-as long as you follow the requirements of the licences of this work in
-regard to all of the software in the resulting combined work aside
-from OpenSSL.</p>
+with a work licensed under the OpenSSL license (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the OpenSSL
+license.
 
 <p>This work also comes with the added permission that you may combine it
-with software licensed under the Eclipse Public Licence (any version) and distribute
-the resulting combined work, as long as you follow the requirements of
-the licences of this work in regard to all of the software in the
-resulting combined work aside from the software licensed under the
-Eclipse Public Licence.</p>
+with a work licensed under the Eclipse Public Licence (any version)
+and distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Eclipse
+Public Licence.
 
 <p>This work also comes with the added permission that you may combine it
-with software licensed under the Q Public Licence (any version) and distribute
-the resulting combined work, as long as you follow the requirements of
-the licences of this work in regard to all of the software in the
-resulting combined work aside from the software licensed under the
-Q Public Licence.</p>
+with a work licensed under the Q Public Licence (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Q
+Public Licence.
 
 <p>This work also comes with the added permission that you may combine it
-with software licensed under the Apache Licence (any version) and distribute
-the resulting combined work, as long as you follow the requirements of
-the licences of this work in regard to all of the software in the
-resulting combined work aside from the software licensed under the
-Apache Licence.</p>
+with a work licensed under the Apache Licence (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Apache
+Licence.
+
+<p>This work also comes with the added permission that you may combine it
+with a work licensed under the GNU Lesser General Public License (any
+version) and distribute the resulting combined work, as long as you
+follow the requirements of the licences of this work in regard to all
+of the the resulting combined work aside from the work licensed under
+the GNU Lesser General Public License.
+
+<p>This work also comes with the added permission that you may combine it
+with a work licensed under the Zope Public License (any version) and
+distribute the resulting combined work, as long as you follow the
+requirements of the licences of this work in regard to all of the the
+resulting combined work aside from the work licensed under the Zope
+Public License.
+
+<p>This work also comes with the added permission that you may combine it
+with a work licensed under the Python Software Foundation License (any
+version) and distribute the resulting combined work, as long as you
+follow the requirements of the licences of this work in regard to all
+of the the resulting combined work aside from the work licensed under
+the Python Software Foundation License.
+
 
-<h1>Transitive Grace Period Public Licence ("TGPPL") v. 1.0</h1>
 
 <p>This Transitive Grace Period Public Licence (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:</p>
 
@@ -92,7 +118,7 @@ Apache Licence.</p>
 
   <li><b>Right to Use.</b> You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.</p>
 
-  <li><b>Modification of This License.</b> This License is Copyright © 2007 Zooko Wilcox-O'Hearn. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Transitive Grace Period Public Licence" or "TGPPL" and you may not use those names in the name of your Modified License; and (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License.</p>
+  <li><b>Modification of This License.</b> This License is Copyright © 2007 Zooko Wilcox-O'Hearn. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Transitive Grace Period Public Licence" or "TGPPL" and you may not use those names in the name of your Modified License; and (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License.</p>
 </ol>
 
               </td>