www/licenses gpl-faq.html

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     11/07/07 16:48:57

Modified files:
        licenses       : gpl-faq.html 

Log message:
        changes inspired by #697875

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/gpl-faq.html?cvsroot=www&r1=1.163&r2=1.164

Patches:
Index: gpl-faq.html
===================================================================
RCS file: /web/www/www/licenses/gpl-faq.html,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- gpl-faq.html        5 Jul 2011 15:52:11 -0000       1.163
+++ gpl-faq.html        7 Jul 2011 16:47:41 -0000       1.164
@@ -3161,7 +3161,7 @@
 assumes that someone else has written some software under one of these
 licenses, and you want to somehow incorporate code from that into a project
 that you're releasing (either your own original work, or a modified version
-of someone else's GPLed software). Find the license for your own work in a
+of someone else's software). Find the license for your project in a
 column at the top of the table, and the license for the other code in a row
 on the left. The cell where they meet will tell you whether or not this
 combination is permitted.</p>
@@ -3323,9 +3323,14 @@
 when incorporating the code in this case. You cannot take advantage of
 terms in later versions of the GPL.</p>
 
-<p id="compat-matrix-footnote-2">2: If you do this, as long as the
-project contains the code released under GPLv2 only, you will not be
-able to upgrade the project's license to GPLv3 or later.</p>
+<p id="compat-matrix-footnote-2">2: While you may release your project
+(either your original work and/or work that you received and modified)
+under GPLv2-or-later in this case, note that the other code you're
+using must remain under GPLv2 only.  As long as your project depends
+on that code, you won't be able to upgrade the license of your project
+to GPLv3-or-later, and the work as a whole (any combination of both
+your project and the other code) can only be conveyed under the terms
+of GPLv2.</p>
 
 <p id="compat-matrix-footnote-3">3: If you have the ability to release
 the project under GPLv2 or any later version, you can choose to
@@ -3398,7 +3403,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/07/05 15:52:11 $
+$Date: 2011/07/07 16:47:41 $
 <!-- timestamp end -->
 </p>
 </div>