Author: buildbot
Date: Sun May 6 22:37:41 2012
New Revision: 816178
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/distribution/cdrom/index.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun May 6 22:37:41 2012
@@ -1 +1 @@
-1334804
+1334810
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun May 6 22:37:41 2012
@@ -1 +1 @@
-1334804
+1334810
Modified: websites/staging/ooo-site/trunk/content/distribution/cdrom/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/distribution/cdrom/index.html
(original)
+++ websites/staging/ooo-site/trunk/content/distribution/cdrom/index.html Sun
May 6 22:37:41 2012
@@ -75,7 +75,7 @@
<div class="Acta1">
<h2>CD-ROMs for consumers</h2>
-<h3>Note: OpenOffice.org does <strong class="fontredochre">not</strong>
+<h3>Note: Apache OpenOffice does <strong class="fontredochre">not</strong>
supply CD ROMs directly. If you want a CD, you need to follow the
directions below to find a distributor who services your area.</h3>
<p>This page allows you to find a distributor near you, or who will
@@ -85,10 +85,11 @@ to cover their costs and postage. Once y
ensure that you check your email regularly for their reply. You must do
this for at least the next 24 hours. Until you have agreed to their
price, they will not ship the CDs.</h2>
-<p>There is also a set of 3 standard CD images available for you to
+<!-- <p>There is also a set of 3 standard CD images available for you to
burn onto
your own CD-R. To download these images, <a
href="http://distribution.openoffice.org/cdrom/iso_download.html";>see
the CD Download page</a>
+-->
</p>
<h3>Would <em>you</em> like to Be a Distributor too?</h3>
<p>We welcome anyone who would like to distribute OpenOffice.org in
@@ -122,9 +123,8 @@ any of them nor do we guarantee the cont
<p>All offer the latest release. Check the particular distributor for the CD's
contents (for example, localized builds).</p>
-<p class="fontredochre"><strong>Note: OpenOffice.org makes no claims about the
contents of any CD-ROM you may purchase from a distributor listed here.
-We list these only as a courtesy to the community. Should you find old or
invalid links, please report them to the page maintainer:
-<a href="mailto:[email protected]";>Alex Fisher</a></strong></p>
+<p class="fontredochre"><strong>Note: Apache OpenOffice makes no claims about
the contents of any CD-ROM you may purchase from a distributor listed here.
+We list these only as a courtesy to the community. Should you find old or
invalid links, please report them to the <a href="mailto:
[email protected]">Apache OpenOffice developer list</a></strong></p>
<hr noshade="true" />
