openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robw...@apache.org
Subject svn commit: r1547545 - /openoffice/ooo-site/trunk/content/donations.html
Date Tue, 03 Dec 2013 19:35:04 GMT
Author: robweir
Date: Tue Dec  3 19:35:03 2013
New Revision: 1547545

URL: http://svn.apache.org/r1547545
Log:
fix conflict

Modified:
    openoffice/ooo-site/trunk/content/donations.html

Modified: openoffice/ooo-site/trunk/content/donations.html
URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/donations.html?rev=1547545&r1=1547544&r2=1547545&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/donations.html (original)
+++ openoffice/ooo-site/trunk/content/donations.html Tue Dec  3 19:35:03 2013
@@ -1,119 +1,3 @@
-<<<<<<< .mine
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html>
-<head>
-    <title>Donations </title>
-    <meta name="Keywords" content="Apache, ASF, OpenOffice, donations contributions">
-    <meta name="Description" content="Information on how to donate to the Apache Software
Foundation to benefit Apache OpenOffice and other Apache projects">
-    
-    <script type="text/javascript">
-
-    function trackSubmissions(form, category, name, value) {
-        try {
-            _gaq.push(['_trackEvent', category, name, value]);
-        } catch(err){}
-        setTimeout(function() {
-            form.submit();
-        }, 100);
-    }
-    </script>
-
-
-    <style>
-
-     .left {
-    float: left;
-    width: 50%;
-    padding:25px
-     }
-
-     .right {
-    margin-left: 50%;
-    padding:25px
-     }
-    </style>
-
-</head>
-
-<body>
-
-<div class="left">
-
-<h2>A Good Cause</h2>
-
-<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>  
-
-<p>
-Apache OpenOffice is only one of <a href="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 
-projects, over 400 active members, over 2000 committers and countless contributors and users.
We are responsible for millions of lines of code and the 35+ servers which make up our 
-infrastructure.</p>
-
-<p>We invite you to donate to the Apache Software Foundation, to support Apache OpenOffice
as well as the many the other projects at Apache.  Your contribution shows your support for

-our mission and help sustain a vibrant organization. Sponsorship also shows your support
for Open Source and provides you the opportunity to "give back" to the community.</p>
-
-<h2>How we use Donations</h2>
-
-<p>The Apache Software Foundation provides the technical infrastructure for the projects
&mdash; 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.
-Sub-contractors to "fill in the holes" for administrative and secretarial duties</p>
-</div>
-
-
-<div class="right">
-
-<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>
-
-<h3>Donate via PayPal</h3>
-<p>You can contribute via PayPal by clicking on the PayPal icon:</p>
-<p>
-<center>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" onsubmit="trackSubmissions(this,
'form', 'donate', 'paypal'); return false;">
-<input type="hidden" name="cmd" value="_xclick"></input>
-<input type="hidden" name="business" value="contributions@apache.org"></input>
-<input type="hidden" name="return" value="http://www.apache.org"></input>
-<input type="hidden" name="no_shipping" value="0"></input>
-<input type="hidden" name="cancel_return" value="http://www.apache.org"></input>
-<input type="hidden" name="item_name" value="The Apache Software Foundation"></input>
-<input type="image" src="images/pp.gif" border="0" name="submit" title="Donate to ASF
-with PayPal - it's fast, free and secure" alt="Donate to ASF with PayPal - it's fast,
-free and secure"></input></form>
-</center>
-</p>
-
-<h3>Donate via Amazon</h3>
-<p>If you have an Amazon account, you can donate using Amazon Payments by filling in
the donation amount and clicking the Donate button below:
-<center>
-<div style="width:20em;padding-left:10px;padding-top:10px;padding-right:10px;padding-bottom:10px;">
-<form action="https://authorize.payments.amazon.com/pba/paypipeline" method="post" onsubmit="trackSubmissions(this,
'form', 'donate', 'amazon'); return false;">
-<input type="hidden" name="processImmediate" value="1" >
-<input type="hidden" name="signatureMethod" value="HmacSHA256" >
-<input type="hidden" name="accessKey" value="11SEM03K88SD016FS1G2" >
-<input type="hidden" name="collectShippingAddress" value="0" >
-<input type="hidden" name="isDonationWidget" value="1" >
-<input type="hidden" name="description" value="Donate to the Apache Software Foundation"
>
-<input type="hidden" name="amazonPaymentsAccountId" value="FSSMMCPFILZS664HHLECRQCM6KA9D11LLDCPNS"
>
-<input type="hidden" name="cobrandingStyle" value="logo" >
-<input type="hidden" name="signatureVersion" value="2" >
-<input type="hidden" name="immediateReturn" value="1" >
-<input type="hidden" name="signature" value="ynU8jsXMNQ3uKmz+C73SKzupH80sqNhRjJhqEfces/o="
>
-$&nbsp;<input type="text" name="amount" size="8" value="">
-<input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif"
border="0" style="vertical-align: top">
-</form></div></center></p>
-
-</div>
-
-</body>
-</html>
-
-=======
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 <html>
@@ -123,6 +7,7 @@ $&nbsp;<input type="text" name="amount" 
     <meta name="Description" content="Information on how to donate to the Apache Software
