diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 08:06:26 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-10-19 08:06:26 (GMT) |
| commit | f10644983e88c73437703a863151593cc37a657f (patch) | |
| tree | b3cf3ffcc4d27cf9f81c90efbedbc10a856db857 /Doc/library/threading.rst | |
| parent | 318909b297241f9c46f25815e12d05136da57fa9 (diff) | |
| parent | e130a52d8a60229f53c8bc2ea7a1f51ee592bbd7 (diff) | |
| download | cpython-f10644983e88c73437703a863151593cc37a657f.zip cpython-f10644983e88c73437703a863151593cc37a657f.tar.gz cpython-f10644983e88c73437703a863151593cc37a657f.tar.bz2 | |
Merge with 3.2.
Diffstat (limited to 'Doc/library/threading.rst')
| -rw-r--r-- | Doc/library/threading.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 504a2fb..66b3501 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -886,7 +886,7 @@ As an example, here is a simple way to synchronize a client and server thread:: Pass the barrier. When all the threads party to the barrier have called this function, they are all released simultaneously. If a *timeout* is - provided, is is used in preference to any that was supplied to the class + provided, it is used in preference to any that was supplied to the class constructor. The return value is an integer in the range 0 to *parties* -- 1, different |