From f46d6499218bc09dd67eccc817d19e5aae2e5255 Mon Sep 17 00:00:00 2001
From: zooko <>
Date: Wed, 21 Mar 2012 11:50:58 +0000
Subject: [PATCH] update instructions a bit, give Brian's email address

[Imported from Trac: page HowtoContributeABuildbot, version 24]
---
 HowtoContributeABuildbot.md | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/HowtoContributeABuildbot.md b/HowtoContributeABuildbot.md
index 624ce3b..5e18b3c 100644
--- a/HowtoContributeABuildbot.md
+++ b/HowtoContributeABuildbot.md
@@ -1,35 +1,34 @@
 ## Prerequisites
-You'll need [darcs](http://wiki.darcs.net/Binaries) and [buildbot](http://trac.buildbot.net/wiki/DownloadInstall) before you can proceed.
+
+You'll need [git](http://git-scm.com/) and [buildbot-slave](http://trac.buildbot.net/wiki/DownloadInstall) before you can proceed.
 
 ## Configuration
 Create a user account with low privileges to run buildbot. 
 
 #### Optional Configurations
-You can use other mechanisms to lock buildbot down like jail, or chroot.  David Abrahams uses Solaris Zones to contain his buildslaves.  Brian Warner and the other buildbot maintainers have been hacking on some tricks to set up your buildslaves inside a full virtual machine so that you can have a pristine machine for every build.
+You can use other mechanisms to limit the privileges available to the buildbot, such as jail, chroot, or Solaris Zones. You can optionally use a different user account or other privilege-limiting mechanisms to keep the tahoe-lafs, pycryptopp, and zfec buildslaves (see below) separated.
 
 ## Name The Buildslave
-Choose a name for your buildslave which will fit into the list of buildslave names: <http://tahoe-lafs.org/buildbot/buildslaves> .  
+Choose a name for your buildslave which will fit into the list of buildslave names: [//buildbot-tahoe-lafs/buildslaves].
 A hostname would be a good choice.
 
 ## Get a Password
-Email Zooko (zooko_at_zooko_dot_com) and ask for a password.
+Email Brian (warner-tahoe_at_lothar_dot_com) and ask for a password.
 
 ## Create a Buildslave
 Execute the following commands:
-* Tahoe-LAFS:  `buildbot create-slave $BASEDIR_TAHOE tahoe-lafs.org:9987 $SLAVENAME $PASSWORD`
-* Zfec:  `buildbot create-slave $BASEDIR_ZFEC tahoe-lafs.org:12987 $SLAVENAME $PASSWORD`
-* Pycryptopp:  `buildbot create-slave $BASEDIR_PYCRYPTOPP tahoe-lafs.org:10998 $SLAVENAME $PASSWORD`
+* tahoe-lafs:  `buildbot create-slave $BASEDIR_TAHOE tahoe-lafs.org:9987 $SLAVENAME $PASSWORD`
+* zfec:  `buildbot create-slave $BASEDIR_ZFEC tahoe-lafs.org:12987 $SLAVENAME $PASSWORD`
+* pycryptopp:  `buildbot create-slave $BASEDIR_PYCRYPTOPP tahoe-lafs.org:10998 $SLAVENAME $PASSWORD`
 
 Those three use the same $SLAVENAME, $PASSWORD and hostname, but a different $BASEDIR and a different port number.
 
 For the $BASEDIR your can use whatever directory you want.
 
-Use a different user account for tahoe-lafs, pycryptopp, and zfec buildslaves.
-
 Then `buildbot start $BASEDIR`.
 
 ## Monitor Output
-Okay, once you've gotten all this working then we'll see your machine on the [buildbot pages](http://tahoe-lafs.org/buildbot/waterfall?show_events=true) and we'll see how well Tahoe-LAFS passes unit tests on your platform.
+Okay, once you've gotten all this working then we'll see your machine on the [//buildbot-tahoe-lafs/waterfall?show_events=true buildbot pages] and we'll see how well Tahoe-LAFS passes unit tests on your platform.
 
 ### More Details
 The official buildslave creation documentation is [here](http://djmitche.github.com/buildbot/docs/latest/Creating-a-buildslave.html#Creating-a-buildslave).