www/licenses license-list.html

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     12/01/05 15:29:21

Modified files:
        licenses       : license-list.html 

Log message:
        Non-substantive edits to the MPL 2.0 entry.
        
        * "MPL 2.0" is Mozilla's preferred abbreviation.
        
        * In cases where a work is distributed under multiple GNU licenses (it
          happens), MPL 2.0 section 3.3 gives you permission to distribute its
          covered work under the terms of *all* of the licenses used by the
          work.  These edits are more explicit on this point.

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

Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -b -r1.304 -r1.305
--- license-list.html   3 Jan 2012 16:30:09 -0000       1.304
+++ license-list.html   5 Jan 2012 15:27:52 -0000       1.305
@@ -523,25 +523,25 @@
 <p>This is a free software license.  Section 3.3 provides indirect
 compatibility between this license and the GNU GPL version 2.0, the
 GNU LGPL version 2.1, the GNU AGPL version 3.0, and all later versions
-of those licenses.  When you receive work under the MPL version 2.0,
+of those licenses.  When you receive work under MPL 2.0,
 you may make a &ldquo;Larger Work&rdquo; that combines that work with
-work under one of those GNU licenses.  When you do, section 3.3 gives
+work under those GNU licenses.  When you do, section 3.3 gives
 you permission to distribute the MPL-covered work under the terms of
-that same GNU license, with one condition: you must make sure that the
+the same GNU licenses, with one condition: you must make sure that the
 files that were originally under the MPL are still available under the
 MPL's terms as well.  In other words, when you make a combination this
 way, the files that were originally under the MPL will be dual
-licensed under the MPL and the GNU license.  The end result is that
-the Larger Work, as a whole, will be covered under the GNU license.
+licensed under the MPL and the GNU license(s).  The end result is that
+the Larger Work, as a whole, will be covered under the GNU license(s).
 People who receive that combination from you will have the option to
 use any files that were originally covered by the MPL under that
 license's terms, or distribute the Larger Work in whole or in part
-under the terms of the GNU license with no further restrictions.</p>
+under the GNU licenses' terms with no further restrictions.</p>
 
 <p>It's important to understand that the condition to distribute files
 under the MPL's terms only applies to the party that first creates and
 distributes the Larger Work.  If it applied to their recipients as well, it
-would be a further restriction and incompatible with the GNU licenses.
+would be a further restriction and incompatible with the GPL and AGPL.
 That said, when you make contributions to an existing project, we usually
 <a href="/licenses/license-recommendations.html#contributing">recommend that 
you keep your changes under the same license</a>,
 even when you're not required to do so.  If you receive a work under a GNU
@@ -549,8 +549,8 @@
 MPL from those files when there's a strong reason to justify it.</p>
 
 <p>Check the license notices on the MPL-covered software before you make
-a Larger Work this way.  Parties who release original work under the
-MPL version 2.0 may choose to opt out of this compatibility by
+a Larger Work this way.  Parties who release original work under
+MPL 2.0 may choose to opt out of this compatibility by
 including a sentence in the license notices that says that the work is
 &ldquo;Incompatible With Secondary Licenses.&rdquo; Any software that
 includes this notice is <strong>not</strong> compatible with the GPL
@@ -2189,7 +2189,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2012/01/03 16:30:09 $
+$Date: 2012/01/05 15:27:52 $
 <!-- timestamp end -->
 </p>
 </div>