incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r835726 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/marketing/
Date Sat, 20 Oct 2012 18:19:38 GMT
Author: buildbot
Date: Sat Oct 20 18:19:38 2012
New Revision: 835726

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/marketing/marketing_how.html
    websites/staging/ooo-site/trunk/content/marketing/marketing_what.html
    websites/staging/ooo-site/trunk/content/marketing/marketing_where.html
    websites/staging/ooo-site/trunk/content/marketing/marketing_who.html
    websites/staging/ooo-site/trunk/content/marketing/marketing_why.html
    websites/staging/ooo-site/trunk/content/marketing/press_kit.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Oct 20 18:19:38 2012
@@ -1 +1 @@
-1400494
+1400497

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Oct 20 18:19:38 2012
@@ -1 +1 @@
-1400494
+1400497

Modified: websites/staging/ooo-site/trunk/content/marketing/marketing_how.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/marketing/marketing_how.html (original)
+++ websites/staging/ooo-site/trunk/content/marketing/marketing_how.html Sat Oct 20 18:19:38
2012
@@ -39,24 +39,24 @@
     on, do it now!</p>
 
     <h2>
-      Find out <i>Why OpenOffice.org?</i>
+      Find out <i>Why Apache OpenOffice?</i>
     </h2>
 
-    <p>You're convinced about the benefits of OpenOffice.org - but
+    <p>You're convinced about the benefits of Apache OpenOffice - but
     can you convince other people? Read up on <a href=
-    "http://why.openoffice.org">Why OpenOffice.org?</a> and
+    "http://why.openoffice.org">Why Apache OpenOffice?</a> and
     understand the three key messages:</p>
 
     <ul>
-      <li>OpenOffice.org is <a href=
+      <li>Apache OpenOffice is <a href=
       "http://why.openoffice.org/why_great.html">great
       software</a></li>
 
-      <li>OpenOffice.org is <a href=
+      <li>Apache OpenOffice is <a href=
       "http://why.openoffice.org/why_easy.html">easy to use</a>;
       and</li>
 
-      <li>OpenOffice.org is <a href=
+      <li>Apache OpenOffice is <a href=
       "http://why.openoffice.org/why_free.html">free
       software</a>.</li>
     </ul>
@@ -70,7 +70,7 @@
       Listen in to the Marketing Project at work
     </h2>
 
-    <p>Marketing Project members blog frequently on OpenOffice.org
+    <p>Marketing Project members blog frequently on Apache OpenOffice
     news and issues. To save you hunting around the net, we bring
     all these together on the 
     <a href="http://marketing.openoffice.org/planet">Marketing
@@ -80,7 +80,7 @@
     <p>For day to day work, the Marketing Project works through 
     its mailing lists,
     especially the <i>Dev list</i>. You don't have to be a
-    registered member of OpenOffice.org to subscribe to our mailing
+    registered member of Apache OpenOffice to subscribe to our mailing
     lists, and subscribing doesn't commit you to anything (except
     receiving some interesting mail). If you are curious,
     interested, but not quite ready yet to take the plunge and
@@ -94,7 +94,7 @@
     </h2>
 
     <p>To join the Marketing Project, register with the
-    OpenOffice.org community. Once you have registered, you are
+    Apache OpenOffice community. Once you have registered, you are
     entitled to join the Marketing Project (or any other project),
     file issues, bugs, feature requests, or comment on already
     filed issues.</p>
@@ -113,7 +113,7 @@
 
     <p>Maybe we have a <a href=
     "http://marketing.openoffice.org/contacts.html">MarCon</a> who
-    speaks your language, or contact the appropriate OpenOffice.org
+    speaks your language, or contact the appropriate Apache OpenOffice
     <a href=
     "http://projects.openoffice.org/native-lang.html">Native-Language
     Project</a>.</p>

Modified: websites/staging/ooo-site/trunk/content/marketing/marketing_what.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/marketing/marketing_what.html (original)
+++ websites/staging/ooo-site/trunk/content/marketing/marketing_what.html Sat Oct 20 18:19:38
2012
@@ -6,7 +6,7 @@
   <meta http-equiv="content-type" content=
   "text/html; charset=us-ascii" />
 
-  <title>Marketing Project on OpenOffice.org</title>
+  <title>Marketing Project on Apache OpenOffice</title>
   <meta name="keywords" content=
   "Marketing, OpenOffice, OpenOffice.org" />
   <link rel="stylesheet" type="text/css" href="marketing.css" />
