www-legal-discuss mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r667447 - in /infrastructure/site/trunk: docs/legal/resolved.html xdocs/legal/resolved.xml
Date Fri, 13 Jun 2008 09:55:10 GMT
Author: bayard
Date: Fri Jun 13 02:55:10 2008
New Revision: 667447

URL: http://svn.apache.org/viewvc?rev=667447&view=rev
Log:
Expanding a couple of the acronyms and adding some versions. Not going overboard on expansion,
MIT for example is better known than its expansion. Same for BSD. 

Modified:
    infrastructure/site/trunk/docs/legal/resolved.html
    infrastructure/site/trunk/xdocs/legal/resolved.xml

Modified: infrastructure/site/trunk/docs/legal/resolved.html
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/docs/legal/resolved.html?rev=667447&r1=667446&r2=667447&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/resolved.html (original)
+++ infrastructure/site/trunk/docs/legal/resolved.html Fri Jun 13 02:55:10 2008
@@ -96,16 +96,16 @@
 <p>Works under the following licenses may be included within Apache products:</p>
 <ul>
    <li><a href="http://apache.org/licenses/LICENSE-2.0">Apache License 2.0</a></li>
-   <li><a href="http://apache.org/licenses/LICENSE-1.1">ASL 1.1</a></li>
+   <li><a href="http://apache.org/licenses/LICENSE-1.1">Apache Software License
1.1</a></li>
    <li><a href="http://opensource.org/licenses/bsd-license.php">BSD</a>
(without advertising clause)</li>
    <li><a href="http://opensource.org/licenses/mit-license.php">MIT/X11</a></li>
-   <li><a href="http://opensource.org/licenses/UoI-NCSA.php">NCSA</a></li>
+   <li><a href="http://opensource.org/licenses/UoI-NCSA.php">University of Illinois/NCSA</a></li>
    <li><a href="http://opensource.org/licenses/W3C.php">W3C Software License</a></li>
    <li><a href="http://opensource.org/licenses/xnet.php">X.Net</a></li>
    <li><a href="http://opensource.org/licenses/zlib-license.php">zlib/libpng</a></li>
    <li>FSF autoconf license</li>
    <li><a href="http://dejavu.sourceforge.net/wiki/index.php/License">DejaVu
Fonts</a></li>
-   <li><a href="http://opensource.org/licenses/afl-3.0.php">AFL</a></li>
+   <li><a href="http://opensource.org/licenses/afl-3.0.php">Academic Free License
3.0</a></li>
    <li><a href="http://www.osoa.org/xmlns/sca/1.0/license.txt">Service+Component+Architecture+Specifications</a></li>
    <li>OOXML XSD ECMA License</li>
    <li><a href="http://www.opensource.org/licenses/ms-pl.html">Microsoft Public
License (MsPL)</a></li>
@@ -114,9 +114,9 @@
 <ul>
    <li>Binary Code License (BCL)</li>
    <li>Special exceptions to the GNU GPL (e.g. GNU Classpath)</li>
-   <li><a href="http://www.opensource.org/licenses/gpl-license.php">GNU GPL</a></li>
-   <li><a href="http://www.opensource.org/licenses/lgpl-license.php">GNU LGPL</a></li>
-   <li><a href="http://www.opensource.org/licenses/agpl-v3.html">Affero GPL</a></li>
+   <li><a href="http://www.opensource.org/licenses/gpl-license.php">GNU GPL 1,
2, 3</a></li>
+   <li><a href="http://www.opensource.org/licenses/lgpl-license.php">GNU LGPL
2, 2.1, 3</a></li>
+   <li><a href="http://www.opensource.org/licenses/agpl-v3.html">Affero GPL 3</a></li>
    <li><a href="http://www.mozilla.org/MPL/NPL-1.0.html">NPL 1.0</a>/<a
href="http://www.mozilla.org/MPL/NPL-1.1.html">NPL 1.1</a></li>
    <li><a href="http://doc.trolltech.com/3.0/license.html">QPL</a></li>
    <li><a href="http://www.opensource.org/licenses/sleepycat.php">Sleepycat License</a></li>

