[Python-checkins] cpython (merge 3.2 -> default): Issue #12042: merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/e379617b4c4c
changeset:   74284:e379617b4c4c
parent:      74281:f375a1be031c
parent:      74283:0d4bb1356f39
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Thu Jan 05 19:49:27 2012 +0100
summary:
  Issue #12042: merge with 3.2

files:
  Doc/whatsnew/2.6.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -615,8 +615,8 @@
         result = queue.get()
         print 'Factorial', N, '=', result
 
-A :class:`Queue` is used to communicate the input parameter *N* and
-the result.  The :class:`Queue` object is stored in a global variable.
+A :class:`Queue` is used to communicate the result of the factorial.
+The :class:`Queue` object is stored in a global variable.
 The child process will use the value of the variable when the child
 was created; because it's a :class:`Queue`, parent and child can use
 the object to communicate.  (If the parent were to change the value of

-- 
Repository URL: http://hg.python.org/cpython