Index: buildbot.texinfo
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/buildbot.texinfo,v
retrieving revision 1.150
diff -u -r1.150 buildbot.texinfo
--- buildbot.texinfo	27 May 2008 00:52:29 -0000	1.150
+++ buildbot.texinfo	29 May 2008 15:18:37 -0000
@@ -1763,6 +1763,8 @@
 Linux or Solaris builds) should naturally be associated with an
 OS-X-based buildslave.
 
+A @code{Builder} may be given a set of environments variables to be used
+in its @pxref{ShellCommand}s.
 
 @node Users, Build Properties, Builder, Concepts
 @section Users
@@ -4837,7 +4839,8 @@
 @end example
 
 These variable settings will override any existing ones in the
-buildslave's environment. The exception is PYTHONPATH, which is merged
+buildslave's environment or the environment specified in the
+Builder. The exception is PYTHONPATH, which is merged
 with (actually prepended to) any existing $PYTHONPATH setting. The
 value is treated as a list of directories to prepend, and a single
 string is treated like a one-item list. For example, to prepend both