Author: buildbot
Date: Fri Dec 6 22:08:36 2013
New Revision: 889408
Log:
Staging update by buildbot for openoffice
Modified:
websites/staging/openoffice/trunk/content/ (props changed)
websites/staging/openoffice/trunk/content/trademarks.html
Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 6 22:08:36 2013
@@ -1 +1 @@
-1547701
+1548729
Modified: websites/staging/openoffice/trunk/content/trademarks.html
==============================================================================
--- websites/staging/openoffice/trunk/content/trademarks.html (original)
+++ websites/staging/openoffice/trunk/content/trademarks.html Fri Dec 6
22:08:36 2013
@@ -151,6 +151,22 @@ approval.</p>
<p>We will then notify you of the outcome.</p>
</li>
</ol>
+<h2 id="reporting-a-violation-of-the-apache-openoffice-trademarks">Reporting a
violation of the Apache OpenOffice trademarks</h2>
+<p>If you see a possible violation of an OpenOffice-related trademark,
+please:</p>
+<ol>
+<li>
+<p>Review the details above about the trademarks held by the
+Apache Software Foundation on behalf of the Apache OpenOffice
+project, and about the acceptable usage of trademarks.</p>
+</li>
+<li>
+<p>If this confirms your belief that a website or product is
+infringing one of the above-mentioned trademarks, report it to
+<a
href="mailto:[email protected]?subject=Possible%20trademark%20infringement";>[email protected]</a>.
Make sure you include all
+relevant details, especially, a URL for the offending page.</p>
+</li>
+</ol>
<h2 id="the-get-it-here-download-logo">The "Get it here!" download logo</h2>
<p>A specific logo is recommended for use by those who wish to help promote
the
project by hosting a download logo on their website. The <a
href="http://openoffice.apache.org/get-it-here.html";>"Get it here!"</a>
