test pushing to new master repo

[wiki.git] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index 0ceb5dd977590bf451fd6a2492d861b5c33a8320..d98b71be3711ecd84e83c992460173bf87aa650c 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,6 +1,11 @@
 # MIT Student Information Processing Board
 
 # MIT Student Information Processing Board
 

-The Student Information Processing Board (SIPB, pronounced sip-bee) is MIT's volunteer student group dedicated to computing. SIPB has, in one form or another, been working on improving computing at MIT since 1969. Today, SIPB contributes to MIT computing by sponsoring interesting projects that provide additional services or expertise to the MIT community. We have an office just outside the Athena cluster in the MIT Student Center, and you are welcome to come to the office to ask us for help or to hang around and use our computers.
+We are MIT's volunteer student computing group, improving computing at
+MIT since 1969.  Today, [[SIPB projects|projects]] provide innovative [[services|projects]] and
+special expertise to the MIT community.  We have an office just
+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]].

 
 This site is a wiki.  Edit, be bold, start with the [[sandbox]] to play around.
 
 
 This site is a wiki.  Edit, be bold, start with the [[sandbox]] to play around.
 


@@ -11,16 +16,36 @@ What does SIPB do for you?
 Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI scripts out of your Athena locker.
 * [xvm.mit.edu](http://xvm.mit.edu/)<br/>
 Your own virtual server.  Reliable, easy, and flexible.
 Get your own blog or wiki, or run any web app!  The SIPB scripts server runs CGI scripts out of your Athena locker.
 * [xvm.mit.edu](http://xvm.mit.edu/)<br/>
 Your own virtual server.  Reliable, easy, and flexible.

-* [IAP classes](http://sipb.mit.edu/iap)<br/>
-Teach or learn.  Knowledge is power.
-""" col2="""

 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
 The power of MIT's Athena environment on your own computer.
 * [debathena.mit.edu](http://debathena.mit.edu/)<br/>
 The power of MIT's Athena environment on your own computer.

-* [linerva.mit.edu](http://linux.mit.edu/)<br/>
+* [[Your project here!|join]]
+""" col2="""
+* [linerva.mit.edu](http://linerva.mit.edu/)<br/>

 Dialup access to Debathena.
 Dialup access to Debathena.

-* many, many more
+* [[Documentation|documentation]] <br />
+Helpful and informative documents about various computing topics at MIT, written by SIPB.
+* [[Computer Help|computer_help]] <br />
+Have a computing question or need some help? Come drop by our office.
+* [[...and many more|projects]]

 """]]
 
 """]]
 

+## SIPB Events
+Every year, SIPB offers a number of awesome computer-related events to the MIT community. Here's a list of some of our events:
+
+* [IAP classes](http://sipb.mit.edu/iap)<br/>
+Teach or learn.  Knowledge is power. <br />
+* [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.
+* [[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 />
+Come listen to interesting computer stories about MIT in this annual event.
+
+
+![hackathon](photos/hackathon-1.jpg)
+

 ## Getting Involved
 
 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]].
 ## Getting Involved
 
 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]].


@@ -28,3 +53,11 @@ SIPB is always open to new contributors.  You can join one of the projects above
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info).
 ----
 
 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.
+
+This follows the [SIPB Documentation Licensing Recommendation](http://stuff.mit.edu/afs/sipb/admin/text/policy/documentation_licensing.txt).