www-legal-discuss mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject svn commit: r668028 - in /infrastructure/site/trunk: docs/legal/resolved.html xdocs/legal/resolved.xml
Date Mon, 16 Jun 2008 00:32:26 GMT
Author: bayard
Date: Sun Jun 15 17:32:26 2008
New Revision: 668028

URL: http://svn.apache.org/viewvc?rev=668028&view=rev
Log:
Adding CC-A to our happy permissive list

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=668028&r1=668027&r2=668028&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/resolved.html (original)
+++ infrastructure/site/trunk/docs/legal/resolved.html Sun Jun 15 17:32:26 2008
@@ -109,7 +109,10 @@
    <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>
+   <li><a href="http://creativecommons.org/licenses/by/2.5/">Creation Commons
Attribution (CC-A)</a></li>
  </ul>
+<p>Many of these licenses have specific attribution terms that need to be adhered to,
for example CC-A, often by adding 
+    them to the NOTICE file. Ensure you are doing this when including these works. </p>
 <p><b>* Which licenses may <b>NOT</b> be included within Apache products?</b></p>
 <ul>
    <li>Binary Code License (BCL)</li>

Modified: infrastructure/site/trunk/xdocs/legal/resolved.xml
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/xdocs/legal/resolved.xml?rev=668028&r1=668027&r2=668028&view=diff
==============================================================================
--- infrastructure/site/trunk/xdocs/legal/resolved.xml (original)
+++ infrastructure/site/trunk/xdocs/legal/resolved.xml Sun Jun 15 17:32:26 2008
@@ -59,8 +59,12 @@
    <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>
+   <li><a href="http://creativecommons.org/licenses/by/2.5/">Creation Commons
Attribution (CC-A)</a></li>
  </ul>
 
+ <p>Many of these licenses have specific attribution terms that need to be adhered
to, for example CC-A, often by adding 
+    them to the NOTICE file. Ensure you are doing this when including these works. </p>
+
  <p><b>* Which licenses may <b>NOT</b> be included within Apache
products?</b></p>
  <ul>
    <li>Binary Code License (BCL)</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