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

[buildbot]

Author: buildbot
Date: Mon Jul 14 22:45:35 2014
New Revision: 916224

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 Mon Jul 14 22:45:35 2014
@@ -1 +1 @@
-1610478
+1610548

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Jul 14 22:45:35 2014
@@ -1 +1 @@
-1610478
+1610548

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
 Mon Jul 14 22:45:35 2014
@@ -88,8 +88,8 @@
 <p>
 This is the official Apache OpenOffice logo to be used as a
 reference to both the product and the open source community behind the 
-product. 
-<br>
+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. 
@@ -104,14 +104,26 @@ You can download the Apache OpenOffice l
                <a href=""><img src="index_files/logo_color.png" title="" 
style="border-style: none;" alt=""></a>
 
 <img  alt="refreshed logo" 
src="http://www.openoffice.org/marketing/art/galleries/logos/main/aoo4-main-tm-logo-rgb.png";
 align="middle">
+</p>
+
+<h3>Apache OpenOffice "Orb" Logo</h3>
+<p>This trademarked item contains just the "orb" portion of the Apache 
OpenOffice logo.</p>
+<a href="/images/AOO_logos/svg/orb.svg"><img src="/images/AOO_logos/orb.png" 
alt="new orb logo"></img></a>
+</p>
 
-<h3>Apache OpenOffice Logo Pins</h3>
+<h3>Apache OpenOffice Orb Logo Pins</h3>
 <p> Apache OpenOffice 1" pins displayed in the picture below can be reordered 
from the <a 
href="http://www.wackybuttons.com/preview.php?display=show&dc1=3718704";> link 
provided here </a>if needed. <br>
 <em>(NOTE)</em> This is only one of many merchants that can provide this kind 
of service and is not specifically endorsed
 by the Apache Software Foundation.<p>
 
 <img src="AOO_Pins.jpeg" alt="logo pins in gull formation" hieght="447px" 
width="794px"></img>
-<br>
+</p>
+
+<h3>Older OpenOffice.org Trademarked Logos</h3>
+<p>Older OpenOffice.org trademarked logos, now held by the Apache Software 
Foundation, can be found
+in <a 
href="http://www.openoffice.org/marketing/art/galleries/logos/main_tm/";>this 
location.</a></p>
+
+
 
   </div>
 <!--#include virtual="/footer.html" -->