CVSROOT: /web/www
Module name: www
Changes by: Brett Smith <brett> 11/01/07 21:36:22
Modified files:
licenses : gpl-faq.html
Log message:
Less jargon in the huge compatibility table.
"Convert" and "upgrade" were accurate terms, but had a little too much
nuance packed into them, especially for non-native speakers. Instead
just use one verb (convey) and be explicit about what the different
license applies to.
I'm about to tackle the footnotes but I want to see how this changes
the shape of the table first.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.156&r2=1.157
Patches:
Index: gpl-faq.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.html,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- gpl-faq.html 4 Jan 2011 17:51:28 -0000 1.156
+++ gpl-faq.html 7 Jan 2011 21:36:12 -0000 1.157
@@ -3197,8 +3197,8 @@
<td class="ok">OK</td>
<td class="ok">OK <a href="#compat-matrix-footnote-2">[2]</a></td>
<td class="nok">NO</td>
-<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 GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="mok">OK: Convey project under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey project under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
<td class="nok">NO</td>
</tr>
@@ -3207,38 +3207,38 @@
<td class="ok">OK <a href="#compat-matrix-footnote-1">[1]</a></td>
<td class="ok">OK</td>
<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-8">[8]</a></td>
+<td class="mok">OK: Convey project under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey project under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey project under GPLv3 or later <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
<th class="gpl-matrix-license gpl-matrix-border">GPLv3</th>
<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="mok">OK: Convey project under 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-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>
+<td class="mok">OK: Convey project under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey project under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK: Convey project under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1
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-7">[7]</a></td>
+<td class="mok">OK: Convey code under GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey code under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="mok">OK: Convey code under 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-7">[7]</a><a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK: Convey code under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
<th class="gpl-matrix-license gpl-matrix-border">LGPLv2.1
or later</th>
-<td class="mok">OK if you convert to GPLv2 <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: Convey code under GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="mok">OK: Convey code under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey code under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
<td class="ok">OK <a href="#comat-matrix-footnote-5">[5]</a></td>
<td class="ok">OK</td>
<td class="ok">OK</td>
@@ -3247,10 +3247,10 @@
<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-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="mok">OK: Convey project and code under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK: Convey code under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK: Convey project and code under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
+<td class="mok">OK: Convey project under LGPLv3 <a
href="#comat-matrix-footnote-4">[4]</a></td>
<td class="ok">OK</td>
</tr>
@@ -3260,8 +3260,8 @@
<td class="ok">OK</td>
<td class="ok">OK <a href="#compat-matrix-footnote-2">[2]</a></td>
<td class="nok">NO</td>
-<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 GPLv2 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
+<td class="mok">OK: Convey project under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey project under GPLv2 only <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-2">[2]</a></td>
<td class="nok">NO</td>
</tr>
@@ -3270,19 +3270,19 @@
<td class="ok">OK <a href="#compat-matrix-footnote-1">[1]</a></td>
<td class="ok">OK</td>
<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-8">[8]</a></td>
+<td class="mok">OK: Convey project under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-1">[1]</a></td>
+<td class="mok">OK: Convey project under GPLv2 or later <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey project under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
<th class="gpl-matrix-license gpl-matrix-border">GPLv3</th>
<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="mok">OK: Convey project under 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-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>
+<td class="mok">OK: Convey project under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a></td>
+<td class="mok">OK: Convey project under GPLv3 <a
href="#compat-matrix-footnote-7">[7]</a><a
href="#compat-matrix-footnote-3">[3]</a></td>
+<td class="mok">OK: Convey project under GPLv3 <a
href="#compat-matrix-footnote-8">[8]</a></td>
</tr>
<tr>
@@ -3394,7 +3394,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2011/01/04 17:51:28 $
+$Date: 2011/01/07 21:36:12 $
<!-- timestamp end -->
</p>
</div>
