From 10527e99688c5784b9e7f87b291c5a30d90d0b5b Mon Sep 17 00:00:00 2001
From: Elana Hashman <ehashman@csclub.uwaterloo.ca>
Date: Tue, 4 Sep 2012 15:28:08 -0400
Subject: [PATCH] Website updates; random outdated stuff

---
 about/donations.xml |  4 ++--
 about/index.xml     | 31 ++++++++++++++++++++++++-------
 directory.xml       |  2 +-
 index.xml           | 17 +++++++++++------
 office/index.xml    | 22 +++++++++++++---------
 services/index.xml  | 34 ++++++++++++++++++++++++++++------
 6 files changed, 79 insertions(+), 31 deletions(-)

diff --git a/about/donations.xml b/about/donations.xml
index 0f00019..55f6ea8 100644
--- a/about/donations.xml
+++ b/about/donations.xml
@@ -67,10 +67,10 @@ Canada
     has provided funding for a variety of projects, events, and hardware:
   </p>
   <ul>
+    <li>High-Fructose Corn Syrup, a server used for high performance computing</li>
     <li>Sodium-Benzoate, the server that runs
       <a href="http://mirror.csclub.uwaterloo.ca/">mirror.csclub.uwaterloo.ca</a></li>
-    <li>Taurine, a server used for virtualization</li>
-    <li>A gigabit switch for the Mathsoc offices (including CSC office)</li>
+    <li>A gigabit switch for the MathSoc offices (including ours)</li>
     <li>Academic talks</li>
     <li>Linux CDs for first-year students</li>
     <li>Caffeine, our primary server</li>
diff --git a/about/index.xml b/about/index.xml
index c21ac69..aaed596 100644
--- a/about/index.xml
+++ b/about/index.xml
@@ -12,7 +12,7 @@
     of Waterloo.&quot; You can contact <a href="exec">our
     executive</a> by e-mail at <a
     href="mailto:exec@csclub.uwaterloo.ca">exec@csclub.uwaterloo.ca</a>,
-    come by the <a href="../office/">office</a> in MC3036/3037 or mail
+    come by the <a href="../office/">office</a> in MC 3036/3037 or mail
     us at the following address.
   </p>
 <pre>Computer Science Club
@@ -46,8 +46,8 @@ Canada
  <section title="What... is the air-speed velocity of an unladen swallow?">
   <p>
    What
