From f34858043289d220132bd92a36ffb08a16e870e2 Mon Sep 17 00:00:00 2001 From: David Bartley Date: Thu, 10 Apr 2008 02:34:48 -0400 Subject: [PATCH] Merge MEF section into donations section --- about/Makefile | 2 +- about/directory.xml | 1 - about/donations.xml | 20 ++++++++++++++++++++ about/mef.xml | 28 ---------------------------- 4 files changed, 21 insertions(+), 30 deletions(-) delete mode 100644 about/mef.xml diff --git a/about/Makefile b/about/Makefile index 9947f1f..bc64dfa 100644 --- a/about/Makefile +++ b/about/Makefile @@ -1,5 +1,5 @@ FILES = index.html exec.html members.html constitution.html donations.html \ - mef.html positions.html constitution-change-20020920.html \ + positions.html constitution-change-20020920.html \ constitution-change-20040205.html RELDIR = about/ include ../common.mk diff --git a/about/directory.xml b/about/directory.xml index bbf7f22..4ef3e89 100644 --- a/about/directory.xml +++ b/about/directory.xml @@ -7,5 +7,4 @@ - diff --git a/about/donations.xml b/about/donations.xml index cb5aacc..8f2212f 100644 --- a/about/donations.xml +++ b/about/donations.xml @@ -52,6 +52,26 @@ Canada Our office phone number is (519) 888-4567 x33870.

+
+

+ The Mathematics Endowment Fund + has provided funding for a variety of projects, events, and hardware: +

+
    +
  • a new server to run our mirror
    • +
  • an LCD monitor for our office
    • +
  • taurine, a server used for virtualization
    • +
  • a gigabit switch
    • +
  • academic talks
    • +
  • Linux CDs for first-year students
    • +
  • caffeine, our primary server
    • +
  • various books for a our library
    • +
+

+ The Computer Science club graciously thanks the Mathematics Endowment Fund + for their financial support. +

+