Merge branch 'acm'

about/index.xml

@@ -31,12 +31,7 @@ Canada
     really <i>is</i> quite a read, see for yourself!) answers this
     question. In short, we exist to promote knowledge of and interest
     in computer science as well as allowing those interested in
-    computer science to talk to each other. We are also a proud
-    <a href="http://www.acm.org/chapters/stu/">ACM student
-    chapter</a>. The <a href="http://www.acm.org/">Association of
-    Computing Machinery (ACM)</a> is the world's first society in
-    computing and brings together many students and professionals from
-    all over the world with an interest in computing. We have an <a
+    computer science to talk to each other. We have an <a
     href="../office/">office</a> where members get together, a
     <a href="http://library.csclub.uwaterloo.ca/">library</a> of computer
     science books available to our members, computer accounts on our various

default.css

@@ -130,9 +130,6 @@ div.biglogo div {
 div.biglogo div.uwlogo {
     margin-top: 16px;
 }
-div.biglogo div.acmlogo {
-    margin-top: 12px;
-}
 div.biglogo div.csclogo {
     margin-top: 12px;
     float: right;

logos/Makefile

@@ -1,3 +1,3 @@
-FILES = acm_logo.png csc_logo.png csc_only.png csc_title.png uw_logo.png
+FILES = csc_logo.png csc_only.png csc_title.png uw_logo.png
 RELDIR = logos/
 include ../common.mk

services/machine_usage.xml

@@ -187,8 +187,8 @@ that action.
 <section title="Definitions">
 <dl>
 <dt>CSC</dt>
-<dd>The University of Waterloo <a href="/">Computer Science Club</a>,
-        a student chapter of the ACM.  The CSC office is located in room
+<dd>The University of Waterloo <a href="/">Computer Science Club</a>.
+        The CSC office is located in room
         3036/3037 of Mathematics and Computer Building (UW campus),
         telephone number (519) 888-4657 x3870.
     </dd>

xsl/common.xsl

@@ -42,10 +42,6 @@
       <a href="http://www.uwaterloo.ca/"><img src="{$g_pre}logos/uw_logo.png"
           alt="University of Waterloo" width="105" height="70" /></a>
     </div>
-    <div class="acmlogo">
-      <a href="http://www.acm.org"><img src="{$g_pre}logos/acm_logo.png"
-           alt="A Student Chapter of the ACM" width="82" height="88" /></a>
-    </div>
     <div class="csclogo">
       <a href="{$g_pre}"><img src="{$g_pre}logos/csc_logo.png"
           alt="Computer Science Club" width="420" height="79" /></a>