Foundation to benefit Apache OpenOffice and other Apache projects">
     
     <script type="text/javascript">
+
     function trackSubmissions(form, category, name, value) {
         try {
             _gaq.push(['_trackEvent', category, name, value]);
@@ -131,11 +16,29 @@ $&nbsp;<input type="text" name="amount" 
             form.submit();
         }, 100);
     }
-</script>
+    </script>
+
+
+    <style>
+
+     .left {
+    float: left;
+    width: 50%;
+    padding:25px
+     }
+
+     .right {
+    margin-left: 50%;
+    padding:25px
+     }
+    </style>
+
 </head>
 
 <body>
 
+<div class="left">
+
 <h2>A Good Cause</h2>
 
 <p>
@@ -144,13 +47,23 @@ Apache OpenOffice, the leading open sour
 Commercial alternatives to OpenOffice sell for $100 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 
+Apache OpenOffice is only one of <a href="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 
 projects, over 400 active members, over 2000 committers and countless contributors and users.
We are responsible for millions of lines of code and the 35+ servers which make up our 
 infrastructure.</p>
 
 <p>We invite you to donate to the Apache Software Foundation, to support Apache OpenOffice
as well as the many the other projects at Apache.  Your contribution shows your support for

 our mission and help sustain a vibrant organization. Sponsorship also shows your support
for Open Source and provides you the opportunity to "give back" to the community.</p>
 
+<h2>How we use Donations</h2>
+
+<p>The Apache Software Foundation provides the technical infrastructure for the projects
&mdash; 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.
+Sub-contractors to "fill in the holes" for administrative and secretarial duties</p>
+</div>
+
+
+<div class="right">
+
 <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 
@@ -194,32 +107,7 @@ $&nbsp;<input type="text" name="amount" 
 <input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/beige_small_donate_withmsg_whitebg.gif"
border="0" style="vertical-align: top">
 </form></div></center></p>
 
-<h2>How we use Donations</h2>
+</div>
 
-<p>The Apache Software Foundation provides the technical infrastructure for the projects
&mdash; the mailing lists, code repositories, bug tracking systems, etc. We have the normal

-business operating expenses which go with any organization. These include:</p>
-<ul>
-<li>
-<p>Bandwidth costs</p>
-</li>
-<li>
-<p>Servers and hardware</p>
-</li>
-<li>
-<p>Legal and Accounting</p>
-</li>
-<li>
-<p>Normal office expenses</p>
-</li>
-<li>
-<p>Marketing and PR</p>
-</li>
-<li>
-<p>Sub-contractors to "fill in the holes" for administrative and secretarial
-duties</p>
-</li>
-</ul>
 </body>
-</html>
-
->>>>>>> .r1547541
+</html>
\ No newline at end of file



Mime
View raw message