summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2011-01-18 21:14:27 (GMT)
committerRaymond Hettinger <python@rcn.com>2011-01-18 21:14:27 (GMT)
commite0f1f3234c9f8ba1af0bb49e40108e65c4c5414c (patch)
treef9a4733826cc40e992b093b84b44bf3d423ed3b6 /Doc
parent23ab1016a0f44485926046d917a754d94ea333f5 (diff)
downloadcpython-e0f1f3234c9f8ba1af0bb49e40108e65c4c5414c.zip
cpython-e0f1f3234c9f8ba1af0bb49e40108e65c4c5414c.tar.gz
cpython-e0f1f3234c9f8ba1af0bb49e40108e65c4c5414c.tar.bz2
Missing word.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/whatsnew/3.2.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 1f75c5f..5a7b72c 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -844,8 +844,8 @@ is defined for only two threads.
Implemented as a two-phase cyclic barrier, :class:`~threading.Barrier` objects
are suitable for use in loops. The separate *filling* and *draining* phases
-assure that all threads get released (drained) before any one them can loop back
-and re-enter the barrier. The barrier fully resets after each cycle.
+assure that all threads get released (drained) before any one of them can loop
+back and re-enter the barrier. The barrier fully resets after each cycle.
If any of the predecessor tasks can hang or be delayed, a barrier can be created
with an optional *timeout* parameter. Then if the timeout period elapses before