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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   11/02/08 19:10:12

Modified files:
        gnun/licenses  : gpl-faq.html license-list.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.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/licenses/license-list.html?cvsroot=trans-coord&r1=1.51&r2=1.52

Patches:
Index: gpl-faq.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/gpl-faq.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gpl-faq.html        10 Jan 2011 19:11:13 -0000      1.27
+++ gpl-faq.html        8 Feb 2011 19:10:12 -0000       1.28
@@ -3229,7 +3229,7 @@
 <td class="mok">OK: Convey code under GPLv2 or later&nbsp;<a 
href="#compat-matrix-footnote-7">[7]</a></td>
 <td class="mok">OK: Convey code under GPLv3&nbsp;<a 
href="#compat-matrix-footnote-7">[7]</a></td>
 <td class="ok">OK</td>
-<td class="ok">OK&nbsp;<a href="#comat-matrix-footnote-6">[6]</a></td>
+<td class="ok">OK&nbsp;<a href="#compat-matrix-footnote-6">[6]</a></td>
 <td class="mok">OK: Convey code under GPLv3&nbsp;<a 
href="#compat-matrix-footnote-7">[7]</a><a 
href="#compat-matrix-footnote-8">[8]</a></td>
 </tr>
 
@@ -3239,7 +3239,7 @@
 <td class="mok">OK: Convey code under GPLv2&nbsp;<a 
href="#compat-matrix-footnote-7">[7]</a><a 
href="#compat-matrix-footnote-1">[1]</a></td>
 <td class="mok">OK: Convey code under GPLv2 or later&nbsp;<a 
href="#compat-matrix-footnote-7">[7]</a></td>
 <td class="mok">OK: Convey code under GPLv3&nbsp;<a 
href="#compat-matrix-footnote-7">[7]</a></td>
-<td class="ok">OK&nbsp;<a href="#comat-matrix-footnote-5">[5]</a></td>
+<td class="ok">OK&nbsp;<a href="#compat-matrix-footnote-5">[5]</a></td>
 <td class="ok">OK</td>
 <td class="ok">OK</td>
 </tr>
@@ -3250,7 +3250,7 @@
 <td class="mok">OK: Convey project and code under GPLv3&nbsp;<a 
href="#compat-matrix-footnote-8">[8]</a><a 
href="#compat-matrix-footnote-3">[3]</a></td>
 <td class="mok">OK: Convey code under GPLv3&nbsp;<a 
href="#compat-matrix-footnote-8">[8]</a></td>
 <td class="mok">OK: Convey project and code under GPLv3&nbsp;<a 
href="#compat-matrix-footnote-7">[7]</a><a 
href="#compat-matrix-footnote-8">[8]</a></td>
-<td class="mok">OK: Convey project under LGPLv3&nbsp;<a 
href="#comat-matrix-footnote-4">[4]</a></td>
+<td class="mok">OK: Convey project under LGPLv3&nbsp;<a 
href="#compat-matrix-footnote-4">[4]</a></td>
 <td class="ok">OK</td>
 </tr>
 
@@ -3394,7 +3394,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2011/01/10 19:11:13 $
+$Date: 2011/02/08 19:10:12 $
 <!-- timestamp end -->
 </p>
 </div>

Index: license-list.html
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/licenses/license-list.html,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- license-list.html   24 Jan 2011 19:10:12 -0000      1.51
+++ license-list.html   8 Feb 2011 19:10:12 -0000       1.52
@@ -750,10 +750,13 @@
 <dt><a id="Condor" 
href="http://www.cs.wisc.edu/condor/condor-public-license.html#condor";>
     Condor Public License</a></dt>
 <dd>
-<p>This 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>
+<p>Recent versions of Condor (from 6.9.5 on) are released under the
+  <a href="#Apache2">Apache License 2.0</a>.  Only older versions of
+  Condor use this license.</p>
+<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>
 
 
@@ -1405,8 +1408,7 @@
   the software from someone who did not obey the license's
   terms.</li></ul></dd>
 
-<dt><a id="Squeak" href="http://squeak.org/SqueakLicense/";>
-    Squeak license</a></dt>
+<dt id="Squeak">Old Squeak license</dt>
 <dd>
 <p>The original Squeak license, as applied to software, is not a free
 software license because it requires all users in whatever country to
@@ -1415,7 +1417,7 @@
 <p>In addition, it has a requirement for users to indemnify the
 developer, which is enough to make many users think twice about using it
 at all.</p>
-<p>Recent versions of Squeak are released under an
+<p>Recent versions of Squeak (from 4.0 on) are released under an
 <a href="#Expat">Expat-style License</a> with some portions of the code
 under the <a href="#apache2">Apache License 2.0</a>.</p>
 </dd>
@@ -1803,7 +1805,7 @@
   <p>
     Updated:
     <!-- timestamp start -->
-    $Date: 2011/01/24 19:10:12 $
+    $Date: 2011/02/08 19:10:12 $
     <!-- timestamp end -->
   </p>
 </div>