summaryrefslogtreecommitdiff
authorJosh Triplett <josh@freedesktop.org>2007-08-04 03:28:41 (GMT)
committer Josh Triplett <josh@freedesktop.org>2007-08-04 03:29:02 (GMT)
commit79a32e38b89509751daa3cf9c621f4fec40c6127 (patch) (side-by-side diff)
treefc6bbd83932c934ff08a3662a6a12b5a76a3fae5
parent211d27cc4dd390bd3e67fd99da374de6b3d81265 (diff)
downloadwiki-79a32e38b89509751daa3cf9c621f4fec40c6127.zip
wiki-79a32e38b89509751daa3cf9c621f4fec40c6127.tar.gz
Contacts: Improvements and formatting fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Contacts.mdwn74
1 files changed, 22 insertions, 52 deletions
diff --git a/Contacts.mdwn b/Contacts.mdwn
index c4d4854..9936a39 100644
--- a/Contacts.mdwn
+++ b/Contacts.mdwn
@@ -1,70 +1,40 @@
-# <a name="Portland State Aerospace Society"></a> Portland State Aerospace Society (PSAS) Contact Information
+[[meta title="Contact Information"]]
-----
+## Email
-**Email:**
+<info@psas.pdx.edu>
-> <info@psas.pdx.edu>
-
-**Address:**
+## Address
> Portland State Aerospace Society
->
-> <br />
->
> PSU ECE Department
->
-> <br />
->
> PO Box 751
->
-> <br />
->
> Portland, Oregon 97202-0751
->
-> <br />
-**Mailing Lists:**
+## Mailing Lists
+
+Please see the [list of PSAS Mailing Lists](http://lists.psas.pdx.edu);
+however, please see the [[new members|NewMembers]] page before you join a PSAS
+list.
-> Please see the
->
-> [list of PSAS Mailing Lists](http://lists.psas.pdx.edu)
->
-> ; however, please see the
->
-> [[new members|NewMembers]]
->
-> page before you join a PSAS list.
+## IRC
-**IRC:**
+Join us in the IRC channel `#psas` on irc.psas.pdx.edu (AKA irc.oftc.net).
-> Join us in the IRC channel #psas on irc.psas.pdx.edu (AKA irc.oftc.net).
+## Members
-**Members:**
+Our [[roster|Minutiae/PSASPhoneList]] is only available to PSAS members.
-> Our
->
-> [[roster|Minutiae/PSASPhoneList]]
->
-> is only available to PSAS members.
+**(Link currently broken.)**
-**Project Manager:**
+## Project Manager
-> Andrew Greenberg - andrew(at)psas.pdx.edu
+Andrew Greenberg - andrew(at)psas.pdx.edu
-**Portland State University Advisors:**
+## Portland State University Faculty Advisors
-<table border=1 cellpadding=0 cellspacing=0>
- <tr>
- <td> Computer Science </td>
- <td> Bart Massey, PhD - bart(at)cs.pdx.edu </td>
- </tr>
- <tr>
- <td> Electrical engineering </td>
- <td> James McNames, PhD - mcnames(at)ece.pdx.edu </td>
- </tr>
- <tr>
- <td> Mechnical Engineering </td>
- <td> Mark Weislogel, PhD - mmw(at)cecs.pdx.edu </td>
- </tr>
-</table>
+[[table data="""
+Computer Science|Bart Massey, PhD|<bart@cs.pdx.edu>
+Electrical engineering|James McNames, PhD|<mcnames@ece.pdx.edu>
+Mechnical Engineering|Mark Weislogel, PhD|<mmw@cecs.pdx.edu>
+"""]]