www/licenses license-list.html

[Richard M. Stallman]

CVSROOT:        /web/www
Module name:    www
Changes by:     Richard M. Stallman <rms>       13/12/27 20:22:02

Modified files:
        licenses       : license-list.html 

Log message:
        Alphabetize the GPL-compatible free licenses.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.385&r2=1.386

Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -b -r1.385 -r1.386
--- license-list.html   16 Dec 2013 22:52:26 -0000      1.385
+++ license-list.html   27 Dec 2013 20:22:01 -0000      1.386
@@ -404,6 +404,7 @@
 href="/philosophy/why-not-lgpl.html">disadvantages</a>
 as the LGPL.</p></dd>
 
+
 <dt><a id="ECL2.0"
        href="http://directory.fsf.org/wiki/License:ECL2.0";>
     Educational Community License 2.0</a>
@@ -811,6 +812,18 @@
 license for one, we recommend the Apache 2.0 license since it protects
 users from patent treachery.</p></dd>
 
+<dt><a id="Wx"></a>WxWidgets License <span class="anchor-reference-id">(<a 
href="#Wx">#Wx</a>)</span></dt>
+<dd>
+<p>The WxWidgets license is a GPL-compatible free software license. It
+consists of the  <a href="/licenses/old-licenses/lgpl-2.0.html">LGPL 2.0</a> 
+or any later version, plus an additional permission allowing binary
+distributions that use the library to be licensed under terms of the
+distributor's choice (including proprietary). Like the LGPL it is a
+weak copyleft license, so we recommend it <a
+href="/licenses/why-not-lgpl.html"> only in special
+circumstances</a>.</p>
+</dd>
+
 <dt><a id="X11License" href="http://directory.fsf.org/wiki/License:X11";>
     X11 License</a>
     <span class="anchor-reference-id">
@@ -866,18 +879,6 @@
 <p>This is a lax, permissive non-copyleft free software license
 which is compatible with the GNU GPL.</p></dd>
 
-<dt><a id="Wx"></a>WxWidgets License <span class="anchor-reference-id">(<a 
href="#Wx">#Wx</a>)</span></dt>
-<dd>
-<p>The WxWidgets license is a GPL-compatible free software license. It
-consists of the  <a href="/licenses/old-licenses/lgpl-2.0.html">LGPL 2.0</a> 
-or any later version, plus an additional permission allowing binary
-distributions that use the library to be licensed under terms of the
-distributor's choice (including proprietary). Like the LGPL it is a
-weak copyleft license, so we recommend it <a
-href="/licenses/why-not-lgpl.html"> only in special
-circumstances</a>.</p>
-</dd>
-
 </dl>
 
 
@@ -1042,8 +1043,10 @@
 <p>The Condor Public License is a free software license.  It has a
 couple of requirements that make it incompatible with the GNU GPL,
 including strong restrictions on the use of Condor-related names, and
-a condition that you must comply with United States export laws.</p></dd>
-
+requires redistributors to &dquo;represent and warrant&rdquo; that
+they will comply with United States export laws.  (If it made
+compliance an actual condition of the license, it would not be a free
+software license.)</p></dd>
 
 <dt><a id="EPL" href="http://directory.fsf.org/wiki/License:EPLv1.0";>
     Eclipse Public License Version 1.0</a>
@@ -2276,7 +2279,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2013/12/16 22:52:26 $
+$Date: 2013/12/27 20:22:01 $
 <!-- timestamp end -->
 </p>
 </div>