From c8ef0fe6de607992d1507125827c0fdf3fd47022 Mon Sep 17 00:00:00 2001
From: Webmaster <www@csclub.uwaterloo.ca>
Date: Fri, 8 Jun 2007 17:58:25 +0000
Subject: [PATCH] Incremental update -daltenty

---
 cscweb.xsl                  | 11 ++++++++---
 events.xml                  | 30 ++++++++++++++++++++++++++++++
 media/index.xml             |  6 +++---
 office/computers.xml        |  9 +++++++--
 office/webcam-streaming.xml |  4 ++--
 office/webcam.xml           |  4 ++--
 6 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/cscweb.xsl b/cscweb.xsl
index 461bff9..c07b068 100755
--- a/cscweb.xsl
+++ b/cscweb.xsl
@@ -86,7 +86,8 @@
  Download <xsl:value-of select="@title"/> in a number of formats via 
 <ul>
 <li>bittorrent
- <xsl:param name="ext">Unset</xsl:param>
+<!-- Commented out because its broken -->
+<!-- <xsl:param name="ext">Unset</xsl:param> -->
  <xsl:apply-templates select="mediafile" >
  <xsl:with-param name="ext">.torrent</xsl:with-param>
  </xsl:apply-templates>
@@ -105,10 +106,14 @@
 </li>
 </ul>
 </p>
-<!--
+<!-- Start Slashdot It link --> 
+<a 
+href="javascript:location.href='http://slashdot.org/bookmark.pl?url='+encodeURIComponent(location.href)"> <img src="http://images.slashdot.org/favicon.gif" alt="Slashdot" border="0" height="16" width="16"></img></a>
+<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
+<a href="javascript:location.href='http://slashdot.org/bookmark.pl?url='+encodeURIComponent(location.href)">Slashdot It!</a>
+<!-- End Slashdot It link -->
 <script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
 <script language="javascript" src="http://reddit.com/button.js?t=3"></script>
--->
 <!--
 <script type="text/javascript">
 google_ad_client = "pub-5235744946475097";
diff --git a/events.xml b/events.xml
index ec81957..df111e8 100755
--- a/events.xml
+++ b/events.xml
@@ -1,4 +1,34 @@
 <eventdefs>
+<!--spring 2007-->
+
+  <eventitem date="2007-06-11" time="4:30 PM"
+          room="DC 1351" title="Usability in the wild">
+                  <short>A talk by Michael Terry</short>
+                          <abstract>
+                                  <p>What is the typical monitor resolution of
+                                  a GIMP user? How many monitors do they
+                                   have? What size images do they work on? How
+                                   many layers are in their images? Th
+                                   e answers to these questions are generally
+                                   unknown: No means currently exist for
+                                    open source applications to collect usage
+                                    data.
+                                    In this talk, I will present
+                                    ingimp, a version of GIMP that
+                                    has been in
+                                    strumented to automatically collect usage
+                                    data from real-world users. I will dis
+                                    cuss ingimp's design, the type of data we
+                                    collect, how we make the data availabl
+                                    e on the web, and initial results that
+                                    begin to answer the motivating questions.
+                                     ingimp can be found at
+                                     http://www.ingimp.org.
+
+                                          </p>
+                                                  </abstract>
+                                                    </eventitem>
+
 
 <!-- Winter 2007 -->
 
diff --git a/media/index.xml b/media/index.xml
index fb9e2ca..3ec507f 100755
--- a/media/index.xml
+++ b/media/index.xml
@@ -10,7 +10,7 @@
 	Most of these should be available upon request at the Computer Science Club office to be burnt to CD or DVD should you so choose. 
   </p>
     <ul>
-    <mediaitem title="The Free Software Movement and GNU/Linux Operating System, a talk by Richard Stallman at UCSD">
+    <mediaitem title="The Free Software Movement and GNULinux Operating System, a talk by Richard Stallman at UCSD">
       <abstract>
 <p>
 Richard Stallman will speak about the goals and philosophy of the Free Software Movement, and the status and history the GNU Operating System, which 
@@ -33,8 +33,8 @@ Stallman has received the ACM Grace Hopper Award, a MacArthur Foundation fellows
 Takeda Award for Social/Economic Betterment, as well as several honorary doctorates.
 </p>
 <p>
