trans-coord/gnun licenses/license-list.html phi...

[Yavor Doganov]

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

Modified files:
        gnun/licenses  : license-list.html 
        gnun/philosophy: free-sw.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/license-list.html?cvsroot=trans-coord&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/free-sw.html?cvsroot=trans-coord&r1=1.7&r2=1.8

Patches:
Index: licenses/license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- licenses/license-list.html  9 Dec 2008 19:10:42 -0000       1.23
+++ licenses/license-list.html  11 Dec 2008 19:10:43 -0000      1.24
@@ -95,10 +95,13 @@
 <p>This is the latest version of the GNU GPL: a free software license, and
 a copyleft license.  We recommend it for most software packages.</p>
 
-<p>Please note that GPLv3 is not compatible with GPLv2 by itself.  However,
-most software released under GPLv2 allows you to use the terms of later
-versions of the GPL as well.  When this is the case, you can use the
-code under GPLv3 to make the desired combination.</p></dd>
+<p>Please note that GPLv3 is not compatible with GPLv2 by itself.
+However, most software released under GPLv2 allows you to use the
+terms of later versions of the GPL as well.  When this is the case,
+you can use the code under GPLv3 to make the desired combination.  To
+learn more about compatibility between GNU licenses,
+please <a href="/licenses/gpl-faq.html#AllCompatibility">see our
+FAQ</a>.</p></dd>
 
 <dt><a id="GPLv2" href="/licenses/old-licenses/gpl-2.0.html">
     GNU General Public License (GPL) version 2</a></dt>
@@ -108,10 +111,13 @@
 a copyleft license.  We recommend <a href="#GNUGPL">the latest version</a>
 for most software.</p>
 
-<p>Please note that GPLv2 is, by itself, not compatible with GPLv3.  However,
-most software released under GPLv2 allows you to use the terms of later
-versions of the GPL as well.  When this is the case, you can use the
-code under GPLv3 to make the desired combination.</p></dd>
+<p>Please note that GPLv2 is, by itself, not compatible with GPLv3.
+However, most software released under GPLv2 allows you to use the
+terms of later versions of the GPL as well.  When this is the case,
+you can use the code under GPLv3 to make the desired combination.  To
+learn more about compatibility between GNU licenses,
+please <a href="/licenses/gpl-faq.html#AllCompatibility">see our
+FAQ</a>.</p></dd>
 
 
 <dt><a id="LGPL" href="/licenses/lgpl.html">
@@ -123,19 +129,26 @@
 href="/licenses/why-not-lgpl.html">special circumstances
 only</a>.</p>
 
-<p>Please note that LGPLv3 is not compatible with GPLv2 by itself.  However,
-most software released under GPLv2 allows you to use the terms of later
-versions of the GPL as well.  When this is the case, you can use the
-code under GPLv3 to make the desired combination.</p></dd>
+<p>Please note that LGPLv3 is not compatible with GPLv2 by itself.
+However, most software released under GPLv2 allows you to use the
+terms of later versions of the GPL as well.  When this is the case,
+you can use the code under GPLv3 to make the desired combination.  To
+learn more about compatibility between GNU licenses,
+please <a href="/licenses/gpl-faq.html#AllCompatibility">see our
+FAQ</a>.</p></dd>
 
 <dt><a id="LGPLv2.1" href="/licenses/old-licenses/lgpl-2.1.html">
     GNU Lesser General Public License (LGPL) version 2.1</a></dt>
 <dd>
-<p>This is the previous version of the LGPL: a free software license, but
-not a strong copyleft license, because it permits linking with non-free
-modules.  It is compatible with GPLv2 and GPLv3.  We generally recommend <a
-href="#LGPL">the latest version of the LGPL</a>, <a
-href="/licenses/why-not-lgpl.html">for special circumstances only</a>.</p></dd>
+<p>This is the previous version of the LGPL: a free software license,
+but not a strong copyleft license, because it permits linking with
+non-free modules.  It is compatible with GPLv2 and GPLv3.  We
+generally recommend <a href="#LGPL">the latest version of the
+LGPL</a>, <a href="/licenses/why-not-lgpl.html">for special
+circumstances only</a>.  To learn more about how LGPLv2.1 is
+compatible with other GNU licenses,
+please <a href="/licenses/gpl-faq.html#AllCompatibility">see our
+FAQ</a>.</p></dd>
 
 <dt><a id="AGPLv3.0" href="/licenses/agpl.html">GNU Affero General Public
 License (AGPL) version 3</a></dt>
@@ -1688,7 +1701,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2008/12/09 19:10:42 $
+    $Date: 2008/12/11 19:10:43 $
     <!-- timestamp end -->
   </p>
 </div>

Index: philosophy/free-sw.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/free-sw.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- philosophy/free-sw.html     9 Dec 2008 19:10:42 -0000       1.7
+++ philosophy/free-sw.html     11 Dec 2008 19:10:43 -0000      1.8
@@ -174,7 +174,7 @@
 is refuse to impose them as conditions of use of the program.  In this
 way, the restrictions will not affect activities and people outside the
 jurisdictions of these governments.  Thus, free software licenses
-must not require obedience to any export regulations a condition of
+must not require obedience to any export regulations as a condition of
 any of the essential freedoms.
 </p>
 
@@ -380,7 +380,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/12/09 19:10:42 $
+$Date: 2008/12/11 19:10:43 $
 <!-- timestamp end -->
 </p>
 </div>