svn commit: r921414 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/marketing/art/galleries/logos/index.html

[buildbot]

Author: buildbot
Date: Sat Sep  6 15:00:57 2014
New Revision: 921414

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    
websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Sep  6 15:00:57 2014
@@ -1 +1 @@
-1622867
+1622869

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Sep  6 15:00:57 2014
@@ -1 +1 @@
-1622867
+1622869

Modified: 
websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html
==============================================================================
--- 
websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html
 (original)
+++ 
websites/staging/ooo-site/trunk/content/marketing/art/galleries/logos/index.html
 Sat Sep  6 15:00:57 2014
@@ -91,13 +91,13 @@ reference to both the product and the op
 product.</p>
 <p>
 In order to protect the brand OpenOffice, the logo is not licensed under an 
open source license. As it is trademarked you are allowed to use it, if the 
OpenOffice logo is used to refer to our product and our community. If you wish 
to use the OpenOffice logo please follow the <a 
href="http://about.openoffice.org/index.html#logo";> easy steps <a/> for 
requesting permission. Furthermore the
-<a 
href="http://wiki.services.openoffice.org/wiki/Logo_Usage_Guidelines";>OpenOffice.org
 Logo Usage Guidelines
-</a>will enable you to use the OpenOffice.org logo properly. 
+<a 
href="http://wiki.services.openoffice.org/wiki/Logo_Usage_Guidelines";>OpenOffice.org
 Logo Usage Guidelines</a>
+will enable you to use the OpenOffice.org logo properly. 
 <br>
 OpenOffice.org, older OpenOffice.org logos, and the Apache OpenOffice logo are 
trademarks or registered trademarks of the Apache Software Foundation.
 
 <br>
-You can download the <strong>old</strong> Apache OpenOffice logo as
+You can download the <strong>old</strong> OpenOffice.org logo as
 <a href="http://www.openoffice.org/trademark/logo_color.svg";> SVG </a>
 or <a 
href="http://ui.openoffice.org/VisualDesign/gifs/Logos/OpenOffice_Logo_cmyk.eps";>
 EPS </a>.
 </p>