@@ -35,13 +35,13 @@
     <ul>
       <li>We set the <a href=
       "http://wiki.services.openoffice.org/wiki/Strategic_Marketing_Plan">
-      Marketing Strategy</a> for OpenOffice.org and cajole and
-      encourage all OpenOffice.org marketing activity to follow its
+      Marketing Strategy</a> for Apache OpenOffice and cajole and
+      encourage all Apache OpenOffice marketing activity to follow its
       direction.</li>
 
       <li>We provide marketing expertise to the <a href=
       "http://council.openoffice.org/">Community Council</a> and
-      other OpenOffice.org <a href=
+      other Apache OpenOffice <a href=
       "http://projects.openoffice.org/">Projects</a>.</li>
 
       <li>We act as a central collection point in the English
@@ -56,7 +56,7 @@
       "http://marketing.openoffice.org/contacts.html">point of
       contact for the media</a>.</li>
 
-      <li>We are responsible for awarding the annual OpenOffice.org
+      <li>We are responsible for awarding the annual Apache OpenOffice
       <a href=
       "http://marketing.openoffice.org/conference">Conference</a>
       to local organising teams.</li>

Modified: websites/staging/ooo-site/trunk/content/marketing/marketing_where.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/marketing/marketing_where.html (original)
+++ websites/staging/ooo-site/trunk/content/marketing/marketing_where.html Sat Oct 20 18:19:38
2012
@@ -59,11 +59,11 @@
       to quote</li>
 
       <li><a href="http://marketing.openoffice.org/press_quotes_3.html">What
-      people are saying</a> about the release of OpenOffice.org 3</li>
+      people are saying</a> about the release of Apache OpenOffice 3</li>
 
       <li>Lists of <a href=
       "http://wiki.services.openoffice.org/wiki/Major_OpenOffice.org_Deployments">
-      Major users</a> and what they are doing with OpenOffice.org</li>
+      Major users</a> and what they are doing with Apache OpenOffice</li>
 
       <li>The <a href=
       "http://wiki.services.openoffice.org/wiki/Product_Release">Product
@@ -79,7 +79,7 @@
       <li>Our <a href="http://marketing.openoffice.org/planet">Planet</a>
of
       the latest news and opinions from members' blogs. The Planet also
       displays a running total of <a href="marketing_bouncer.html">Bouncer
-      downloads</a> for the current version of OpenOffice.org</li>
+      downloads</a> for the current version of Apache OpenOffice</li>
 
     </ul>
 

Modified: websites/staging/ooo-site/trunk/content/marketing/marketing_who.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/marketing/marketing_who.html (original)
+++ websites/staging/ooo-site/trunk/content/marketing/marketing_who.html Sat Oct 20 18:19:38
2012
@@ -67,8 +67,8 @@
     on-line activities and are the front line troops in Project
     activities. Project Members may work either on central (Project
     Lead) or local (MarCon) marketing activities and are the
-    fundamental resource for the promotion of OpenOffice.org.
-    <b>More people start using OpenOffice.org as a result of a
+    fundamental resource for the promotion of Apache OpenOffice.
+    <b>More people start using Apache OpenOffice as a result of a
     personal recommendation</b> than by any other route. People
     with specialist marketing skills such as market research,
     competitor intelligence, graphics, copywriting, translating,

Modified: websites/staging/ooo-site/trunk/content/marketing/marketing_why.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/marketing/marketing_why.html (original)
+++ websites/staging/ooo-site/trunk/content/marketing/marketing_why.html Sat Oct 20 18:19:38
2012
@@ -33,28 +33,27 @@
     </div>
 
     <blockquote>
-      The OpenOffice.org Marketing Project exists to promote the
-      OpenOffice.org Community and the Products and Services it
+      The Apache OpenOffice Marketing Project exists to promote the
+      Apache OpenOffice Community and the Products and Services it
       provides.
     </blockquote>
 
     <div class="MySubtitle">
-      The OpenOffice.org Community
+      The Apache OpenOffice Community
     </div>
 
-    <p>The OpenOffice.org <b>Community</b> consists of thousands of
+    <p>The Apache OpenOffice <b>Community</b> consists of thousands of
     people who have joined one of our <a href=
     "http://projects.openoffice.org/">Projects</a> and design,
     develop, maintain, translate, test, document, support, promote,
