Merge branch 'master-cfg-fixes' of git://github.com/clepple/buildbot

* 'master-cfg-fixes' of git://github.com/clepple/buildbot:
  sample.cfg: fix Builder parameter documentation
  sample.cfg: change URL to buildbot.net for consistency
  docs and comments: normalize spelling of dictionary
  docs: add missing word and punctuation

master/buildbot/master.py

@@ -790,7 +790,7 @@ def loadConfig(self, f, check_synchronously_only=False):
                 log.err(errmsg)
                 raise ValueError(errmsg)
 
-            # Fix the dictionnary with default values, in case this wasn't
+            # Fix the dictionary with default values, in case this wasn't
             # specified with a BuilderConfig object (which sets the same defaults)
             b.setdefault('builddir', safeTranslate(b['name']))
             b.setdefault('slavebuilddir', b['builddir'])

master/buildbot/scripts/sample.cfg

@@ -94,10 +94,9 @@ c['schedulers'].append(Scheduler(name="all", branch=None,
 # the 'builders' list defines the Builders. Each one is configured with a
 # dictionary, using the following keys:
 #  name (required): the name used to describe this builder
-#  slavename (required): which slave to use (must appear in c['slaves'])
-#  builddir (required): which subdirectory to run the builder in
+#  slavename or slavenames (required): which slave(s) to use (must appear in c['slaves'])
 #  factory (required): a BuildFactory to define how the build is run
-#  periodicBuildTime (optional): if set, force a build every N seconds
+#  builddir (optional): which subdirectory to run the builder in
 
 # buildbot/process/factory.py provides several BuildFactory classes you can
 # start with, which implement build processes for common targets (GNU
@@ -195,7 +194,7 @@ c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
 # from buildbot HTML pages to your project's home page.
 
 c['projectName'] = "Buildbot"
-c['projectURL'] = "http://buildbot.sourceforge.net/"
+c['projectURL'] = "http://buildbot.net/"
 
 # the 'buildbotURL' string should point to the location where the buildbot's
 # internal web server (usually the html.WebStatus page) is visible. This

master/buildbot/status/web/console.py

@@ -278,9 +278,9 @@ def getChangeForBuild(self, build, revision):
 
     def getAllBuildsForRevision(self, status, request, lastRevision, numBuilds,
                                 categories, builders, debugInfo):
-        """Returns a dictionnary of builds we need to inspect to be able to
+        """Returns a dictionary of builds we need to inspect to be able to
         display the console page. The key is the builder name, and the value is
-        an array of build we care about. We also returns a dictionnary of
+        an array of build we care about. We also returns a dictionary of
         builders we care about. The key is it's category.
  
         lastRevision is the last revision we want to display in the page.
@@ -292,7 +292,7 @@ def getAllBuildsForRevision(self, status, request, lastRevision, numBuilds,
 
         allBuilds = dict()
 
-        # List of all builders in the dictionnary.
+        # List of all builders in the dictionary.
         builderList = dict()
 
         debugInfo["builds_scanned"] = 0
@@ -318,7 +318,7 @@ def getAllBuildsForRevision(self, status, request, lastRevision, numBuilds,
             if not builderList.get(category):
                 builderList[category] = []
 
-            # Append this builder to the dictionnary of builders.
+            # Append this builder to the dictionary of builders.
             builderList[category].append(builderName)
             # Set the list of builds for this builder.
             allBuilds[builderName] = self.getBuildsForRevision(request,
@@ -549,7 +549,7 @@ def displayPage(self, request, status, builderList, allBuilds, revisions,
         for revision in revisions:
             r = {}
 
-            # Fill the dictionnary with these new information
+            # Fill the dictionary with this new information
             r['id'] = revision.revision
             r['link'] = revision.revlink 
             r['who'] = revision.who

master/docs/cfg-builders.texinfo

@@ -101,9 +101,9 @@ builder. The environment variables will override anything in the buildslave's
 environment. Variables passed directly to a @code{ShellCommand} will override
 variables of the same name passed to the Builder.
 
-For example, if you a pool of identical slaves it is often easier to manage
-variables like PATH from Buildbot rather than manually editing it inside of
-the slaves' environment.
+For example, if you have a pool of identical slaves, it is often easier to
+manage variables like PATH from Buildbot, rather than manually editing it inside
+of the slaves' environment.
 
 @example
 f = factory.BuildFactory
@@ -134,7 +134,7 @@ only if the Builder's @code{mergeRequests} key is True, so merging
 only takes place if both allow it. @pxref{Merging BuildRequests}.
 
 @item properties
-A builder may be given a dictionnary of @pxref{Build Properties}
+A builder may be given a dictionary of @pxref{Build Properties}
 specific for this builder in this parameter. Those values can be used
 later on like other properties. @pxref{WithProperties}.