You are viewing a plain text version of this content. The canonical link for it is here.
Posted to legal-discuss@apache.org by ba...@apache.org on 2008/08/20 07:02:06 UTC
svn commit: r687244 - in /infrastructure/site/trunk:
docs/legal/resolved.html xdocs/legal/resolved.xml
Author: bayard
Date: Tue Aug 19 22:02:05 2008
New Revision: 687244
URL: http://svn.apache.org/viewvc?rev=687244&view=rev
Log:
Per legal-discuss mailing list conversation, adding cc-sa 3.0 to cc-sa 2.5's entry
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=687244&r1=687243&r2=687244&view=diff
==============================================================================
--- infrastructure/site/trunk/docs/legal/resolved.html (original)
+++ infrastructure/site/trunk/docs/legal/resolved.html Tue Aug 19 22:02:05 2008
@@ -163,8 +163,9 @@
Of course Gems written under other licenses (such as MIT) may also be OK, depending on the license. </p>
<p>* <b>Can Apache projects include Creative Commons Attribution-Share Alike works?</b></p>
<p>Unmodified media under the
- <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-Share Alike</a>
- license may be included in Apache products, subject to the licenses attribution clauses which may require
+ <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-Share Alike 2.5</a> and
+ <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0</a>
+ licenses may be included in Apache products, subject to the licenses attribution clauses which may require
LICENSE/NOTICE/README changes. For any other type of CC-SA licensed work, please contact the Legal PMC. </p>
<p><b>* How should so-called "Weak Copyleft" Licenses be handled?</b></p>
<p>Each license in this category requires some degree of reciprocity;
Modified: infrastructure/site/trunk/xdocs/legal/resolved.xml
URL: http://svn.apache.org/viewvc/infrastructure/site/trunk/xdocs/legal/resolved.xml?rev=687244&r1=687243&r2=687244&view=diff
==============================================================================
--- infrastructure/site/trunk/xdocs/legal/resolved.xml (original)
+++ infrastructure/site/trunk/xdocs/legal/resolved.xml Tue Aug 19 22:02:05 2008
@@ -120,8 +120,9 @@
<p>* <b>Can Apache projects include Creative Commons Attribution-Share Alike works?</b></p>
<p>Unmodified media under the
- <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-Share Alike</a>
- license may be included in Apache products, subject to the licenses attribution clauses which may require
+ <a href="http://creativecommons.org/licenses/by-sa/2.5/">Creative Commons Attribution-Share Alike 2.5</a> and
+ <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0</a>
+ licenses may be included in Apache products, subject to the licenses attribution clauses which may require
LICENSE/NOTICE/README changes. For any other type of CC-SA licensed work, please contact the Legal PMC. </p>
---------------------------------------------------------------------
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