Merge MEF section into donations section
This commit is contained in:
parent
702d4331c2
commit
f348580432
|
@ -1,5 +1,5 @@
|
||||||
FILES = index.html exec.html members.html constitution.html donations.html \
|
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
|
constitution-change-20040205.html
|
||||||
RELDIR = about/
|
RELDIR = about/
|
||||||
include ../common.mk
|
include ../common.mk
|
||||||
|
|
|
@ -7,5 +7,4 @@
|
||||||
<diritem title="Positions" href="positions" />
|
<diritem title="Positions" href="positions" />
|
||||||
<diritem title="Membership List" href="members" />
|
<diritem title="Membership List" href="members" />
|
||||||
<diritem title="Donations" href="donations" />
|
<diritem title="Donations" href="donations" />
|
||||||
<diritem title="MEF" href="mef" />
|
|
||||||
</directory>
|
</directory>
|
||||||
|
|
|
@ -52,6 +52,26 @@ Canada
|
||||||
Our office phone number is (519) 888-4567 x33870.
|
Our office phone number is (519) 888-4567 x33870.
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
|
<section title="Mathematics Endowment Fund">
|
||||||
|
<p>
|
||||||
|
The <a href="http://www.mef.uwaterloo.ca/">Mathematics Endowment Fund</a>
|
||||||
|
has provided funding for a variety of projects, events, and hardware:
|
||||||
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>a new server to run our mirror</li>
|
||||||
|
<li>an LCD monitor for our office</li>
|
||||||
|
<li>taurine, a server used for virtualization</li>
|
||||||
|
<li>a gigabit switch</li>
|
||||||
|
<li>academic talks</li>
|
||||||
|
<li>Linux CDs for first-year students</li>
|
||||||
|
<li>caffeine, our primary server</li>
|
||||||
|
<li>various books for a our library</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
The Computer Science club graciously thanks the Mathematics Endowment Fund
|
||||||
|
for their financial support.
|
||||||
|
</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
<footer />
|
<footer />
|
||||||
</cscpage>
|
</cscpage>
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
<?xml version='1.0'?>
|
|
||||||
|
|
||||||
<!DOCTYPE cscpage SYSTEM "../csc.dtd">
|
|
||||||
|
|
||||||
<cscpage title="Mathematics Endowment Fund Contributions">
|
|
||||||
<header />
|
|
||||||
<section title="Mathematics Endowment Fund Contributions">
|
|
||||||
<p>
|
|
||||||
The <a href="http://www.mef.uwaterloo.ca/">Mathematics Endowment Fund</a>
|
|
||||||
has provided funding for a variety of projects, events, and hardware:
|
|
||||||
</p>
|
|
||||||
<ul>
|
|
||||||
<li>a new server to run our mirror</li>
|
|
||||||
<li>an LCD monitor for our office</li>
|
|
||||||
<li>taurine, a server used for virtualization</li>
|
|
||||||
<li>a gigabit switch</li>
|
|
||||||
<li>academic talks</li>
|
|
||||||
<li>Linux CDs for first-year students</li>
|
|
||||||
<li>caffeine, our primary server</li>
|
|
||||||
<li>various books for a our library</li>
|
|
||||||
</ul>
|
|
||||||
<p>
|
|
||||||
The Computer Science club graciously thanks the Mathematics Endowment Fund
|
|
||||||
for their financial support.
|
|
||||||
</p>
|
|
||||||
</section>
|
|
||||||
<footer />
|
|
||||||
</cscpage>
|
|
Loading…
Reference in New Issue