From 6edde34c6ad21065896ebf3b6a3c31e3b48718b8 Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Thu, 23 Aug 2007 02:48:41 -0400
Subject: [PATCH] Merged official documents into documents.

---
 docs/Makefile      |  2 +-
 docs/directory.xml |  1 -
 docs/index.xml     | 11 ++++++++---
 docs/official.xml  | 19 -------------------
 4 files changed, 9 insertions(+), 24 deletions(-)
 delete mode 100644 docs/official.xml

diff --git a/docs/Makefile b/docs/Makefile
index d86b300..0b385a3 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,4 +1,4 @@
-INPUTS = index.xml constitution.xml official.xml machine_usage.xml \
+INPUTS = index.xml constitution.xml machine_usage.xml \
 	machine_usage_summary.xml website.xml constitution-change-20020920.xml \
 	constitution-change-20040205.xml
 
diff --git a/docs/directory.xml b/docs/directory.xml
index 88c2bdc..6fbd782 100644
--- a/docs/directory.xml
+++ b/docs/directory.xml
@@ -3,5 +3,4 @@
 <!DOCTYPE directory SYSTEM "../csc.dtd">
 
 <directory title="Documents">
-  <diritem title="Official documents" href="official.html" />
 </directory>
diff --git a/docs/index.xml b/docs/index.xml
index aea5ea1..d2b34e5 100644
--- a/docs/index.xml
+++ b/docs/index.xml
@@ -6,11 +6,16 @@
  <header />
  <section title="CSC Documents">
   <p>
-    Here you'll find all kinds of documents pertaining to the CSC or
-    possibly useful to CSC members. So far we have:
+    Here you'll find official CSC documents:
   </p>
     <ul>
-      <li><a href="official.html">Official documents</a></li>
+      <li><a href="constitution.html">Our constitution</a></li>
+      <li><a href="machine_usage.html">The machine usage policy</a>
+      (see also the <a href="machine_usage_summary.html">summary</a>)</li>
+    </ul>
+    <p>You may also be interested in:</p>
+    <ul>
+      <li><a href="../about/members.html">Our membership list</a></li>
     </ul>
  </section>
 
diff --git a/docs/official.xml b/docs/official.xml
deleted file mode 100644
index be89f46..0000000
--- a/docs/official.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-
-<!DOCTYPE cscpage SYSTEM "../csc.dtd">
-
-<cscpage title="Official documents">
-  <header />
-  <section title="Official CSC documents">
-    <ul>
-      <li><a href="constitution.html">Our constitution</a></li>
-      <li><a href="machine_usage.html">The machine usage policy</a>
-      (see also the <a href="machine_usage_summary.html">summary</a>)</li>
-    </ul>
-    <p>You may also be interested in:</p>
-    <ul>
-      <li><a href="../about/members.html">Our membership list</a></li>
-    </ul>
-  </section>
-  <footer/>
-</cscpage>