incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r821189 - in /websites/staging/openofficeorg/trunk/content: ./ openofficeorg/trademarks.html
Date Mon, 11 Jun 2012 00:19:17 GMT
Author: buildbot
Date: Mon Jun 11 00:19:16 2012
New Revision: 821189

Log:
Staging update by buildbot for openofficeorg

Modified:
    websites/staging/openofficeorg/trunk/content/   (props changed)
    websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html

Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jun 11 00:19:16 2012
@@ -1 +1 @@
-1348690
+1348691

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/trademarks.html Mon Jun 11
00:19:16 2012
@@ -95,7 +95,8 @@
   <div id="contenta">
   
     <h1 class="title">Apache OpenOffice Trademarks</h1>
-    <p>The Apache Software Foundation holds trademarks on behalf of its
+    <h2 id="getting-permission-to-use-our-trademarks">Getting permission to use our
trademarks</h2>
+<p>The Apache Software Foundation holds trademarks on behalf of its
 projects.  For the Apache OpenOffice project these trademarks include
 the names Apache OpenOffice and OpenOffice.org, as well as the
 graphical logo.  Use of these marks is prohibited without explicit
@@ -147,6 +148,10 @@ approval.</p>
 <p>We will then notify you of the outcome.</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://incubator.apache.org/openofficeorg/get-it-here.html">"Get
it here!"</a> 
+logo may be used according to the requirements listed on that page.</p>
   </div>
 
   <div id="footera">



Mime
View raw message