Skip to content

Commit

Permalink
Merge branch 'docs_spelling_cleanup' of git://github.com/SparkieGeek/…
Browse files Browse the repository at this point in the history
…buildbot

* 'docs_spelling_cleanup' of git://github.com/SparkieGeek/buildbot:
  * Fix spelling of Master  * Delete unnecessary whitespace in list literal
  Only one space in import line
  • Loading branch information
djmitche committed Jun 22, 2011
2 parents e0d985e + dd44c1e commit 714f5b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions master/docs/cfg-buildslaves.texinfo
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ c['slaves'] = [BuildSlave("bot-linux", "linuxpassword", max_builds=2)]
@end menu

@node Master-slave TCP Keepalive
@subsection Mater-slave TCP keepalive
@subsection Master-slave TCP keepalive

By default, the buildmaster sends a simple, non-blocking message to each slave
every hour. These keepalives ensure that traffic is flowing over the
Expand All @@ -66,7 +66,7 @@ The interval can be modified by specifying the interval in seconds using the
keepalive_interval parameter of BuildSlave:

@example
c['slaves'] = [ BuildSlave('bot-linux', 'linuxpasswd',
c['slaves'] = [BuildSlave('bot-linux', 'linuxpasswd',
keepalive_interval=3600),
]
@end example
Expand Down
2 changes: 1 addition & 1 deletion master/docs/cfg-schedulers.texinfo
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ on other branches. Setting @code{branch} equal to the special value of
Example:

@example
from buildbot.schedulers.basic import SingleBranchScheduler
from buildbot.schedulers.basic import SingleBranchScheduler
quick = SingleBranchScheduler(name="quick",
branch=None,
treeStableTimer=60,
Expand Down

0 comments on commit 714f5b2

Please sign in to comment.