incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r1203613 - in /incubator/public/trunk: site-author/guides/names.xml site-publish/guides/names.html site-publish/sitemap.html
Date Fri, 18 Nov 2011 11:51:23 GMT
Author: rdonkin
Date: Fri Nov 18 11:51:22 2011
New Revision: 1203613

URL: http://svn.apache.org/viewvc?rev=1203613&view=rev
Log:
Added section noting that the Apache License does not grant trademark rights.

Modified:
    incubator/public/trunk/site-author/guides/names.xml
    incubator/public/trunk/site-publish/guides/names.html
    incubator/public/trunk/site-publish/sitemap.html

Modified: incubator/public/trunk/site-author/guides/names.xml
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-author/guides/names.xml?rev=1203613&r1=1203612&r2=1203613&view=diff
==============================================================================
--- incubator/public/trunk/site-author/guides/names.xml [utf-8] (original)
+++ incubator/public/trunk/site-author/guides/names.xml [utf-8] Fri Nov 18 11:51:22 2011
@@ -64,6 +64,30 @@ Please read
   	  in the <a href='http://www.ifosslr.org/'>International Free and Open Source Software
Law Review</a></li>
   	</ul>
   	</section>
+  	
+  	<section><title>Trademarks And The Apache License</title>
+  		<p>
+Like <a href='http://www.ifosslr.org/ifosslr/article/view/11/37'>many</a> 
+<a href='http://www.opensource.org' rel='tag'>open source</a> licenses, the 
+<a href='http://www.apache.org/licenses/LICENSE-2.0.html'>Apache License, Version 2.0</a>
+focuses on granting copyright and patent rights to the public. 
+The <em>trademark</em> section permits only very limit trademark rights.
+  		</p>
+  		<blockquote cite='http://www.apache.org/licenses/LICENSE-2.0.html#trademarks'>
+  			<p><strong>6. Trademarks.</strong>
+This License does not grant permission to use the trade names, trademarks, 
+service marks, or product names of the Licensor, except as required for 
+reasonable and customary use in describing the origin of the Work and 
+reproducing the content of the NOTICE file.
+  			</p>
+  		</blockquote>
+            <p style='text-align:right;font-style:oblique'><a href='http://www.apache.org/licenses/LICENSE-2.0.html#trademarks'>Apache
License, Version 2.0
+         	</a></p>
+            <p>
+This allows the community to use trademark law to protect its reputation, without the broader
+framework provided by the Brand team for the <a href='http://www.apache.org/foundation/'>Foundation</a>.
+            </p>
+  	</section>
   </section>
   
   <section id='naming-hints'>

Modified: incubator/public/trunk/site-publish/guides/names.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/guides/names.html?rev=1203613&r1=1203612&r2=1203613&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/guides/names.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/guides/names.html [utf-8] Fri Nov 18 11:51:22 2011
@@ -167,6 +167,30 @@ Please read
   	  in the <a href="http://www.ifosslr.org/">International Free and Open Source Software
Law Review</a></li>
   	</ul>
 </div>
+<h4>Trademarks And The Apache License</h4>
+<div class="section-content">
+<p>
+Like <a href="http://www.ifosslr.org/ifosslr/article/view/11/37">many</a> 
+<a href="http://www.opensource.org" rel="tag">open source</a> licenses, the 
+<a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache License, Version 2.0</a>
+focuses on granting copyright and patent rights to the public. 
+The <em>trademark</em> section permits only very limit trademark rights.
+  		</p>
+<blockquote cite="http://www.apache.org/licenses/LICENSE-2.0.html#trademarks">
+  			<p><strong>6. Trademarks.</strong>
+This License does not grant permission to use the trade names, trademarks, 
+service marks, or product names of the Licensor, except as required for 
+reasonable and customary use in describing the origin of the Work and 
+reproducing the content of the NOTICE file.
+  			</p>
+  		</blockquote>
+<p style="text-align:right;font-style:oblique"><a href="http://www.apache.org/licenses/LICENSE-2.0.html#trademarks">Apache
License, Version 2.0
+         	</a></p>
+<p>
+This allows the community to use trademark law to protect its reputation, without the broader
+framework provided by the Brand team for the <a href="http://www.apache.org/foundation/">Foundation</a>.
+            </p>
+</div>
 </div>
 <h3 id='naming-hints'>What Makes A Name Good</h3>
 <div class="section-content">

Modified: incubator/public/trunk/site-publish/sitemap.html
URL: http://svn.apache.org/viewvc/incubator/public/trunk/site-publish/sitemap.html?rev=1203613&r1=1203612&r2=1203613&view=diff
==============================================================================
--- incubator/public/trunk/site-publish/sitemap.html [utf-8] (original)
+++ incubator/public/trunk/site-publish/sitemap.html [utf-8] Fri Nov 18 11:51:22 2011
@@ -740,6 +740,7 @@ Site map of <a href="http://incubator.ap
 <li>The Basics<ul>
 <li>Meet The Apache Branding Team</li>
 <li>Trademarks</li>
+<li>Trademarks And The Apache License</li>
 </ul>
 </li>
 <li>



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message