CVSROOT: /web/www
Module name: www
Changes by: Brett Smith <brett> 12/01/03 16:31:24
Modified files:
licenses : license-list.html
Log message:
Make sure all MPL references are versioned or otherwise appropriate.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.303&r2=1.304
Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -b -r1.303 -r1.304
--- license-list.html 3 Jan 2012 16:00:44 -0000 1.303
+++ license-list.html 3 Jan 2012 16:30:09 -0000 1.304
@@ -582,15 +582,7 @@
<p>This is the disjunction of the <a href="#NPL">Netscape Public
License</a> and the <a href="/licenses/gpl.html">GNU GPL</a>. Because
of that, it is a free software license, compatible with the GNU GPL, but
-not a strong copyleft.</p> <p>This disjunctive license is a good choice
-if you want to make your package GPL-compatible and MPL-compatible.
-However, you can also accomplish that by using the LGPL or the Guile
-license.</p>
-
-<p>Such a disjunctive license might be a good choice if you have been
-using the MPL, and want to change to a GPL-compatible license without
-subtracting any permission you have given for previous
-versions.</p></dd>
+not a strong copyleft.</p></dd>
<dt><a id="newOpenLDAP"
@@ -970,7 +962,7 @@
<span class="anchor-reference-id"> (<a href="#CPAL">#CPAL</a>)</span></dt>
<dd>
<p>This is a free software license. It is based on the <a
-href="#MPL">Mozilla Public License</a>, and is incompatible with the GPL
+href="#MPL">Mozilla Public License</a> version 1, and is incompatible with the
GPL
for the same reasons: it has several requirements for modified versions
that do not exist in the GPL. It also requires you to publish the
source of the program if you allow others to use it.</p></dd>
@@ -1157,7 +1149,7 @@
<dt><a id="MPL" href="http://www.mozilla.org/MPL/MPL-1.1.html";>
- Mozilla Public License (MPL)</a>
+ Mozilla Public License (MPL) version 1.1</a>
<span class="anchor-reference-id">(<a href="#MPL">#MPL</a>)</span></dt>
<dd>
<p>This is a free software license which is not a strong copyleft;
@@ -1179,7 +1171,7 @@
<span class="anchor-reference-id">(<a href="#NOSL">#NOSL</a>)</span></dt>
<dd>
<p>This is a free software license that is essentially the same as the
-Mozilla Public License, Version 1.1. Like the MPL, the NOSL has some
+Mozilla Public License version 1.1. Like the MPL, the NOSL has some
complex restrictions that make it incompatible with the GNU GPL. That
is, a module covered by the GPL and a module covered by the NOSL cannot
legally be linked together. We urge you not to use the NOSL for this
@@ -1192,17 +1184,18 @@
<dd>
<p>This is a free software license, not a strong copyleft, and
incompatible with the GNU GPL. It consists of the Mozilla Public
-License with an added clause that permits Netscape to use your added
-code <em>even in their proprietary versions of the program</em>. Of
-course, they do not give <em>you</em> permission to use <em>their</em>
-code in the analogous way. We urge you not to use the NPL.</p></dd>
+License version 1.1 with an added clause that permits Netscape to use
+your added code <em>even in their proprietary versions of the
+program</em>. Of course, they do not give <em>you</em> permission to
+use <em>their</em> code in the analogous way. We urge you not to use
+the NPL.</p></dd>
<dt><a id="Nokia" href="http://opensource.org/licenses/nokia.html";>
Nokia Open Source License</a>
<span class="anchor-reference-id">(<a href="#Nokia">#Nokia</a>)</span></dt>
<dd>
-<p>This is similar to the Mozilla Public License: a free
+<p>This is similar to the Mozilla Public License version 1: a free
software license incompatible with the GNU GPL.</p></dd>
@@ -1355,7 +1348,7 @@
Sun Public License</a>
<span class="anchor-reference-id">(<a href="#SPL">#SPL</a>)</span></dt>
<dd>
-<p>This is essentially the same as the Mozilla Public License: a free
+<p>This is essentially the same as the Mozilla Public License version 1: a free
software license incompatible with the GNU GPL. Please do not confuse
this with the <a href="#SunCommunitySourceLicense">Sun Community Source
License</a>, which is not a free software license.</p></dd>
@@ -2196,7 +2189,7 @@
<p>Updated:
<!-- timestamp start -->
-$Date: 2012/01/03 16:00:44 $
+$Date: 2012/01/03 16:30:09 $
<!-- timestamp end -->
</p>
</div>
