Fixed projects link

[wiki.git] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index 87347fe1eeb80158815853c24e1ebaf71b3a5c18..c58c86884b9f70deaedb43939761a6e1a4865a52 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -9,11 +9,17 @@ outside the Athena cluster in the student center W20, and you are
 welcome to come by to [[ask us for help|computer_help]] or to hang around, use our
 computers, and maybe [[get involved|join]]. You can find out what's abuzz in the SIPB community at [Planet SIPB](http://sipb.mit.edu/planet).  We host a number of events, which are enumerated on our [[calendar]].
 
 welcome to come by to [[ask us for help|computer_help]] or to hang around, use our
 computers, and maybe [[get involved|join]]. You can find out what's abuzz in the SIPB community at [Planet SIPB](http://sipb.mit.edu/planet).  We host a number of events, which are enumerated on our [[calendar]].
 

+## The Great Hacksby
+
+The Great Hacksby is happening this Sunday, starting at 1PM and going until arbitrarily late!  Find out [[more about projects we will be working on|/hackathons/great-hacksby/projects]].
+

 ## SIPB Projects and Services
 What does SIPB do for you?
 [[!template id=cols col1="""
 * [scripts.mit.edu](http://scripts.mit.edu/)<br/>
 Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI scripts out of your Athena locker. ([Trac](http://scripts.mit.edu/trac/), [Wiki](http://scripts.mit.edu/wiki/Main_Page))
 ## SIPB Projects and Services
 What does SIPB do for you?
 [[!template id=cols col1="""
 * [scripts.mit.edu](http://scripts.mit.edu/)<br/>
 Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI scripts out of your Athena locker. ([Trac](http://scripts.mit.edu/trac/), [Wiki](http://scripts.mit.edu/wiki/Main_Page))

+* [xvm.mit.edu](http://xvm.mit.edu/)<br/>
+Your own virtual server.  Reliable, easy, and flexible. ([Launchpad](https://launchpad.net/invirt), [Launchpad](https://launchpad.net/xvm), [Trac](https://xvm.scripts.mit.edu/))

 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
 Bringing MIT's Athena environment to Debian and Ubuntu, first for our laptops, and then back to the clusters. ([Trac](http://debathena.mit.edu/trac/))
 * [[Your project here!|join]]
 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
 Bringing MIT's Athena environment to Debian and Ubuntu, first for our laptops, and then back to the clusters. ([Trac](http://debathena.mit.edu/trac/))
 * [[Your project here!|join]]


@@ -32,16 +38,12 @@ Every year, SIPB offers a number of awesome computer-related events to the MIT c
 
 <img class="right" src="photos/hackathon-1.jpg" alt="hackathon" />
 
 
 <img class="right" src="photos/hackathon-1.jpg" alt="hackathon" />
 

-* [[Ubuntu Global Jam|events/2009-ubuntu-global-jam]]<br />
-Saturday October 3rd. Learn more about Ubuntu and how to contribute.
-* [[The SIPB's 40th Reunion|reunion]]<br/>
-Saturday, October 10th SIPB is having its 40th reunion.
-* [IAP classes](http://sipb.mit.edu/iap)<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 />
 Like coding? Come work on cool projects with us at SIPB! We're always looking for new members, so feel free to drop by our Hackathons to help us improve computing at MIT.
 * [[Hackathons|hackathons]] <br />
 Like coding? Come work on cool projects with us at SIPB! We're always looking for new members, so feel free to drop by our Hackathons to help us improve computing at MIT.

+* [SIPB Cluedumps](http://cluedumps.mit.edu/) <br />
+Every year, SIPB hosts a number of computer-related technical talks on a variety of subjects.
+* [IAP classes](http://sipb.mit.edu/iap)<br/>
+Teach or learn.  Knowledge is power.

 * [[SIPB Computer Tours|computer_tours]] <br />
 At the beginning of each year, SIPB offers tours of the MIT computing infrastructure, including Athena server rooms, interesting labs.
 * [[SIPB Computer Stories|computer_stories]]<br />
 * [[SIPB Computer Tours|computer_tours]] <br />
 At the beginning of each year, SIPB offers tours of the MIT computing infrastructure, including Athena server rooms, interesting labs.
 * [[SIPB Computer Stories|computer_stories]]<br />