Update links to 2.0

[wiki.git] / join.mdwn

diff --git a/join.mdwn b/join.mdwn
index 1232681b46452d489eeadd55fe4de56e26058f5d..90e38528e2830fa04d5dbc958c031b21b3f74d6c 100644 (file)
--- a/join.mdwn
+++ b/join.mdwn
@@ -1,42 +1,37 @@
-# Joining SIPB
-
-We are MIT's volunteer student computing group, improving computing at
-MIT since 1969.  Today, SIPB projects provide innovative services 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 or to hang around and use our
-computers.
+[[!meta title="Joining SIPB"]]

 
 ## Membership
 
 If you are interested in contributing to SIPB's computing services and
 in helping users with unusual computing questions, consider becoming a
 
 ## Membership
 
 If you are interested in contributing to SIPB's computing services and
 in helping users with unusual computing questions, consider becoming a

-member.  Full membership in SIPB is granted after sustained
+member.  Full [[membership|members]] in SIPB is granted after sustained

 contribution to the organization, and confers several benefits:
 contribution to the organization, and confers several benefits:

-<ul>
-<li> A permanent Athena account. </li>
-<li> A key to the SIPB office in W20, and a storage drawer in the SIPB office.</li>
-<li> A vote at SIPB meetings and (for current students) elections.</li>
-</ul>
+
+* A permanent Athena account.
+* A key to the SIPB office in W20, and a storage drawer in the SIPB office.
+* A vote at SIPB meetings and (for current students) elections.
+

 Prospective members interested in becoming full members should attend
 our weekly meetings regularly, participate in SIPB activities like
 Prospective members interested in becoming full members should attend
 our weekly meetings regularly, participate in SIPB activities like

-hackathons, cluedumps, and IAP classes, and either create a new SIPB
-project or help with some existing SIPB projects.  This process
+hackathons, [cluedumps](http://cluedumps.mit.edu/), and [IAP classes](http://sipb.mit.edu/iap),
+and either create a new [[SIPB
+project|projects]] or help with some existing [[SIPB projects|projects]].  This process

 generally takes about a term of active participation.
 
 ## The office
 
 generally takes about a term of active participation.
 
 ## The office
 

+<img class="right" alt="The office fills with people working together in a hackathon." src="../photos/office-hackathon.320.jpg"/>
+

 Prospective members are encouraged to hang out in the SIPB office
 anytime it is open, which it is on a typical weekday afternoon and
 evening.  We strive to make it a fun and comfortable place to work on
 projects, homework, or anything else by providing an array of amenities:
 Prospective members are encouraged to hang out in the SIPB office
 anytime it is open, which it is on a typical weekday afternoon and
 evening.  We strive to make it a fun and comfortable place to work on
 projects, homework, or anything else by providing an array of amenities:

-<ul>
-<li> Nice chairs, big monitors, many computers, table space for laptops</li>
-<li> Music: ours (CDs or LAMP) or yours (via AirTunes or a certain "printer")</li>
-<li> Tons of equipment and supplies from video adapters to an oscilloscope to Band-Aids</li>
-<li> A diverse technical library, including popular textbooks</li>
-<li> Soda and snacks for late-night sessions, cheaper and closer than Verde's</li>
-</ul>
+
+* Nice chairs, big monitors, many computers, table space for laptops
+* Music: ours (CDs or [LAMP](https://lamp.mit.edu/)) or yours (via a certain "printer")
+* Tons of equipment and supplies from video adapters to an oscilloscope to Band-Aids
+* A diverse technical library, including popular textbooks
+* Soda and snacks for late-night sessions, cheaper and closer than Verde's

 
 ## You
 
 
 ## You