incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r820704 - in /websites/staging/openofficeorg/trunk/content: ./ openofficeorg/get-it-here.html
Date Thu, 07 Jun 2012 16:24:10 GMT
Author: buildbot
Date: Thu Jun  7 16:24:10 2012
New Revision: 820704

Log:
Staging update by buildbot for openofficeorg

Modified:
    websites/staging/openofficeorg/trunk/content/   (props changed)
    websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html

Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jun  7 16:24:10 2012
@@ -1 +1 @@
-1347684
+1347701

Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html (original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/get-it-here.html Thu Jun  7
16:24:10 2012
@@ -21,7 +21,7 @@
 <meta name="google-site-verification" content="wIHUbgA-JO5PaJHpR5jeI8N9E2y2iF94o4oUwpaAdk8"
/>
 <link href="/openofficeorg/css/ooo.css" rel="stylesheet" type="text/css">
 
-<title>Apache OpenOffice Trademarks</title>
+<title>Use of the &quot;Get it here!&quot; logo</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <script type="text/javascript">
@@ -94,40 +94,57 @@
   </div>
   <div id="contenta">
   
-    <h1 class="title">Apache OpenOffice Trademarks</h1>
-    <p>=Use of the Apache OpenOffice Download Promotion Logo=</p>
+    <h1 class="title">Use of the &quot;Get it here!&quot; logo</h1>
+    <h1 id="use-of-the-get-it-here-logo">Use of the "Get it here!" logo</h1>
 <p>Anyone, without additional permission from this project, may use the
 following logo subject to the following conditions:</p>
-<p>The logo:  http: http://incubator.apache.org/openofficeorg/images/get-it-here/en.png</p>
-<p>Conditions:</p>
+<h2 id="the-logo">The logo:</h2>
+<p><p><img width="300" height="100" alt="Download Apache OpenOffice here"
src="http://incubator.apache.org/openofficeorg/images/get-it-here/en.png"/></p></p>
+<p>The logo file may be <a href="http://incubator.apache.org/openofficeorg/images/get-it-here/en.png">found
here</a>.</p>
+<p>If translations of the "Get it here!" text are required, send a request to the 
+<a href="http://incubator.apache.org/openofficeorg/mailing-lists.html#development-mailing-list">ooo-dev
mailing list</a> and we can make a translated version for you.</p>
+<h2 id="conditions">Conditions:</h2>
 <ol>
 <li>
-<p>The logo may not be modified except to resize it.  If translations
-of the "Get it here!" text are required, send a request to the ooo-dev
-list and we can provide a translated version for you.</p>
+<p>The logo may be resized, so long as the aspect ratio is preserved and the logo
+remains legible, but the logo may not be otherwise altered.</p>
 </li>
 <li>
-<p>The image must be linked to one of:</p>
+<p>The logo <strong>must directly link</strong> to one of:</p>
 </li>
 <li>
-<p>the http://www.openoffice.org webpage</p>
-</li>
-<li>one of the official Native Language pages at openoffice.org, e.g., http://de.openoffice.org</li>
-<li>
-<p>the download page for Apache OpenOffice:
-http://download.openoffice.org or
-http://www.openoffice.org/download/other.html</p>
+<p>The Apache OpenOffice <a href="http://www.openoffice.org">home page</a></p>
 </li>
+<li>The download page for Apache OpenOffice, either the <a href="http://download.openoffice.org">main
download page</a> or
+the <a href="http://www.openoffice.org/download/other.html">detailed download page</a>.</li>
+<li>One of the official Native Language pages at openoffice.org, e.g., 
+http://de.openoffice.org, http://it.openoffice.org, http://fr.openoffice.rg, etc.</li>
+</ol>
+<p>The logo <strong>must not</strong> link to a page at any other website
other than openoffice.org.</p>
+<ol>
 <li>
-<p>The logo must not link to a specific download file or mirror.  This
+<p>The logo <strong>must not</strong> link to a specific download file
or mirror.  This
 causes problems with load balancing and fallbacks and may prevent
-users from getting the latest version of OpenOffice.</p>
+users from getting the latest version of OpenOffice.<br />
+</p>
 </li>
 <li>
 <p>Any use Apache-owned logos beyond the above is not covered by this
-program an must be explicitly requested from the ASF.</p>
+program an must be explicitly requested from per the existing <a href="http://incubator.apache.org/openofficeorg/trademarks.html">trademark
policy</a></p>
 </li>
 </ol>
+<h2 id="example">Example</h2>
+<p>This is an example of how the "Get it here!" logo might be included in an
+HTML page:</p>
+<div class="codehilite"><pre><span class="o">&lt;</span><span
class="n">img</span> <span class="n">width</span><span class="o">=</span><span
class="s">&quot;300&quot;</span> <span class="n">height</span><span
class="o">=</span><span class="s">&quot;100&quot;</span> <span
class="n">alt</span><span class="o">=</span><span class="s">&quot;Download
Apache OpenOffice here&quot;</span> 
+<span class="n">src</span><span class="o">=</span><span class="s">&quot;http://incubator.apache.org/openofficeorg/images/get-it-here/en.png&quot;</span><span
class="o">/&gt;</span>
+</pre></div>
+
+
+<h2 id="feedback">Feedback</h2>
+<p>We'd love to hear about your success with adding the "Get it here!" logo to your

+website.  You can send your links to us at our <a href="mailto:ooo-marketing@incubator.apache.org.">ooo-marketing</a>
mailing list.</p>
+<p>Also, if you run into problems, we want to hear about that as well.</p>
   </div>
 
   <div id="footera">



Mime
View raw message