CVSROOT: /web/www
Module name: www
Changes by: Brett Smith <brett> 11/02/02 21:35:16
Modified files:
licenses : license-list.html
Log message:
nobody's using the Condor Public License anymore, either...
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.277&r2=1.278
Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -b -r1.277 -r1.278
--- license-list.html 2 Feb 2011 20:07:10 -0000 1.277
+++ license-list.html 2 Feb 2011 21:35:07 -0000 1.278
@@ -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>
@@ -1802,7 +1805,7 @@
<p>
Updated:
<!-- timestamp start -->
- $Date: 2011/02/02 20:07:10 $
+ $Date: 2011/02/02 21:35:07 $
<!-- timestamp end -->
</p>
</div>
