From 08f9199d5ee13b091ef1f639cf9c24133bfc25b7 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Mon, 8 Oct 2007 15:24:08 -0400
Subject: [PATCH] Fix up grammar on donation link and page

---
 about/Makefile      |  5 ++--
 about/donations.xml | 59 ++++++++++++++++++++++++++-------------------
 xsl/functions.xsl   |  4 ++-
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/about/Makefile b/about/Makefile
index ef69851..e38a596 100644
--- a/about/Makefile
+++ b/about/Makefile
@@ -1,5 +1,6 @@
-FILES = members.xml index.html exec.html members.html constitution.html donations.html \
-    constitution-change-20020920.html constitution-change-20040205.html
+FILES = members.xml index.html exec.html members.html constitution.html \
+	donations.html constitution-change-20020920.html \
+	constitution-change-20040205.html
 RELDIR = about/
 include ../common.mk
 
diff --git a/about/donations.xml b/about/donations.xml
index 9275dcc..8b44359 100644
--- a/about/donations.xml
+++ b/about/donations.xml
@@ -4,35 +4,42 @@
 
 <cscpage title="Donate to the University of Waterloo Computer Science Club">
  <header />
- 
- <section title="Why should I donate?"> 
+
+ <section title="Why should I donate?">
   <p>
-	We use donations to help offset some of the cost from our talks. Things like having it recorded, paying transportation and hotel fees. We 
-also use donations to cover new hardware purchases to keep up with the demand that popular media files place on our servers. 
+    Providing talks and other media files is not cheap. Our expenses include
+    speaker, recording, transportation and hotel fees. We also need to
+    maintain the servers that are used to host the files, and purchase new
+    servers to keep up with the demand that our popular media files place on
+    our servers.
   </p>
  </section>
  <section title="How do I donate?">
   <p>
-	The Computer Science club accepts almost all forms of donation. The easist and most convient is probably paypal
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
-<input type="hidden" name="cmd" value="_xclick" />
-<input type="hidden" name="business" value="exec@csclub.uwaterloo.ca" />
-<input type="hidden" name="item_name" value="University of Waterloo Computer Science Club Donation" />
-<input type="hidden" name="buyer_credit_promo_code" value="" />
-<input type="hidden" name="buyer_credit_product_category" value="" />
-<input type="hidden" name="buyer_credit_shipping_method" value="" />
-<input type="hidden" name="buyer_credit_user_address_change" value="" />
-<input type="hidden" name="no_shipping" value="0" />
-<input type="hidden" name="no_note" value="1" />
-<input type="hidden" name="currency_code" value="CAD" />
-<input type="hidden" name="tax" value="0" />
-<input type="hidden" name="lc" value="CA" />
-<input type="hidden" name="bn" value="PP-DonationsBF" />
-<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" border="0" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
- so click the link and give us money :). We also accept cheques, goats, hardware, t-shirts, or pretty much anything that would be useful sent to our 
-mailing address. Before sending a goat (or similar), please e-mail <a href="mailto:exec@csclub.uwaterloo.ca">exec@csclub.uwaterloo.ca</a>
+	The Computer Science club accepts almost all forms of donation. The easist
+    and most convenient way to donate is by PayPal, by clicking the button
+    below.
+  </p>
+  <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+    <input type="hidden" name="cmd" value="_xclick" />
+    <input type="hidden" name="business" value="exec@csclub.uwaterloo.ca" />
+    <input type="hidden" name="item_name" value="University of Waterloo Computer Science Club Donation" />
+    <input type="hidden" name="buyer_credit_promo_code" value="" />
+    <input type="hidden" name="buyer_credit_product_category" value="" />
+    <input type="hidden" name="buyer_credit_shipping_method" value="" />
+    <input type="hidden" name="buyer_credit_user_address_change" value="" />
+    <input type="hidden" name="no_shipping" value="0" />
+    <input type="hidden" name="no_note" value="1" />
+    <input type="hidden" name="currency_code" value="CAD" />
+    <input type="hidden" name="tax" value="0" />
+    <input type="hidden" name="lc" value="CA" />
+    <input type="hidden" name="bn" value="PP-DonationsBF" />
+    <input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but21.gif" name="submit" alt="Make payments with PayPal - it's fast, free and secure!" />
+    <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
+  </form>
+  <p>
+    We also accept cheques, hardware, clothes, and pretty much anything else
+    that would be useful to us. Our mailing address is:
   </p>
 <pre>Computer Science Club
 Math &amp; Computer 3036/3037
@@ -40,7 +47,9 @@ University of Waterloo
 200 University Avenue West
 Waterloo, Ontario, CANADA
 N2L 3G1</pre>
-  <p>Our office phone number is (519) 888-4567 x33870.</p>
+  <p>
+    Our office phone number is (519) 888-4567 x33870.
+  </p>
  </section>
 
  <footer />
diff --git a/xsl/functions.xsl b/xsl/functions.xsl
index 61feba4..22595ef 100644
--- a/xsl/functions.xsl
+++ b/xsl/functions.xsl
@@ -34,7 +34,9 @@
 </xsl:function>
 
 <xsl:template name="donate-now">
-<p><a href="/about/donations.html">Donate to Computer Science Club and help us keep on doing what we do</a></p>
+<p>Please consider <a href="{$g_pre}about/donations.html">donating to the
+Computer Science Club</a> to help offset the costs of bringing you our
+talks.</p>
 </xsl:template>
 
 <xsl:template name="inline-ads">