-The Q&A session (starting shortly after the hour and half mark) possed a number of interesting questions including, "Do you support the Creative 
-Commons license?" and "Can I use ATI and NVIDIA drivers because Mesa isn't nearly as complete?".
+The Question and Answer session (starting shortly after the hour and half mark) possed a number of interesting questions including, "Do you support 
+the Creative Commons license?" and "Can I use ATI and NVIDIA drivers because Mesa isn't nearly as complete?".
 </p>
 <p>
 The talk is only available in Ogg Theora, in keeping with Richard Stallman's wishes.
diff --git a/office/computers.xml b/office/computers.xml
index b7f1927..26d5fe2 100755
--- a/office/computers.xml
+++ b/office/computers.xml
@@ -16,6 +16,11 @@
     <p>This is a Debian stable machine that runs the Computer Science Club, i.e it hosts all the important servers.  It is also the machine where your home directory lives.</p>
     <p>caffeine has 2000 MB of RAM and a AMD Athlon 64 X2 (dual core) 4200+ processor.</p>
    </dd>
+  <dt><strong>taurine</strong></dt>
+   <dd>
+    <p>This is a Debian stable machine.</p>
+    <p>taurine has 8000 MB of RAM and two Dual-Core AMD Opteron(tm) Processor 2218</p>
+   </dd>
   <dt><strong>artifical-flavours (csclub2.cs)</strong></dt>
    <dd>
     <p>This is a Debian unstable machine that runs a talk mirror.</p>
@@ -26,10 +31,10 @@
     <p>This is a Debian unstable machine that runs a talk mirror.</p>
     <p>natural-flavours has 2 Intel(R) Core(TM)2 CPUs 6300  @ 1.86GHz</p>
    </dd>
-    <dt><strong>wang (csclub3.cs)</strong></dt>
+    <dt><strong>citric-acid (csclub3.cs)</strong></dt>
    <dd>
     <p>This is a Debian unstable machine that runs a talk mirror.</p>
-    <p>Wang is a AlphaServer 4100</p>
+    <p>citric-acid is a AlphaServer 4100</p>
    </dd>
   <dt><strong>perpugilliam (peri)</strong></dt>
    <dd>
diff --git a/office/webcam-streaming.xml b/office/webcam-streaming.xml
index b63ddd3..80c2eda 100755
--- a/office/webcam-streaming.xml
+++ b/office/webcam-streaming.xml
@@ -12,11 +12,11 @@
  <img src="http://glucose-fructose.csclub.uwaterloo.ca:8080/" width="640" height="480" />
 </center><br/>
 <center>
- <img src="http://phosphoric-acid.csclub.uwaterloo.ca:8080/" width="640" height="480" />
+<img src="http://phosphoric-acid.csclub.uwaterloo.ca:8080/" width="640" height="480" />
 <center>
 </center><br/>
 <!-- <img src="http://phosphoric-acid.csclub.uwaterloo.ca:9090/" width="320" height="240" /> -->
- <img src="http://caramel-colour.csclub.uwaterloo.ca:8080/" width="320" height="240" />
+<!-- <img src="http://caramel-colour.csclub.uwaterloo.ca:8080/" width="320" height="240" /> -->
 </center>
 
 <p>Tired of streaming? Try the <a href="webcam.html">regular version</a>.</p>
diff --git a/office/webcam.xml b/office/webcam.xml
index 71e8b04..bcca899 100755
--- a/office/webcam.xml
+++ b/office/webcam.xml
@@ -12,11 +12,11 @@
  <img src="http://glucose-fructose.csclub.uwaterloo.ca:8080/singleframe" width="640" height="480" />
 </center><br/>
 <center>
- <img src="http://phosphoric-acid.csclub.uwaterloo.ca:8080/singleframe" width="640" height="480" />
+<img src="http://phosphoric-acid.csclub.uwaterloo.ca:8080/singleframe" width="640" height="480" />
 </center><br/>
 <!-- <img src="http://phosphoric-acid.csclub.uwaterloo.ca:9090/singleframe" width="320" height="240" /> -->
 <center>
- <img src="http://caramel-colour.csclub.uwaterloo.ca:8080/singleframe" width="320" height="240" />
+<!-- <img src="http://caramel-colour.csclub.uwaterloo.ca:8080/singleframe" width="320" height="240" /> -->
 </center>
 
 <p>Try the <a href="webcam-streaming.html">streaming version</a> for