[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/licenses license-list.html
From: |
Karl Berry |
Subject: |
www/licenses license-list.html |
Date: |
Tue, 13 Feb 2007 17:17:08 +0000 |
CVSROOT: /web/www
Module name: www
Changes by: Karl Berry <karl> 07/02/13 17:17:08
Modified files:
licenses : license-list.html
Log message:
The name of the Apache license is "Apache License", ticket 329735
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.170&r2=1.171
Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -b -r1.170 -r1.171
--- license-list.html 22 Jan 2007 16:25:28 -0000 1.170
+++ license-list.html 13 Feb 2007 17:16:59 -0000 1.171
@@ -631,10 +631,10 @@
<dt><a href="http://www.apache.org/licenses/LICENSE-2.0">
-Apache Software License, version 2.0</a></dt>
+Apache License, Version 2.0</a></dt>
<dd>
<p>This is a free software license but it is incompatible with the
-GPL. The Apache Software License is incompatible with the GPL because
+GPL. The Apache License is incompatible with the GPL because
it has a specific requirement that is not in the GPL: it has certain
patent termination cases that the GPL does not require. (We don't
think those patent termination cases are inherently a bad idea, but
@@ -1655,7 +1655,7 @@
<p>
Updated:
<!-- timestamp start -->
-$Date: 2007/01/22 16:25:28 $ $Author: brett $
+$Date: 2007/02/13 17:16:59 $ $Author: karl $
<!-- timestamp end -->
</p>
</div>
- www/licenses license-list.html,
Karl Berry <=