From 99d831a0f62c1d7a1adb634695f15f1c0ac14886 Mon Sep 17 00:00:00 2001
From: warner <>
Date: Tue, 27 Jan 2015 21:35:48 +0000
Subject: [PATCH] replace some manual HTML with regular trac markup

[Imported from Trac: page AboutUs, version 35]
---
 AboutUs.md | 60 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/AboutUs.md b/AboutUs.md
index 6338fc1..1b3cac5 100644
--- a/AboutUs.md
+++ b/AboutUs.md
@@ -1,45 +1,49 @@
+Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers. We are grateful for their energy, expertise, and support. Some of main contributors to this project are listed below. If you feel that somebody is missing from the list, please let us know and we'll update the list.
 
-<p>Tahoe-LAFS is an open-source project supported by donations and maintained by a group of hardy volunteers. We are grateful for their energy, expertise, and support. Some of main contributors to this project are listed below. If you feel that somebody is missing from the list, please let us know and we'll update the list.</p>
+## Active Volunteers
 
 
-
-
-
-
-<h2>Active Volunteers</h2>
 <table>
   <tr><td><img src="/~trac/zooko.png" height=75></td><td><a href="<https://zooko.com>">Zooko</a></td><td><img src="/~trac/francois_greyscale.jpg" height=75></td><td><a href="<http://francois.ctrlaltdel.ch>">François Deppierraz</a></td><td><img src="/~trac/kevan_c_bw_sm-x75.png" height=75></td><td><a href="<http://isnotajoke.com/>">Kevan Carstensen</a></td> 
 </tr>
   <tr><td><img src="/~trac/warner.png" height=75></td><td><a href="<http://www.lothar.com>">Brian Warner</a></td><td><img src="/~trac/davidsarah_bw-x75.png" height=75></td><td><a href="<https://plus.google.com/u/0/108983078988421480963/posts>">Daira Hopwood</a></td><td><img src="/~trac/freestorm.jpg"></td><td>Frédéric Marti</td><td><img src="/~trac/QuestionMark_small.jpg"></td><td>Who are we missing?</td></tr>
   <tr><td><img src="/~trac/psecor.jpg" height=75></td><td><a href="<http://secorp.net>">Peter Secor</a></td><td><img src="/~trac/marc_tooley_sm.jpg" height=75></td><td>Marc Tooley</td></tr>
-  <tr>
+* <tr>
 </table>
 
-<h2>People who broke Tahoe-LAFS</h2>
-<table>
-  <tr><td><a href="/hacktahoelafs/">The <i>Hack Tahoe-LAFS</i> Hall Of Fame</a></td></tr>
-</table>
 
-<h2>GSoC 2013 Students and Their Mentors</h2>
-<table>
-  <colgroup><col style="width:15em"><col></colgroup>
-  <tr><td>Mark Berger</td> <td>Zooko Wilcox-O'Hearn, Daira Hopwood, and Brian Warner</td></tr>
-</table>
+## People who broke Tahoe-LAFS
 
-<h2>GSoC 2010 Students and Their Mentors</h2>
-<table>
-  <colgroup><col style="width:15em"><col></colgroup>
-  <tr><td>Kevan Carstensen</td> <td>Brian Warner</td></tr>
-  <tr><td>Josip Lisec</td> <td>Daira Hopwood</td></tr>
-  <tr><td>Yu Xue</td> <td>Jack Lloyd</td></tr>
-  <tr><td>Faruque Sarker</td> <td>Zooko</td></tr>
-  <tr><td><a href="<https://tahoe-lafs.org/trac/tahoe-lafs/wiki/GSoCIdeas2010>">Tahoe-LAFS GSoC Page at Google</a></td></tr>
-</table>
+[/hacktahoelafs/ The *Hack Tahoe-LAFS* Hall Of Fame]
+
+## GSoC 2013 Students and Their Mentors
+
+Mark Berger*  
+
+* Zooko Wilcox-O'Hearn, Daira Hopwood, and Brian Warner
+
+## GSoC 2010 Students and Their Mentors
+
+Kevan Carstensen*  
+
+* Brian Warner
+Josip Lisec*  
+
+* Daira Hopwood
+Yu Xue*  
+
+* Jack Lloyd
+Faruque Sarker*  
+
+> Zooko
+
+[/wiki/GSoCIdeas2010 Tahoe-LAFS GSoC Page at Google]
  
-<h2>Contributors of Source Code and Docs</h2>
-<p>See <a href="/trac/tahoe-lafs/browser/trunk/CREDITS">the CREDITS file</a> for a list of everyone who has contributed code and docs which we included in the Tahoe-LAFS source tree.</p>
+## Contributors of Source Code and Docs
+See [/browser/trunk/CREDITS the CREDITS file] for a list of everyone who has contributed code and docs which we included in the Tahoe-LAFS source tree.
+
+## Emeritus Volunteers
 
-<h2>Emeritus Volunteers</h2>
 <table>
   <tr><td><img src="/~trac/redhat_small.png"></td><td>David Triendl</td>
 </tr><tr><td><img src="/~trac/marlowe-x75-bw.jpg" height=75></td><td>Patrick "Marlowe" [McDonald](McDonald)</td></tr>