[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses gpl-faq.html
|
From: |
Brett Smith |
|
Subject: |
www/licenses gpl-faq.html |
|
Date: |
Mon, 16 Jul 2007 13:55:00 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Brett Smith <brett> 07/07/16 13:55:00
Modified files:
licenses : gpl-faq.html
Log message:
In a previous edit, I overgeneralized the footnotes for various LGPL
conversions. This fixes them.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.104&r2=1.105
Patches:
Index: gpl-faq.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.html,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- gpl-faq.html 11 Jul 2007 13:42:56 -0000 1.104
+++ gpl-faq.html 16 Jul 2007 13:54:44 -0000 1.105
@@ -3065,7 +3065,7 @@
<td class="ok">OK</td>
<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a></td>
<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a></td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
@@ -3073,9 +3073,9 @@
<td class="nok">NO</td>
<td class="mok">OK if you upgrade to GPLv3 <a
href="#compat-matrix-footnote-3">[3]</a></td>
<td class="ok">OK</td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
@@ -3083,10 +3083,10 @@
only</th>
<td class="mok">OK if you convert to GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a></td>
<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
<td class="ok">OK</td>
<td class="ok">OK <a href="#comat-matrix-footnote-6">[6]</a></td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
@@ -3103,8 +3103,8 @@
<tr>
<th class="gpl-matrix-license gpl-matrix-border">LGPLv3</th>
<td class="nok">NO</td>
-<td class="mok">OK if you upgrade and convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you upgrade and convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
<td class="mok">OK if you upgrade to LGPLv3 <a
href="#comat-matrix-footnote-4">[4]</a></td>
<td class="ok">OK</td>
@@ -3128,7 +3128,7 @@
<td class="ok">OK</td>
<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-1">[1]</a></td>
<td class="mok">OK if you convert to GPL <a
href="#compat-matrix-footnote-7">[7]</a></td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
@@ -3136,9 +3136,9 @@
<td class="nok">NO</td>
<td class="mok">OK if you upgrade to GPLv3 <a
href="#compat-matrix-footnote-3">[3]</a></td>
<td class="ok">OK</td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
-<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK if you convert to GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
@@ -3201,16 +3201,14 @@
project contains the code released under LGPLv2.1 only, you will not be
able to upgrade the project's license to LGPLv3 or later.</p>
-<p><a name="compat-matrix-footnote-7">7</a>: Every version of the LGPL
-gives you permission to relicense the code under the corresponding version
-(or any later version) of the GPL. If you can switch the LGPLed code in
-this case to using the GPL instead, you can make this combination.</p>
-
-<p><a name="compat-matrix-footnote-8">8</a>: Every version of the LGPL
-gives you permission to relicense the code under the corresponding version,
-or any later version, of the GPL. In these cases, you can combine the code
-if you migrate its license to GPLv3, and use GPLv3 for your own work as
-well.</p>
+<p><a name="compat-matrix-footnote-7">7</a>: LGPLv2.1 gives you permission
+to relicense the code under any version of the GPL since GPLv2. If you can
+switch the LGPLed code in this case to using an appropriate version of the
+GPL instead (as noted in the table), you can make this combination.</p>
+
+<p><a name="compat-matrix-footnote-8">8</a>: LGPLv3 gives you permission to
+relicense the code under GPLv3. In these cases, you can combine the code
+if you convert the LGPLed code to GPLv3.</p>
<a name="matrix-skip-target"></a>
</dd>
@@ -3251,7 +3249,7 @@
<p>
Updated:
<!-- timestamp start -->
- $Date: 2007/07/11 13:42:56 $
+ $Date: 2007/07/16 13:54:44 $
<!-- timestamp end -->
</p>
</div>