trans-coord/gnun licenses/gpl-faq.html server/w...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   11/02/12 19:10:08

Modified files:
        gnun/licenses  : gpl-faq.html 
        gnun/server    : whatsnew.include 

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.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/whatsnew.include?cvsroot=trans-coord&r1=1.37&r2=1.38

Patches:
Index: licenses/gpl-faq.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/gpl-faq.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- licenses/gpl-faq.html       8 Feb 2011 19:10:12 -0000       1.28
+++ licenses/gpl-faq.html       12 Feb 2011 19:10:08 -0000      1.29
@@ -3308,7 +3308,7 @@
 <tr>
 <th class="gpl-matrix-license gpl-matrix-border">LGPLv3</th>
 <td class="nok">NO</td>
-<td class="ok">OK</td>
+<td class="mok">OK: Convey project under GPLv3&nbsp;<a 
href="#compat-matrix-footnote-9">[9]</a></td>
 <td class="ok">OK</td>
 <td class="ok">OK</td>
 <td class="ok">OK</td>
@@ -3356,6 +3356,10 @@
 relicense the code under GPLv3.  In these cases, you can combine the
 code if you convert the LGPLed code to GPLv3.</p>
 
+<p id="compat-matrix-footnote-9">9: Because GPLv2 does not permit
+combinations with LGPLv3, you must convey the project under GPLv3's
+terms in this case, since it will allow that combination.</p>
+
 <div id="matrix-skip-target"></div>
 </dd>
 
@@ -3394,7 +3398,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/02/08 19:10:12 $
+$Date: 2011/02/12 19:10:08 $
 <!-- timestamp end -->
 </p>
 </div>

Index: server/whatsnew.include
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/whatsnew.include,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/whatsnew.include     27 Jan 2011 19:10:13 -0000      1.37
+++ server/whatsnew.include     12 Feb 2011 19:10:08 -0000      1.38
@@ -1,4 +1,4 @@
-<p><a href="/events.tmp.html"><strong>Coming Events</strong></a>
+<p><a href="http://www.fsf.org/events";><strong>Coming Events</strong></a>
                    | <a href="/keepingup.html"><strong>Keeping Up With 
GNU/FSF</strong></a>
                    | <a href="/press/press.html"><strong>Press 
Information</strong></a>
                    and <a 
href="/press/press.html#releases"><strong>Releases</strong></a></p><dl>