Modified: infrastructure/site/trunk/xdocs/legal/resolved.xml
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/xdocs/legal/resolved.xml?rev=667447&r1=667446&r2=667447&view=diff
==============================================================================
--- infrastructure/site/trunk/xdocs/legal/resolved.xml (original)
+++ infrastructure/site/trunk/xdocs/legal/resolved.xml Fri Jun 13 02:55:10 2008
@@ -46,16 +46,16 @@
 
  <ul>
    <li><a href="http://apache.org/licenses/LICENSE-2.0">Apache License 2.0</a></li>
-   <li><a href="http://apache.org/licenses/LICENSE-1.1">ASL 1.1</a></li>
+   <li><a href="http://apache.org/licenses/LICENSE-1.1">Apache Software License
1.1</a></li>
    <li><a href="http://opensource.org/licenses/bsd-license.php">BSD</a>
(without advertising clause)</li>
    <li><a href="http://opensource.org/licenses/mit-license.php">MIT/X11</a></li>
-   <li><a href="http://opensource.org/licenses/UoI-NCSA.php">NCSA</a></li>
+   <li><a href="http://opensource.org/licenses/UoI-NCSA.php">University of Illinois/NCSA</a></li>
    <li><a href="http://opensource.org/licenses/W3C.php">W3C Software License</a></li>
    <li><a href="http://opensource.org/licenses/xnet.php">X.Net</a></li>
    <li><a href="http://opensource.org/licenses/zlib-license.php">zlib/libpng</a></li>
    <li>FSF autoconf license</li>
    <li><a href="http://dejavu.sourceforge.net/wiki/index.php/License">DejaVu
Fonts</a></li>
-   <li><a href="http://opensource.org/licenses/afl-3.0.php">AFL</a></li>
+   <li><a href="http://opensource.org/licenses/afl-3.0.php">Academic Free License
3.0</a></li>
    <li><a href="http://www.osoa.org/xmlns/sca/1.0/license.txt">Service+Component+Architecture+Specifications</a></li>
    <li>OOXML XSD ECMA License</li>
    <li><a href="http://www.opensource.org/licenses/ms-pl.html">Microsoft Public
License (MsPL)</a></li>
@@ -65,9 +65,9 @@
  <ul>
    <li>Binary Code License (BCL)</li>
    <li>Special exceptions to the GNU GPL (e.g. GNU Classpath)</li>
-   <li><a href="http://www.opensource.org/licenses/gpl-license.php">GNU GPL</a></li>
-   <li><a href="http://www.opensource.org/licenses/lgpl-license.php">GNU LGPL</a></li>
-   <li><a href="http://www.opensource.org/licenses/agpl-v3.html">Affero GPL</a></li>
+   <li><a href="http://www.opensource.org/licenses/gpl-license.php">GNU GPL 1,
2, 3</a></li>
+   <li><a href="http://www.opensource.org/licenses/lgpl-license.php">GNU LGPL
2, 2.1, 3</a></li>
+   <li><a href="http://www.opensource.org/licenses/agpl-v3.html">Affero GPL 3</a></li>
    <li><a href="http://www.mozilla.org/MPL/NPL-1.0.html">NPL 1.0</a>/<a
href="http://www.mozilla.org/MPL/NPL-1.1.html">NPL 1.1</a></li>
    <li><a href="http://doc.trolltech.com/3.0/license.html">QPL</a></li>
    <li><a href="http://www.opensource.org/licenses/sleepycat.php">Sleepycat License</a></li>



---------------------------------------------------------------------
DISCLAIMER: Discussions on this list are informational and educational
only.  Statements made on this list are not privileged, do not
constitute legal advice, and do not necessarily reflect the opinions
and policies of the ASF.  See <http://www.apache.org/licenses/> for
official ASF policies and documents.
---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org


Mime
View raw message