Fixed markdown error and added some high-traffic tags

[wiki.git] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index 93cf3ae2c62a99c4229c55d2cd62b9738c97e36f..49148e856dd66d0c72e85208bcc330fc4d60c15a 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,11 +15,11 @@ Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI
 * [xvm.mit.edu](http://xvm.mit.edu/)<br/>
 Your own virtual server.  Reliable, easy, and flexible.
 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
-The power of MIT's Athena environment on your own computer.
+Bringing MIT's Athena environment to Debian and Ubuntu, first for our laptops, and then back to the clusters.
 * [[Your project here!|join]]
 """ col2="""
 * [linerva.mit.edu](http://linerva.mit.edu/)<br/>
-Dialup access to Debathena.
+Remote login access to Athena on a powerful Debian GNU/Linux server running Debathena.
 * [[Documentation|doc]] <br />
 Helpful and informative documents about various computing topics at MIT, written by SIPB.
 * [[Computer Help|computer_help]] <br />
@@ -31,8 +31,9 @@ Have a computing question or need some help? Come drop by our office.
 Every year, SIPB offers a number of awesome computer-related events to the MIT community. Here's a list of some of our events:
 
 <img class="right" src="photos/hackathon-1.jpg" alt="hackathon" />
+
 * [IAP classes](http://sipb.mit.edu/iap)<br/>
-Teach or learn.  Knowledge is power. <br />
+Teach or learn.  Knowledge is power.
 * [SIPB Cluedumps](http://cluedumps.mit.edu/) <br />
 Every year, SIPB hosts a number of computer-related technical talks on a variety of subjects.
 * [[Hackathons|hackathons]] <br />
@@ -46,14 +47,6 @@ Come listen to interesting computer stories about MIT in this annual event.
 
 SIPB is always open to new contributors.  You can join one of the projects above or start your own.  Learn more about [[getting_involved|join]].
 
-----
-
-This wiki is powered by [ikiwiki](http://ikiwiki.info).
-
-Unless otherwise specified, all content on this wiki is released under a dual license of
-
- * the Creative Commons Attribution-Share Alike license, and
- * the GNU Free Documentation License, with no Invariant Sections, no
-   Front-Cover Texts, and no Back-Cover-Texts.
+## Contact
 
-This follows the [SIPB Documentation Licensing Recommendation](http://stuff.mit.edu/afs/sipb/admin/text/policy/documentation_licensing.txt).
+Our [[office]] is W20-557 in the Student Center at 84 Mass Ave. You can call 617/253-7788 (x3-7788) or e-mail [sipb@mit.edu](mailto:sipb@mit.edu) with questions.