You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2012/06/07 20:19:14 UTC
svn commit: r820712 - in /websites/staging/openofficeorg/trunk/content: ./
openofficeorg/get-it-here.html
Author: buildbot
Date: Thu Jun 7 18:19:14 2012
New Revision: 820712
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 18:19:14 2012
@@ -1 +1 @@
-1347702
+1347745
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 18:19:14 2012
@@ -116,11 +116,13 @@ remains legible, but the logo may not be
</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>
+<li>
+<p>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.</p>
+</li>
+<li>
<p>The logo <strong>must not</strong> link to a page at any other website other than openoffice.org.</p>
-<ol>
+</li>
<li>
<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
@@ -128,15 +130,16 @@ users from getting the latest version of
</p>
</li>
<li>
-<p>Any use Apache-owned logos beyond the above is not covered by this
-program an must be explicitly requested from per the existing <a href="http://incubator.apache.org/openofficeorg/trademarks.html">trademark policy</a></p>
+<p>Any use of this logo or any other Apache logo beyond the above
+requires explicit permission 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"><</span><span class="n">img</span> <span class="n">width</span><span class="o">=</span><span class="s">"300"</span> <span class="n">height</span><span class="o">=</span><span class="s">"100"</span> <span class="n">alt</span><span class="o">=</span><span class="s">"Download Apache OpenOffice here"</span>
-<span class="n">src</span><span class="o">=</span><span class="s">"http://incubator.apache.org/openofficeorg/images/get-it-here/en.png"</span><span class="o">/></span>
+<div class="codehilite"><pre><span class="nt"><a</span> <span class="na">href=</span><span class="s">"http://download.openoffice.org/"</span><span class="nt">></span>
+<span class="nt"><img</span> <span class="na">width=</span><span class="s">"300"</span> <span class="na">height=</span><span class="s">"100"</span> <span class="na">alt=</span><span class="s">"Download Apache OpenOffice here"</span> <span class="na">src=</span><span class="s">"http://incubator.apache.org/openofficeorg/images/get-it-here/en.png"</span><span class="nt">/></span>
+<span class="nt"></a></span>
</pre></div>