www/licenses license-list.html

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     12/02/22 22:28:57

Modified files:
        licenses       : license-list.html 

Log message:
        Update in light of MPL 2.0.  #719414

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

Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -b -r1.306 -r1.307
--- license-list.html   23 Jan 2012 17:13:37 -0000      1.306
+++ license-list.html   22 Feb 2012 22:27:58 -0000      1.307
@@ -1175,16 +1175,21 @@
 <dd>
 <p>This is a free software license which is not a strong copyleft;
 unlike the <a href="#X11License">X11 license</a>, it has some complex
-restrictions that make it incompatible with the <a
-href="/licenses/gpl.html">GNU GPL</a>.  That is, a
-module covered by the GPL and a module covered by the MPL cannot legally
-be linked together.  We urge you not to use the MPL for this reason.</p>
+restrictions that make it incompatible with
+the <a href="/licenses/gpl.html">GNU GPL</a>.  That is, a module
+covered by the GPL and a module covered by the MPL cannot legally be
+linked together.  We urge you not to use the MPL 1.1 for this
+reason.</p>
 
 <p>However, MPL 1.1 has a provision (section 13) that allows a program
 (or parts of it) to offer a choice of another license as well.  If part
 of a program allows the GNU GPL as an alternate choice, or any other
 GPL-compatible license as an alternate choice, that part of the program
-has a GPL-compatible license.</p></dd>
+has a GPL-compatible license.</p>
+
+<p>MPL version 2.0 has a number of improvements, including
+GPL-compatibility by default.  <a href="#MPL-2.0">See that entry</a>
+for details.</p></dd>
 
 
 <dt><a id="NOSL" href="http://bits.netizen.com.au/licenses/NOSL/nosl.txt";>
@@ -2210,7 +2215,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/01/23 17:13:37 $
+$Date: 2012/02/22 22:27:58 $
 <!-- timestamp end -->
 </p>
 </div>