Author: buildbot
Date: Tue Jun 11 17:01:24 2013
New Revision: 865312
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/distribution/ebay_page.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 11 17:01:24 2013
@@ -1 +1 @@
-1491618
+1491877
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Jun 11 17:01:24 2013
@@ -1 +1 @@
-1491618
+1491877
Modified: websites/staging/ooo-site/trunk/content/distribution/ebay_page.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/distribution/ebay_page.html
(original)
+++ websites/staging/ooo-site/trunk/content/distribution/ebay_page.html Tue Jun
11 17:01:24 2013
@@ -3,7 +3,7 @@
<head>
<link href="/css/ooo.css" rel="stylesheet" type="text/css">
-<title>EBay Page</title>
+<title>eBay Page</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<!--#include virtual="/google-analytics.js" -->
@@ -21,19 +21,15 @@
-<h1><font color="navy">About</font> Open<font
color="navy">Office</font>.org</h1>
-<p> </p>
-<p>OpenOffice.org is an office productivity suite whose source is licensed
under the <a href="http://www.openoffice.org/license.html";>LGPL</a>. The
application is free to download from the OpenOffice.org website (<a
href="http://www.openoffice.org/";>http://www.openoffice.org</a>), but may be
sold: the licenses permit this. Sun Microsystems, Inc. is the copyright holder
of the source as well as of key graphics, such as the banners and logo. In
addition, other members of the community hold copyright over content found on
the OpenOffice.org Project website.</p>
-<p>We invite you to join our community if you are interested in working with
the source to make derived products or products otherwise based on
OpenOffice.org. Contact the <a href="mailto:[email protected]";>Community
Manager</a> if you have any questions on derived products.</p>
-<p> The OpenOffice.org Project welcomes the legitimate enterprise of EBay
sellers of OpenOffice.org. If you wish to sell CDROMs of OpenOffice.org, we ask
that you contact us; if you wish to use our graphics or any text found on
www.openoffice.org, you must obtain our permission. Upon being contacted, we
will review your site and, if it passes review, add you to our list of CDROM
distributors <a
href="http://distribution.openoffice.org/cdrom/";>(http://distribution.openoffice.org/cdrom/</a>).
Being so added will help your marketing. You will also be free then to list
your site with EBay. </p>
-<p>The CDROM Project hosts ISO images for your use and other OpenOffice.org
projects, such as our <a
href="http://documentation.openoffice.org/";>Documentation Project</a>, host
documentation. We also list those offering support, either for free or for fee,
from our <a href="http://support.openoffice.org/";>Support Page</a>.</p>
-<p>If you have any questions, please contact our <a
href="mailto:[email protected]";>CDROM list</a>, or the CDROM
Distribution Lead, <a href="mailto:[email protected]";>Alex Fisher</a>.</p>
-<p>For more information about OpenOffice.org, please see our <a
href="http://www.openoffice.org/about.html";> About Us</a> page.</p>
-<p>For answers to common questions, see our FAQ, <a
href="http://www.openoffice.org/faq.html";>
http://www.openoffice.org/faq.html</a>.</p>
-<p> </p>
-<p>The OpenOffice.org Project</p>
-<p> </p>
+<h1>About Apache OpenOffice</h1>
<p> </p>
+<p>OpenOffice is an office productivity suite which is licensed under the <a
href="http://www.apache.org/licenses/LICENSE-2.0.html";>Apache License 2.0</a>.
The application is free to download from the OpenOffice website
+ (<a href="http://www.openoffice.org/";>http://www.openoffice.org</a>),
but may be sold: the licenses permit this.</p>
+
+ <p>We invite you to join our community if you are interested in working
with the source to make derived products or products otherwise based on
OpenOffice.
+ Write to our <a href="mailto:[email protected] org">Pubic
Mailing List</a> if you have any questions on derived products.</p>
+
+
</div>
<!--#include virtual="/footer.html" -->
