svn commit: r815805 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/index.html

[buildbot]

Author: buildbot
Date: Fri May  4 21:48:05 2012
New Revision: 815805

Log:
Staging update by buildbot for openofficeorg

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

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May  4 21:48:05 2012
@@ -1 +1 @@
-1334190
+1334202

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May  4 21:48:05 2012
@@ -1 +1 @@
-1334190
+1334202

Modified: websites/staging/ooo-site/trunk/content/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/index.html (original)
+++ websites/staging/ooo-site/trunk/content/index.html Fri May  4 21:48:05 2012
@@ -11,7 +11,7 @@
     
        <link href="https://plus.google.com/114598373874764163668"; 
rel="PUBLISHER" />
     
-       <title>OpenOffice.org - The Free and Open Productivity Suite</title>
+       <title>Apache OpenOffice - The Free and Open Productivity Suite</title>
     <style type="text/css">
     
        /* <![CDATA[ */
@@ -56,9 +56,9 @@
         <li>
             <div class="action-info">
                 <div class="action-text action-link">
-                    <h2><a name="content" href="/why/">I want to learn more 
about OpenOffice.org</a></h2>
+                    <h2><a name="content" href="/why/">I want to learn more 
about OpenOffice</a></h2>
                     <p>
-                    <a href="/why/">What is OpenOffice.org? And why should I 
use it?</a>
+                    <a href="/why/">What is Apache OpenOffice? And why should 
I use it?</a>
                     </p>
                 </div>
             </div>
@@ -70,9 +70,9 @@
             <div class="action-download">
                 <div class="action-text action-link">
                     <h2><a href="/download">I want to download 
-                        OpenOffice.org</a></h2>
+                        OpenOffice</a></h2>
                         <p>
-                        <a href="/download">Download OpenOffice.org for free, 
or find out about other ways of getting it.</a>
+                        <a href="/download">Download Apache OpenOffice for 
free, or find out about other ways of getting it.</a>
                         </p>
                     </div>
             </div>
@@ -83,7 +83,7 @@
         <li>
             <div class="action-help">
                 <div class="action-text action-link">
-                    <h2><a href="/support/">I need help with my 
OpenOffice.org</a></h2>
+                    <h2><a href="/support/">I need help with my 
OpenOffice</a></h2>
                     <p>
                     <a href="/support/">Help is at hand whenever you need 
it.</a>
                     </p>
@@ -96,9 +96,9 @@
         <li>
             <div class="action-extend">
                 <div class="action-text action-link">
-                    <h2><a href="/extensions/">I want to do more with my 
OpenOffice.org</a></h2>
+                    <h2><a href="/extensions/">I want to do more with my 
OpenOffice</a></h2>
                     <p>
-                    <a href="/extensions/">Extend OpenOffice.org with 
additional functionality, templates and clipart.</a>
+                    <a href="/extensions/">Extend Apache OpenOffice with 
additional functionality, templates and clipart.</a>
                     </p>
                 </div>
             </div>
@@ -109,9 +109,9 @@
         <li>
             <div class="action-participate">
                 <div class="action-text action-link">
-                    <h2><a 
href="http://incubator.apache.org/openofficeorg/get-involved.html";>I want to 
participate in OpenOffice.org</a></h2>
+                    <h2><a 
href="http://incubator.apache.org/openofficeorg/get-involved.html";>I want to 
participate in OpenOffice</a></h2>
                     <p>
-                    <a 
href="http://incubator.apache.org/openofficeorg/get-involved.html";>OpenOffice.org
 is made with help from people all over the world. Feel free to contribute!</a>
+                    <a 
href="http://incubator.apache.org/openofficeorg/get-involved.html";>Apache 
OpenOffice is made with help from people all over the world. Feel free to 
contribute!</a>
                     </p>
                 </div>
             </div>
@@ -125,7 +125,8 @@
 <div class="campaign">
   <h2>Follow Apache OpenOffice on Twitter, Google+ and Facebook</h2>
   <p>The Apache OpenOffice Project has a social networking presence on Twitter 
and Google+.  For occasional brief updates from the project we invite you 
-         to follow us on <a href="https://twitter.com/#!/apacheoo"; 
>Twitter</a>, <a 
href="https://plus.google.com/u/0/114598373874764163668/about";>Google+</a> or 
on <a href="http://www.facebook.com/groups/338330086179568/";>Facebook</a>.</p>
+         to follow us on <a href="https://twitter.com/#!/apacheoo"; 
>Twitter</a> or <a 
href="https://plus.google.com/u/0/114598373874764163668/about";>Google+</a>.
+         We also have a <a href="http://www.facebook.com/ApacheOO";>Facebook 
page</a> and <a 
href="http://www.facebook.com/groups/338330086179568/";>group</a>.</p>
   </div>  
        
  <div class="campaign">
@@ -143,7 +144,7 @@
   </div>
   
   <div class="campaign">
-  <h2><a href="/news">More OpenOffice.org News...</a></h2>
+  <h2><a href="/news">More OpenOffice News...</a></h2>
   </div>