Skip to content

Commit

Permalink
Merge pull request #249 from bdbaddog/084_misc_text_fixes
Browse files Browse the repository at this point in the history
084 misc text fixes
  • Loading branch information
ayust committed Sep 22, 2011
2 parents 5a448ba + ee7d36d commit 8e02829
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions master/docs/manual/cfg-interlocks.rst
Expand Up @@ -25,7 +25,7 @@ the lock counts the number of active readers. Secondly, the terms *read
mode* and *write mode* are confusing in Buildbot context. They have been
replaced by *counting mode* (since the lock counts them) and *exclusive
mode*. As a result of these changes, locks in Buildbot allow a number of
builds (upto some fixed number) in counting mode, or they allow one build in
builds (up to some fixed number) in counting mode, or they allow one build in
exclusive mode.

.. note:: Access modes are specified when a lock is used. That is, it is
Expand Down Expand Up @@ -87,7 +87,7 @@ locks at other times.
To use locks, you add them with a ``locks`` argument to a build or a step.
Each use of a lock is either in counting mode (that is, possibly shared with
other builds) or in exclusive mode, and this is indicated with the syntax
``lock.access(mode)``, where :data:`mode` is one of ``"counting"`` or ``"shared"``.
``lock.access(mode)``, where :data:`mode` is one of ``"counting"`` or ``"exclusive"``.

A build or build step proceeds only when it has acquired all locks. If a build
or step needs a lot of locks, it may be starved [#]_ by other builds that need
Expand Down

0 comments on commit 8e02829

Please sign in to comment.