From 95641291bffd2661920f020fda551fa6e9e5c12e Mon Sep 17 00:00:00 2001
From: David Tenty <daltenty@csclub.uwaterloo.ca>
Date: Wed, 31 May 2006 22:07:00 +0000
Subject: [PATCH] Caffeine added to machines list.

---
 office/computers.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/office/computers.xml b/office/computers.xml
index 61a9e77..2522f04 100755
--- a/office/computers.xml
+++ b/office/computers.xml
@@ -11,15 +11,20 @@
  <p>Here is a list of the computers we have available:</p>
 
  <dl>
+  <dt><strong>caffeine</strong></dt>
+   <dd>
+    <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>perpugilliam (peri)</strong></dt>
    <dd>
-    <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>This is a Debian stable machine that was formerly ran the Computer Science Club. It is now on backup duty.</p>
     <p>peri has 512 MB of RAM and dual P3 450 MHz processors.</p>
    </dd>
   <dt><strong>glucose-fructose (sugar)</strong></dt>
    <dd>
     <p>This is a Debian unstable machine, which means you will find bleeding-edge software available here. This may, or may not, work with the other software installed on your CSC account.</p>
-    <p>It as 512 MB of RAM and dual P3 500 MHz processors.</p>
+    <p>It has 512 MB of RAM and dual P3 500 MHz processors.</p>
    </dd>
   <dt><strong>caramel-colour </strong></dt>
    <dd>