CVSROOT: /web/www
Module name: www
Changes by: Brett Smith <brett> 11/06/24 17:04:38
Modified files:
licenses : license-list.html
Log message:
add Zimbra 1.3; update to Yahoo! 1.1; some whitespace cleanup
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.288&r2=1.289
Patches:
Index: license-list.html
===================================================================
RCS file: /web/www/www/licenses/license-list.html,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- license-list.html 24 Jun 2011 16:27:54 -0000 1.288
+++ license-list.html 24 Jun 2011 17:04:29 -0000 1.289
@@ -1087,8 +1087,7 @@
Washington.</p> </dd>
-<dt><a id="SISSL" href="http://www.openoffice.org/licenses/sissl_license.html";>
- Sun Industry Standards Source License 1.0</a></dt>
+<dt><a id="SISSL"
href="http://www.openoffice.org/licenses/sissl_license.html";>Sun Industry
Standards Source License 1.0</a></dt>
<dd>
<p>This is a free software license, not a strong copyleft, which is
incompatible with the GNU GPL because of details rather than any
@@ -1104,8 +1103,7 @@
<dt><a id="xinetd"
- href="http://fedoraproject.org/wiki/Licensing/Xinetd_License";>
- License of xinetd</a></dt>
+ href="http://fedoraproject.org/wiki/Licensing/Xinetd_License";>License
of xinetd</a></dt>
<dd>
<p>This is a copyleft free software license, incompatible with the GPL.
It is incompatible because it places extra restrictions on
@@ -1113,19 +1111,17 @@
requirements in the GPL.</p></dd>
-<dt><a id="Yahoo"
href="http://info.yahoo.com/legal/us/yahoo/publiclicense/publiclicense-1813.html";>
- Yahoo! Public License 1.0</a></dt>
+<dt><a id="Yahoo"
href="http://www.zimbra.com/license/yahoo_public_license_1.1.html";>Yahoo!
Public License 1.1</a></dt>
<dd>
<p>This is a free software license. It has a copyleft similar to the
- one found in the Mozilla Public License. It also has a choice of
- law clause in section 7. These features both make the license
- GPL-incompatible. The license also unfortunately uses the term
- “<a href="/philosophy/not-ipr.html">intellectual
- property</a>”.</p>
+one found in the Mozilla Public License. It also has a choice of law
+clause in section 7. These features both make the license
+GPL-incompatible. The license also unfortunately uses the term
+“<a href="/philosophy/not-ipr.html">intellectual
+property</a>”.</p>
</dd>
-<dt><a id="Zend" href="http://www.zend.com/license/2_00.txt";>
- Zend License, Version 2.0</a></dt>
+<dt><a id="Zend" href="http://www.zend.com/license/2_00.txt";>Zend License,
Version 2.0</a></dt>
<dd>
<p>This license is used by one part of PHP4. It is a non-copyleft free
software license which is incompatible with the GNU GPL, and has <a
@@ -1134,9 +1130,15 @@
<p>We recommend that you not use this license for anything you write.</p>
</dd>
+<dt><a id="Zimbra"
href="http://www.zimbra.com/license/zimbra-public-license-1-3.html";>Zimbra
Public License 1.3</a></dt>
+<dd>
+<p>This license is identical to the <a href="#Yahoo">Yahoo! Public
+License 1.1</a>, except that the license is provided by VMWare instead
+of Yahoo!. Our comments there apply here as well; this is a
+GPL-incompatible, partial copyleft free software license.</p>
+</dd>
-<dt><a id="Zope" href="http://www.zope.org/Resources/ZPL";>
- Zope Public License version 1</a></dt>
+<dt><a id="Zope" href="http://www.zope.org/Resources/ZPL";>Zope Public License
version 1</a></dt>
<dd>
<p>This is a simple, fairly permissive non-copyleft free software
license with <a href="/philosophy/bsd.html">practical
@@ -1802,7 +1804,7 @@
<p>
Updated:
<!-- timestamp start -->
- $Date: 2011/06/24 16:27:54 $
+ $Date: 2011/06/24 17:04:29 $
<!-- timestamp end -->
</p>
</div>
