svn commit: r1062640 - in /websites/staging/openoffice/trunk/content: ./ trademarks.html

[bu...@apache.org]

Author: buildbot
Date: Mon Jul  6 20:25:38 2020
New Revision: 1062640

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 Mon Jul  6 20:25:38 2020
@@ -1 +1 @@
-1878813
+1879569

Modified: websites/staging/openoffice/trunk/content/trademarks.html
==============================================================================
--- websites/staging/openoffice/trunk/content/trademarks.html (original)
+++ websites/staging/openoffice/trunk/content/trademarks.html Mon Jul  6 20:25:38 2020
@@ -131,10 +131,11 @@ h2:hover > .headerlink, h3:hover > .head
 <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
-<a href="https://www.openoffice.org/marketing/art/galleries/logos/index.html">graphical logos</a>. Use of these marks is prohibited without explicit
-permission from the ASF.</p>
-<p>However, the Apache OpenOffice project is happy to work with 3rd
-parties who desire to use these trademarks in ways that are beneficial
+<a href="https://www.openoffice.org/marketing/art/galleries/logos/index.html">graphical logos</a>. Other graphic formats can be found <a href="https://www.apache.org/logos/?#openoffice">here</a>.
+Use of these marks is prohibited without explicit permission from the
+ASF.</p>
+<p>However, the Apache OpenOffice project is happy to work with 3rd parties
+who desire to use these trademarks in ways that are beneficial
 to the project, which do not imply endorsement by ASF, and which are
 fully in conformance with Apache policies.</p>
 <p>To request such permission, follow these steps:</p>
@@ -149,20 +150,21 @@ of ASF marks ("nominative use") are auto
 proposal, please include:</p>
 <ol>
 <li>
-<p>Name and contact information of the company, organization or person
-requesting the permission</p>
+<p>Name and contact information of the company, organization or
+   person requesting the permission</p>
 </li>
 <li>
 <p>A list of what ASF controlled marks you wish to use</p>
 </li>
 <li>
 <p>A description of how these marks would be used. Give supporting
-detail, along with context  If you are requesting use of the logo, for
-example, provide a prototype of how the logo would appear in the
-context of the overall design.</p>
+   detail, along with context  If you are requesting use of the
+   logo, for example, provide a prototype of how the logo would
+   appear in the context of the overall design.</p>
 </li>
 <li>
-<p>Any other information you think would be useful, e.g., any impeding deadlines</p>
+<p>Any other information you think would be useful, e.g., any
+   impeding deadlines</p>
 </li>
 </ol>
 </li>
@@ -185,9 +187,9 @@ approval.</p>
 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>
+<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
@@ -197,9 +199,10 @@ relevant details, especially, a URL for
 </li>
 </ol>
 <h2 id="the-get-it-here-download-logo">The "Get it here!" download logo<a class="headerlink" href="#the-get-it-here-download-logo" title="Permanent link">&para;</a></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="https://openoffice.apache.org/get-it-here.html">"Get it here!"</a> 
-logo may be used according to the requirements listed on that page.</p>
+<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="https://openoffice.apache.org/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">