-    or in any other way help us bring OpenOffice.org's products and
-    services to the world.</p>
+    or in any other way help us bring Apache OpenOffice to the world.</p>
 
     <div class="MySubtitle">
-      OpenOffice.org Products and Services
+      OpenOffice Products and Services
     </div>
 
-    <p>OpenOffice.org's best known <b>Product</b> is the
-    OpenOffice.org <a href=
+    <p>OpenOffice's best known <b>Product</b> is the
+    OpenOffice <a href=
     "http://www.openoffice.org/product">office productivity
     suite</a>, available in a hundred or so languages on all major
     computing platforms. We also supply <a href=
@@ -63,7 +62,7 @@
     addition, we are a source of high-quality office software
     <a href="http://udk.openoffice.org/">components</a> for systems
     developers to use in their own products. We have a particular
-    expertise in <a href="http://odftoolkit.openoffice.org/">ODF
+    expertise in <a href="http://incubator.apache.org/odftoolkit/">ODF
     components</a> <i>(for processing documents in the ISO approved
     Open Document Format)</i>.</p>
   </div>

Modified: websites/staging/ooo-site/trunk/content/marketing/press_kit.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/marketing/press_kit.html (original)
+++ websites/staging/ooo-site/trunk/content/marketing/press_kit.html Sat Oct 20 18:19:38 2012
@@ -33,7 +33,7 @@
     <div id="pk-right">
       <h2>Quick Facts</h2>
 
-      <h3>The Name</h3>OpenOffice.org
+      <h3>The Name</h3>Apache OpenOffice
 
       <h3>The Community</h3>Registered Members: &gt;750,000<br>
       Sponsored developers: &gt;100 FTE<br>
@@ -70,28 +70,28 @@
       Confederation (NLC)</a><br>
     </div>
 
-    <p>Key facts and figures about OpenOffice.org for the media.</p>
+    <p>Key facts and figures about Apache OpenOffice for the media.</p>
 
     <h2>Naming</h2>
 
     <ul>
