www-legal-discuss mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r1698443 - /infrastructure/site/trunk/content/legal/resolved.mdtext
Date Sat, 29 Aug 2015 07:56:01 GMT
Author: bayard
Date: Sat Aug 29 07:56:01 2015
New Revision: 1698443

URL: http://svn.apache.org/r1698443
Log:
Spelling out the weak copyleft licenses to help readers search for them on the page. Also
fixing URL for SPL

Modified:
    infrastructure/site/trunk/content/legal/resolved.mdtext

Modified: infrastructure/site/trunk/content/legal/resolved.mdtext
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/content/legal/resolved.mdtext?rev=1698443&r1=1698442&r2=1698443&view=diff
==============================================================================
--- infrastructure/site/trunk/content/legal/resolved.mdtext (original)
+++ infrastructure/site/trunk/content/legal/resolved.mdtext Sat Aug 29 07:56:01 2015
@@ -159,14 +159,14 @@ requirements.
 Software under the following licenses may be included in binary form
 within an Apache product if the inclusion is appropriately labeled:
 
-- [CDDL, Versions 1.0 and 1.1](http://www.sun.com/cddl/) 
-- [CPL 1.0](http://www.opensource.org/licenses/cpl1.0.php)
-- [EPL 1.0](http://www.eclipse.org/legal/epl-v10.html)
-- [IPL 1.0](http://www.opensource.org/licenses/ibmpl.php)
-- [MPL 1.0](http://www.mozilla.org/MPL/1.0/),
+- Common Development and Distribution Licenses: [CDDL, Versions 1.0 and 1.1](http://www.sun.com/cddl/)

+- Common Public License: [CPL 1.0](http://www.opensource.org/licenses/cpl1.0.php)
+- Eclipse Public License: [EPL 1.0](http://www.eclipse.org/legal/epl-v10.html)
+- IBM Public License: [IPL 1.0](http://www.opensource.org/licenses/ibmpl.php)
+- Mozilla Publi Licenses: [MPL 1.0](http://www.mozilla.org/MPL/1.0/),
   [MPL 1.1](http://www.mozilla.org/MPL/1.1/), and
   [MPL 2.0](http://www.mozilla.org/MPL/2.0/)
-- [SPL 1.0](http://java.sun.com/spl.html)
+- Sun Public License: [SPL 1.0](http://opensource.org/licenses/SPL-1.0)
 - [Open Software License 3.0](http://www.rosenlaw.com/OSL3.0.htm)
 - [Erlang Public License](http://www.erlang.org/EPLICENSE)
 - [UnRAR License](http://java-unrar.svn.sourceforge.net/viewvc/java-unrar/trunk/license.txt?revision=2&view=markup)
(only for unarchiving)



---------------------------------------------------------------------
To unsubscribe, e-mail: legal-discuss-unsubscribe@apache.org
For additional commands, e-mail: legal-discuss-help@apache.org


Mime
View raw message