svn commit: r815005 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/why/why_easy.html

[bu...@apache.org]

Author: buildbot
Date: Sun Apr 29 17:04:41 2012
New Revision: 815005

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/why/why_easy.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr 29 17:04:41 2012
@@ -1 +1 @@
-1331943
+1331951

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Apr 29 17:04:41 2012
@@ -1 +1 @@
-1331943
+1331951

Modified: websites/staging/ooo-site/trunk/content/why/why_easy.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/why/why_easy.html (original)
+++ websites/staging/ooo-site/trunk/content/why/why_easy.html Sun Apr 29 17:04:41 2012
@@ -73,10 +73,10 @@
             <span class="articleheader" >Easy-to-use</span>
 
             <!-- The preview content -->
-Easy to choose, easy to install, easy to learn - OpenOffice.org 3 is the easy
-choice for an office software suite. OpenOffice.org 3 is suitable for complete
+Easy to choose, easy to install, easy to learn - Apache OpenOffice is the easy
+choice for an office software suite. OpenOffice is suitable for complete
 beginners, but if you have used any other office software, that's ok too. 
-OpenOffice.org 3 will make full use of what you already know - 
+OpenOffice will make full use of what you already know - 
 through familiar screens and menus - and also what you have - by
 reading existing files with no retyping.
             </div>
@@ -86,7 +86,7 @@ reading existing files with no retyping.
                  <img src="images/arrow.png" alt="read more" class="noborder" />
                 </a>
                 <a href="/download">
-                  Get OpenOffice.org 3 now
+                  Get Apache OpenOffice now
                 </a>
                 <br />&nbsp;
             </span>
@@ -156,13 +156,13 @@ reading existing files with no retyping.
     			        &nbsp;Use it immediately
     			     </div>
     			     <div class="spacy">
-For people used to other office software, OpenOffice.org 3 is a pleasant surprise.
+For people used to other office software, Apache OpenOffice is a pleasant surprise.
 It's so straightforward! Studies have proved it is easier (and cheaper) to move
-to OpenOffice.org 3 from Microsoft Office than it is to upgrade to Microsoft's
-latest Office 2007. Because OpenOffice.org is one piece of software, everything
+to OpenOffice from Microsoft Office than it is to upgrade to Microsoft's
+latest Office 2007. Because OpenOffice is one piece of software, everything
 works consistently between applications. Even the help system is the same. You
-don't even have to know which application was used to create a document - OpenOffice.org
-3 will use the correct one. You only need to do a single download from the Internet 
+don't even have to know which application was used to create a document - OpenOffice will 
+use the correct one. You only need to do a single download from the Internet 
 (or install from one CD) and you've got your office suite 
                </div>
     		    </div>
@@ -174,13 +174,13 @@ don't even have to know which applicatio
                 </div>
                 <div class="spacy">
 We understand that many people already have documents which they have created
-using other common office software packages. OpenOffice.org 3 can read these files
-with a very high degree of accuracy, making migration to OpenOffice.org 3
-very straightforward. In fact, we have reports where OpenOffice.org 3 has been
+using other common office software packages. Apache OpenOffice can read these files
+with a very high degree of accuracy, making migration to OpenOffice
+very straightforward. In fact, we have reports where OpenOffice has been
 able to read files which the original software package had said were corrupted
 and unusable. If your friends or colleagues use different software, you can
 still swap files with them - but better still, 
-give them a free copy of OpenOffice.org 3!
+give them a free copy of Apache OpenOffice!
 								</div>
             </div>
 
@@ -192,7 +192,7 @@ give them a free copy of OpenOffice.org 
                 <div class="spacy">
     			<!-- The content for this attention grabbing block -->
 When you're starting something new, it's great to know tens of millions of
-people have been there before you. OpenOffice.org 3 is developed, translated,
+people have been there before you. Apache f,orOpenOffice is developed, translated,
 supported, and promoted by an international community of tens of thousands
 of enthusiasts. If you have ever waited for ages for paid-for support from a 
 commercial software provider, community support from enthusiastic and