-      <li>Name - we are <strong>OpenOffice.org</strong> (not <em>Open
+      <li>Name - we are <strong>Apache OpenOffice</strong> (not <em>Open
       Office</em>, <em>OpenOffice</em>, etc.)</li>
 
-      <li>OpenOffice.org is both the name of a software product - <em>the
-      OpenOffice.org Productivity Suite</em> - and the name of the
+      <li>Apache OpenOffice is both the name of a software product - <em>the
+      Apache OpenOffice Productivity Suite</em> - and the name of the
       open-source project which designs, develops, maintains, translates,
       tests, documents, supports, and promotes the Suite - <em>the
-      OpenOffice.org Community</em>.</li>
+      Apache OpenOffice Community</em>.</li>
     </ul>
 
     
 
-    <h2>Key points about the OpenOffice.org Productivity Suite.</h2>
+    <h2>Key points about the Apache OpenOffice Productivity Suite.</h2>
 
     <ol>
-      <li>OpenOffice.org provides <strong>everything most people need in an
-      office productivity suite</strong>. The main components of the OpenOffice.org
Suite are the <a href="http://www.openoffice.org/product/writer.html">Writer</a>
+      <li>Apache OpenOffice provides <strong>everything most people need in an
+      office productivity suite</strong>. The main components of the Apache OpenOffice
Suite are the <a href="http://www.openoffice.org/product/writer.html">Writer</a>
       wordprocessor <a href="http://www.openoffice.org/product/pix/writer-big.png">(screenshot)</a>;
       the <a href="http://www.openoffice.org/product/calc.html">Calc</a>
       spreadsheet <a href="http://www.openoffice.org/product/pix/calc-big.png">(screenshot)</a>;
@@ -100,7 +100,7 @@
       <a href="http://www.openoffice.org/product/draw.html">Draw</a> for
       graphics <a href="http://www.openoffice.org/product/pix/draw-big.png">(screenshot)</a>;
       and the <a href="http://www.openoffice.org/product/base.html">Base</a>
-      database <a href="http://www.openoffice.org/product/pix/base-big.png">(screenshot)</a>.
OpenOffice.org is stable, reliable, and robust,
+      database <a href="http://www.openoffice.org/product/pix/base-big.png">(screenshot)</a>.
Apache OpenOffice is stable, reliable, and robust,
       built up over twenty years' development. Unlike its major competitor,
       it was designed from the start as a single piece of software, which
       makes for higher quality software and a more consistent user
@@ -108,7 +108,7 @@
       
       </li>
 
-      <li>OpenOffice.org is both <strong>easy to use and easy to migrate
+      <li>Apache OpenOffice is both <strong>easy to use and easy to migrate
       to</strong>, for both experienced and beginners alike. It has a
       familiar user interface, and is able to read and write the vast
       majority of legacy file formats (including common Microsoft Office
@@ -116,23 +116,23 @@
       support both Community based (free) and from commercial organisations
       (paid-for).</li>
 
-      <li>OpenOffice.org is released under an open-source licence (the LGPL),
+      <li>Apache OpenOffice is released under an open-source licence (the LGPL),
       which means it may be used <strong>free of any licence fees, for any
       purpose</strong>: private, governmental, commercial, etc. Once acquired
       (either as a <a href="http://download.openoffice.org/">free download</a>
       or as a CD) it may be installed on an unlimited number of computers,
-      and may be copied and distributed without restriction. OpenOffice.org
+      and may be copied and distributed without restriction. Apache OpenOffice
       supports extensions, allowing users to add on extra functions easily
       from <a href="http://extensions.services.openoffice.org/">an extensions
       repository</a>. This is a key differentiator from the competition.</li>
     </ol>
 
-    <p>OpenOffice.org is available on all major computing platforms and is
+    <p>Apache OpenOffice is available on all major computing platforms and is
     supported in over ninety languages. Our best estimate is that
-    OpenOffice.org currently enjoys over 15% market share for office
+    Apache OpenOffice currently enjoys over 15% market share for office
     productivity suites.</p>
 
-    <h2>Key points about the OpenOffice.org Community</h2>
+    <h2>Key points about the Apache OpenOffice Community</h2>
 
     <p>The Community is organised into <a href="http://projects.openoffice.org/index.html">projects</a>,
covering all
     aspects of our activity. In languages alone, we have nearly 100 language
@@ -146,28 +146,28 @@
 
     <p>The overwhelming majority of Community members are volunteers. A small
     number (probably not more than a hundred or so) are sponsored by their
-    employers to work on OpenOffice.org. Most of these work in software
+    employers to work on Apache OpenOffice. Most of these work in software
     development. The Community acknowledges with gratitude the sponsorship it
     receives from its founding and primary sponsor, Oracle. Other
     significant contributors include major industry players like Novell,
     RedHat, RedFlag CH2000, IBM, and Google.</p>
     
-    <h2>Potted history of OpenOffice.org</h2>
+    <h2>Potted history of Apache OpenOffice</h2>
 
-    <p>OpenOffice.org is a mature software product, tracing its origins back
+    <p>Apache OpenOffice is a mature software product, tracing its origins back
     over twenty years to a commercial software house in Germany,
     StarDivision. Following the acquisition of StarDivision by Sun
-    Microsystems in April 1999, OpenOffice.org version 1.0 was released as
+    Microsystems in April 1999, Apache OpenOffice version 1.0 was released as
     open-source software on May 1st 2002. It proved hugely successful, and
     after more than 49 million recorded downloads, version 2.0 was released
-    on 20th October 2005. OpenOffice.org 2 removed the last barriers to
+    on 20th October 2005. Apache OpenOffice 2 removed the last barriers to
     migration with a new user interface, improved support for competitors'
     file formats, and a new integrated database component. It also became the
     first office suite to support the new OpenDocument Format for office
     applications (ODF) natively. ODF was adopted as an ISO standard on May
     1st 2006 and is the only office document format to be approved at this
-    level. OpenOffice.org 3 was announced on October 13, 2008, and recorded
-    100 million downloads from the OpenOffice.org download site alone just over
+    level. Apache OpenOffice 3 was announced on October 13, 2008, and recorded
+    100 million downloads from the Apache OpenOffice download site alone just over
     one year later on October 28, 2009.</p>
 
     <h2>Logos etc</h2>
@@ -189,7 +189,7 @@
     <h3>Global Contacts</h3>
 
     <p><strong>Please remember that these numbers <u>DO NOT</u> provide
-    support for OpenOffice.org. Please <u>DO NOT</u> call them for support
+    support for Apache OpenOffice. Please <u>DO NOT</u> call them for support
     requests. Instead, please see our website at <a href="http://support.openoffice.org/">support.openoffice.org</a>.</strong></p>
 
     <p>Peter Junge (UTC +08h00)<br>



Mime
View raw message