Author: buildbot
Date: Tue Dec 3 23:33:16 2013
New Revision: 889020
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/donations.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec 3 23:33:16 2013
@@ -1 +1 @@
-1547570
+1547643
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec 3 23:33:16 2013
@@ -1 +1 @@
-1547570
+1547643
Modified: websites/staging/ooo-site/trunk/content/donations.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/donations.html (original)
+++ websites/staging/ooo-site/trunk/content/donations.html Tue Dec 3 23:33:16
2013
@@ -59,7 +59,7 @@
<p>
Apache OpenOffice, the leading open source office productivity software, is
published by the non-profit Apache Software Foundation (ASF). Apache
OpenOffice has been downloaded
<a href="http://www.openoffice.org/stats/downloads.html";>over 80 million
times</a>, by users in <a
href="http://www.openoffice.org/stats/countries.html";>over 200 countries</a>.
-Commercial alternatives to OpenOffice sell for $100 or more, and come without
the legal right to make copies and share the software.</p>
+Commercial alternatives to OpenOffice sell for 100 USD or more, and come
without the legal right to make copies and share the software.</p>
<p>
Apache OpenOffice is only one of <a
href="http://projects.apache.org/indexes/alpha.html";>many open source
projects</a> that are part of the Apache Software Foundation. The ASF
comprises over 100 open source
@@ -72,7 +72,7 @@ our mission and help sustain a vibrant o
<h2>How we use Donations</h2>
<p>The Apache Software Foundation provides the technical infrastructure for
the projects — the mailing lists, code repositories, bug tracking
systems, etc. We have the normal
-business operating expenses which go with any organization. These include:
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office
expenses, Marketing and PR.
+business operating expenses which go with any organization. These include:
Bandwidth costs, Servers and hardware, Legal and Accounting, Normal office
expenses, Marketing and PR,
Sub-contractors to "fill in the holes" for administrative and secretarial
duties</p>
</div>
@@ -81,9 +81,9 @@ Sub-contractors to "fill in the holes" f
<h2>How to Donate</h2>
-Donations can easily be made via PayPal or Amazon. Other ways of donating are
described <a
href="http://www.apache.org/foundation/contributing.html";>here</a>. The Apache
Software
-Foundation is a registered non-profit, charitable organization under Section
501(c)(3) of the U.S. Internal Revenue Code. This means that, for individuals
within the U.S., donations
-to the ASF should be <strong>tax-deductible</strong>. (Check with your tax
accountant to confirm for your situation)</p>
+Donations can easily be made via PayPal or Amazon. We have another page that
describes <a href="http://www.apache.org/foundation/contributing.html";>other
ways to donate</a>.
+The Apache Software Foundation is a registered non-profit, charitable
organization under Section 501(c)(3) of the U.S. Internal Revenue Code. This
means that,
+for individuals within the U.S., donations to the ASF should be
<strong>tax-deductible</strong>. (Check with your tax accountant to confirm
details for your personal situation.)</p>
<p>You can contribute via PayPal by clicking on the PayPal icon:</p>
<p>
