From e79dc23a40b4ec7b05bce603a5bf433fd38e7e50 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Tue, 18 Sep 2007 01:20:19 -0400
Subject: [PATCH] Moved office staff page into the wiki.

---
 office/Makefile      |  2 +-
 office/directory.xml |  1 -
 office/index.xml     |  4 ++--
 office/staff.xml     | 24 ------------------------
 4 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 office/staff.xml

diff --git a/office/Makefile b/office/Makefile
index d1096dd..723f6ac 100644
--- a/office/Makefile
+++ b/office/Makefile
@@ -1,3 +1,3 @@
-INPUTS = index.xml staff.xml books.xml webcam.xml webcam-streaming.xml
+INPUTS = index.xml books.xml webcam.xml webcam-streaming.xml
 
 include ../default.mk
diff --git a/office/directory.xml b/office/directory.xml
index ed49cf7..5becdbc 100644
--- a/office/directory.xml
+++ b/office/directory.xml
@@ -4,6 +4,5 @@
 
 <directory title="Office">
   <diritem title="Webcam" href="webcam.html" />
-  <diritem title="Staff" href="staff.html" />
   <diritem title="Books" href="books.html" />
 </directory>
diff --git a/office/index.xml b/office/index.xml
index 2780b5e..4614861 100644
--- a/office/index.xml
+++ b/office/index.xml
@@ -8,7 +8,7 @@
   <p>
    The CSC Office is located at room MC3036/3037, in the Math &amp;
    Computer Building of the University of Waterloo. The office is open
-   whenever <a href="staff.html">office staff</a> are around to keep it
+   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.html">web-enabled
    camera</a>. At the
@@ -30,7 +30,7 @@
    of pop cans.
   </p>
   <p>
-   We can always use good <a href="staff.html">office staff</a>, so if
+   We can always use good office staff, so if
    you're interested in helping out, just come by the office and chat
    to somebody there, and the office manager will probably give you
    something to do.
diff --git a/office/staff.xml b/office/staff.xml
deleted file mode 100644
index f5ceafb..0000000
--- a/office/staff.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE cscpage SYSTEM "../csc.dtd">
-
-<cscpage title="CSC Office Staff">
- <header />
- <section title="Office staff responsibilities">
-  <p>
-   The CSC office staff have the following responsibilities:
-  </p>
-  <ul>
-   <li>Keep the office open as much as possible</li>
-   <li>Keep the office clean at all times, through weekly cleaning and
-   consistent removal of garbage</li>
-   <li>Take care of adding new members, updating memberships and any
-   other membership-related tasks through the use of CEO (CSC
-   Electronic Office)</li>
-   <li>Burn our free operating system CDs</li>
-   <li>Answer questions</li>
-   <li>Make sure the fridge is always full of pop</li>
-  </ul>
- </section>
- <footer />
-</cscpage>