trans-coord/gnun licenses/gpl-faq.html licenses...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   12/01/05 19:10:23

Modified files:
        gnun/licenses  : gpl-faq.html license-list.html 
        gnun/philosophy: java-trap.html 

Log message:
        Automatic sync from the master www repository.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/gpl-faq.html?cvsroot=trans-coord&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/license-list.html?cvsroot=trans-coord&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/philosophy/java-trap.html?cvsroot=trans-coord&r1=1.16&r2=1.17

Patches:
Index: licenses/gpl-faq.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/gpl-faq.html,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- licenses/gpl-faq.html       13 Dec 2011 19:10:18 -0000      1.38
+++ licenses/gpl-faq.html       5 Jan 2012 19:10:21 -0000       1.39
@@ -112,8 +112,8 @@
     <li><a href="#WhyMustIInclude">Why does the GPL require including a
     copy of the GPL with every copy of the program?</a></li>
   
-    <li><a href="#WhatIfWorkIsShort">What if the work is not much longer
-    than the license itself?</a></li>
+    <li><a href="#WhatIfWorkIsShort">What if the work is not very
+    long?</a></li>
   
     <li><a href="#RequiredToClaimCopyright">Am I required to claim a
     copyright on my modifications to a GPL-covered program?</a></li>
@@ -240,8 +240,8 @@
     <li><a href="#WhyMustIInclude">Why does the GPL require including a
     copy of the GPL with every copy of the program?</a></li>
   
-    <li><a href="#WhatIfWorkIsShort">What if the work is not much longer
-    than the license itself?</a></li>
+    <li><a href="#WhatIfWorkIsShort">What if the work is not very
+    long?</a></li>
   
     <li><a href="#GPLOmitPreamble">Can I omit the preamble of the GPL,
     or the instructions for how to use it on your own programs, to save
@@ -971,13 +971,16 @@
 the program.</p></dd>
 
 
-<dt id="WhatIfWorkIsShort">What
-    if the work is not much longer than the license itself?
+<dt id="WhatIfWorkIsShort">What if the work is not very long?
  <span class="anchor-reference-id">(<a href="#WhatIfWorkIsShort"
  >#WhatIfWorkIsShort</a>)</span></dt>
-<dd><p>
-If a single program is that short, you may as well use a simple
-all-permissive license for it, rather than the GNU GPL.</p></dd>
+
+<dd><p>If a whole software package contains very little
+code&mdash;less than 300 lines is the benchmark we use&mdash;you may
+as well use a simple lax license for it, rather than a copyleft
+license like the GNU GPL.
+We <a href="/licenses/license-recommendations.html#software">recommend
+the Apache License 2.0</a> for such cases.</p></dd>
 
 
 <dt id="GPLOmitPreamble">Can I omit the preamble of the GPL, or the
@@ -3571,7 +3574,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/12/13 19:10:18 $
+$Date: 2012/01/05 19:10:21 $
 <!-- timestamp end -->
 </p>
 </div>

Index: licenses/license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- licenses/license-list.html  3 Jan 2012 19:10:17 -0000       1.72
+++ licenses/license-list.html  5 Jan 2012 19:10:22 -0000       1.73
@@ -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 19:10:17 $
+$Date: 2012/01/05 19:10:22 $
 <!-- timestamp end -->
 </p>
 </div>

Index: philosophy/java-trap.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/philosophy/java-trap.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- philosophy/java-trap.html   20 Sep 2011 18:10:28 -0000      1.16
+++ philosophy/java-trap.html   5 Jan 2012 19:10:23 -0000       1.17
@@ -41,7 +41,7 @@
 can cause a similar problem.  We must learn a lesson from the history of
 Java, so we can avoid other traps in the future.</p>
 
-<p>Please also see: <a href="javascript-trap.html">The Javascript
+<p>Please also see: <a href="javascript-trap.html">The JavaScript
 Trap</a>.</p>
 
 </div>
@@ -230,7 +230,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/09/20 18:10:28 $
+$Date: 2012/01/05 19:10:23 $
 <!-- timestamp end -->
 </p>
 </div>