diff --git a/GSoCIdeas2010.md b/GSoCIdeas2010.md
index 508c22d..acc6231 100644
--- a/GSoCIdeas2010.md
+++ b/GSoCIdeas2010.md
@@ -38,13 +38,13 @@ easily addressed with what we have. Students taking this project would be
 building tools to address those use cases.
 
 A good starting point would be to become familiar with how files are placed on
-a grid. [architecture.txt](http://allmydata.org/trac/tahoe-lafs/browser/docs/architecture.txt),
-[file-encoding.txt](http://allmydata.org/trac/tahoe-lafs/browser/docs/specifications/file-encoding.txt),
-[mutable.txt](http://allmydata.org/trac/tahoe-lafs/browser/docs/specifications/mutable.txt),
-[the immutable file upload code](http://allmydata.org/trac/tahoe-lafs/browser/src/allmydata/immutable/upload.py), and
-[the mutable file upload code](http://allmydata.org/trac/tahoe-lafs/browser/src/allmydata/mutable/publish.py) are good
+a grid. [architecture.txt]source:docs/architecture.txt,
+[file-encoding.txt]source:docs/specifications/file-encoding.txt,
+[mutable.txt]source:docs/specifications/mutable.txt,
+[the immutable file upload code]source:src/allmydata/immutable/upload.py, and
+[the mutable file upload code]source:src/allmydata/mutable/publish.py are good
 places to do that.  Also, you might want to look at the
-[storage server code](http://allmydata.org/trac/tahoe-lafs/browser/src/allmydata/storage/server.py) to understand that
+[storage server code]source:src/allmydata/storage/server.py to understand that
 better. Some good tickets to start looking at are #699, #543, and #232; you'll
 find that those link to other tickets.
 
@@ -57,7 +57,7 @@ There are many ways to help address these issues. Some ideas:
   * Alter Tahoe-LAFS to rebalance mutable files when uploading a new version
     of them. (#232)
 
-Any one of these projects is probably too small to fill a summer, but combined they would be a big usability improvement for Tahoe-LAFS.
+Any one of these projects is probably too small to fill a summer, but combining a few of them would be a big usability improvement for Tahoe-LAFS.
 
 Depending on how you address this, this is tightly integrated with ideas of
 file health and accounting, so prospective students would do well to explore
@@ -91,9 +91,10 @@ Implement a protocol for distributed introduction, thus removing the only remain
 # Mentors
 *Who is willing to spend about five hours a week (estimated) helping a student do it right?*
 <br>
- * [Zooko Wilcox-O'Hearn](http://testgrid.allmydata.org:3567/uri/URI:DIR2-RO:j74uhg25nwdpjpacl6rkat2yhm:kav7ijeft5h7r7rxdp5bgtlt3viv32yabqajkrdykozia5544jqa/wiki.html) (Python/C/C++/JavaScript, cryptography) [<zooko@zooko.com>]mailto:zooko@zooko.com
- * [Jack Lloyd](http://www.randombit.net) (C/C++/Python, cryptography)
+ * [Zooko Wilcox-O'Hearn](http://testgrid.allmydata.org:3567/uri/URI:DIR2-RO:j74uhg25nwdpjpacl6rkat2yhm:kav7ijeft5h7r7rxdp5bgtlt3viv32yabqajkrdykozia5544jqa/wiki.html) (Python/C/C++/JavaScript, security+cryptography) [<zooko@zooko.com>]mailto:zooko@zooko.com
+ * [Jack Lloyd](http://www.randombit.net) (C/C++/Python, security+cryptography)
  * [David-Sarah Hopwood]mailto:david-sarah@jacaranda.org (Python/C/JavaScript, SFTP frontend, security+cryptography)
+ * [Brian Warner]mailto:warner-tahoe@lothar.com (Python/C/JavaScript, security+cryptography)
 
 ----
 This page was modelled on [the NetBSD Summer-of-Code page](http://www.netbsd.org/contrib/soc-projects.html).