-   do you mean? An African or European swallow?<i>(idea
-   shamelessly stolen from the <a
+   do you mean? An African or European swallow?<i> 
+   (idea shamelessly stolen from the <a
    href="http://gcc.gnu.org/libstdc++/">GNU libstdc++
    homepage</a>)</i>
   </p>
@@ -56,19 +56,36 @@ Canada
   <p>
    Each term a new executive is elected by <a href="members">the
    membership</a>. See the <a href="exec">Executive</a> page to find
-   out who this term's executive is.
+   out who this term's executive is, and watch for when this term's
+   elections will be held if you want to participate in our 
+   <a href="../events">Events</a> news.
   </p>
  </section>
 
  <section title="Can I join?">
+  <p>
+   In short, yes! Almost certainly.
+  </p>
   <p>
    In compliance with MathSoc regulations and in recognition of the club being
    primarily targeted at undergraduate students, full membership is open to all
    Social Members of the Mathematics Society and restricted to the same.
-   Affiliate membership is open to all others. Affiliate members may not vote
-   or hold executive positions. Membership costs a mere $2 (Canadian) a term
-   at the time of this writing, but may change in the future.
+   Affiliate membership is open to all others in the University of Waterloo
+   community. Affiliate members may not vote or hold executive positions. 
+   Membership costs a mere $2 (Canadian) a term.
   </p>
  </section>
+
+ <section title="How do I join?">
+  <p>
+   Simply drop by our office in MC 3036/3037 with some identification 
+   (WatCard, driver's license, etc.) and $2 per term that you would like to
+   pay for. We'll have you sign our 
+   <a href='../services/machine_usage'>machine usage agreement</a> and after 
+   your account on our systems is created you'll have access to all the 
+   services available to members.
+  </p>
+ </section>
+
  <footer />
 </cscpage>
diff --git a/directory.xml b/directory.xml
index d6d08ad..c0a9977 100644
--- a/directory.xml
+++ b/directory.xml
@@ -11,5 +11,5 @@
  <diritem title="Wiki" absolute="true" href="//wiki.csclub.uwaterloo.ca/" />
  <diritem title="Webmail" absolute="true" href="https://mail.csclub.uwaterloo.ca/" />
  <diritem title="Stats" absolute="true" href="/stats" />
- <diritem title="Library" href="library/" />
+<!--  <diritem title="Library" href="library/" />  This is broken as hell -->
 </directory>
diff --git a/index.xml b/index.xml
index 075c412..e72c227 100644
--- a/index.xml
+++ b/index.xml
@@ -22,11 +22,16 @@
   <p>
    If you are interested in holding, planning, or helping out with an
    event, don't hesitate to contact the <a
-   href="mailto:veep@csclub.uwaterloo.ca">Vice President</a> right
+   href="mailto:progcom@csclub.uwaterloo.ca">Programme Committee</a> right
    away! We will be more than glad to help you organise and hold your
-   event. If you want to help out with other CSC stuff, drop by <a
-   href="office/">our office</a> and we'll give you something to
-   do. You might want to try contacting the <a
+   event. Industry representatives should take a look at our 
+   <a href='http://wiki.csclub.uwaterloo.ca/Industry_Opportunities'>wiki 
+   page for industry events</a>. If you want to help out with other CSC 
+   stuff, drop by <a href="office/">our office</a> and we'll give you 
+   something to do. 
+  </p>
+  <p>
+   You might want to try contacting the <a
    href="mailto:systems-committee@csclub.uwaterloo.ca">Systems
    Committee</a> if you're interested in doing system administration
    tasks or if you need assistance using CSC computer systems.
@@ -35,8 +40,8 @@
 
  <section title="Getting your own homepage">
   <p>
-   Many members of the Computer Science Club host their homepage on
-   our web server. To find out how to
+   Many members of the Computer Science Club host their personal websites
+   on our web server. To find out how to
    get your own, check out the <a href="services/">Services page</a>.
   </p>
  </section>
diff --git a/office/index.xml b/office/index.xml
index 21402da..1d24b30 100644
--- a/office/index.xml
+++ b/office/index.xml
@@ -6,15 +6,14 @@
  <header />
  <section title="About the office">
   <p>
-   The CSC Office is located at room MC3036/3037, in the Math &amp;
+   The CSC Office is located at room MC 3036/3037, in the Math &amp;
    Computer Building of the University of Waterloo. The office is open
    whenever office staff are around to keep it
    open, which basically means it is open most of the time. You can
    check by taking a look through our <a href="webcam">web-enabled
-   camera</a>. At the
-   office we have lots of books,
-   a few computer terminals, and most of the time an array of knowledgeable 
-   people to talk to and ask questions.
+   camera</a>. In the office we have lots of books, five computer terminals, 
+   and most of the time an array of knowledgeable people to talk to and ask 
+   questions.
   </p>
   <p>
    One of our most popular services at the office is providing anybody
@@ -32,8 +31,10 @@
    to somebody there, and the office manager will probably give you
    something to do.
   </p>
-  <p>Our office phone number is (519) 888-4567 x33870, and you can
-  mail us at the following address.</p>
+  <p>
+   Our office phone number is (519) 888-4567 x33870, and you can
+   mail us at the following address.
+  </p>
 <pre>Computer Science Club
 Math &amp; Computer 3036/3037
 University of Waterloo
@@ -41,8 +42,11 @@ University of Waterloo
 Waterloo, ON  N2L 3G1
 Canada
 </pre>
-  <p>Or email the club executive at exec@csclub.uwaterloo.ca, which is usually
-  the best way to contact the club.</p>
+  <p>
+   Or email the club executive at 
+   <a href="mailto:exec@csclub.uwaterloo.ca">exec@csclub.uwaterloo.ca</a>, 
+   which is usually the best way to contact the club.
+  </p>
  </section>
 
  <footer />
diff --git a/services/index.xml b/services/index.xml
index c468dfa..90d039d 100644
--- a/services/index.xml
+++ b/services/index.xml
@@ -8,10 +8,12 @@
   <p>
    The main benefit of becoming a CSC member is to get access to our various
    machines. We offer a large range of hardware, including Alpha, MIPS,
-   UltraSPARC, i386, and AMD64. Our primary development machine, taurine, is
-   a dual AMD Opteron (4 cores in total) with 8 GiB of RAM. Most of our
-   machines are connected via gigabit ethernet. We offer 4 GB of disk quota
-   that is accessible across all of our machines. Our wiki contains a <a
+   UltraSPARC, i386, and AMD64. Our primary development machine, 
+   high-fructose-corn-syrup, is a 4x AMD Opteron (64 cores at 2.4 GHz)
+   with 64 GiB of RAM, and it easily outperforms the Linux machines available
+   through CSCF. Most of our machines are connected via gigabit ethernet. 
+   We offer 4 GB of disk quota that is accessible across all of our machines. 
+   Our wiki contains a <a
    href="http://wiki.csclub.uwaterloo.ca/wiki/Machine_List">full machine
    list</a>.
 
@@ -50,10 +52,10 @@
      Windows or <a href="http://www.openssh.com/">OpenSSH</a> on *nix).
    </li><li>
      Create a directory called <code>www</code> in your home directory by
-     typing <code>mkdir ~/www</code>.
+     typing <code>mkdir ~/www</code>. (This directory may already exist.)
    </li><li>
      Put the files you want on your web page in your new <code>www</code>
-     directory. <code>index.html/php/py</code> will be loaded by default.
+     directory. <code>index.{html,php,py}</code> will be loaded by default.
      You can upload files using an scp client (e.g. <a
      href="http://winscp.net/">WinSCP</a> on Windows or <a
      href="http://www.openssh.com/">OpenSSH</a> on *nix).
@@ -109,5 +111,25 @@
    </p>
  </section>
 
+ <section title="Mailing Lists">
+   <p> 
+      In addition to running our
+      <a href="http://mailman.csclub.uwaterloo.ca/listinfo/csc-general">csc-general 
+      mailing list</a> to inform members about our current events, we also run 
+      a 
+      <a href="http://mailman.csclub.uwaterloo.ca/listinfo/csc-industry">csc-industry 
+      mailing list</a>, 
+      which allows students to opt-in to receiving emails from industry 
+      representatives. Corporate events, job postings, info sessions, and
+      like may be posted here.
+   </p>
+   <p>
+      If you're interested in getting more involved with the Computer Science
+      Club, <a href="mailto:exec@csclub.uwaterloo.ca">email the executive</a> 
+      to ask about joining our programme committee. It has its own mailing 
+      list that members can also join.
+   </p>
+ </section>
+
  <footer />
 </cscpage>