trans-coord/gnun licenses/gpl-faq.html philosop...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   11/07/07 18:10:15

Modified files:
        gnun/licenses  : gpl-faq.html 
        gnun/philosophy: philosophy.html 
        gnun/server    : footer-text.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/gpl-faq.html?cvsroot=trans-coord&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/philosophy.html?cvsroot=trans-coord&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/footer-text.html?cvsroot=trans-coord&r1=1.11&r2=1.12

Patches:
Index: licenses/gpl-faq.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/gpl-faq.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- licenses/gpl-faq.html       5 Jul 2011 18:10:15 -0000       1.31
+++ licenses/gpl-faq.html       7 Jul 2011 18:10:15 -0000       1.32
@@ -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 18:10:15 $
+$Date: 2011/07/07 18:10:15 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/philosophy.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/philosophy.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- philosophy/philosophy.html  8 May 2011 18:10:13 -0000       1.58
+++ philosophy/philosophy.html  7 Jul 2011 18:10:15 -0000       1.59
@@ -15,6 +15,7 @@
 <p>Hot off the presses, here are the latest published articles on free
 software and the GNU project.</p>
 <ul>
+  <li><a href="/philosophy/the-danger-of-ebooks.html">The Danger of 
E-Books</a></li>
   <li><a href="/philosophy/practical.html">The advantages of free 
software</a></li>
   <li><a href="/philosophy/assigning-copyright.html">When a Company
       Asks For Your Copyright</a></li>
@@ -135,7 +136,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/05/08 18:10:13 $
+$Date: 2011/07/07 18:10:15 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/footer-text.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/footer-text.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/footer-text.html     9 May 2011 18:10:13 -0000       1.11
+++ server/footer-text.html     7 Jul 2011 18:10:15 -0000       1.12
@@ -47,8 +47,8 @@
         <li><a href="/licenses/lgpl.html">GNU LGPL</a></li>
         <li><a href="/licenses/fdl.html">GNU FDL</a></li></ul></li>
         <li><a href="/licenses/gpl-faq.html">Software licensing FAQ</a></li>
-        <li><a href="/licenses/gpl-faq.html">Licensing compliance</a></li>
-        <li><a href="/licenses/gpl-faq.html">How to use GNU licenses for your 
own software</a></li></ul></li>
+        <li><a href="http://www.fsf.org/licensing/compliance";>Licensing 
compliance</a></li>
+        <li><a href="/licenses/gpl-howto.html">How to use GNU licenses for 
your own software</a></li></ul></li>
        <li><a href="http://www.fsf.org/resources/service/";>GNU Service 
Directory</a></li>
        <li><a href="/fun/fun.html">GNU Fun</a></li>
        <li><a href="/graphics/graphics.html">GNU Art</a></li>