summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-01-05 18:49:27 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-01-05 18:49:27 (GMT)
commitb1d44dbf1f21be116768ca5c4adf0f0b9bd7616c (patch)
tree8687a3addb255225af94e0d68055e75e5145e012 /Doc
parent5021428c2b9ebed0a5b7a3d7605ed45cca087dbf (diff)
parentf57674713a82b42c56b87342ad96f6554f178c47 (diff)
downloadcpython-b1d44dbf1f21be116768ca5c4adf0f0b9bd7616c.zip
cpython-b1d44dbf1f21be116768ca5c4adf0f0b9bd7616c.tar.gz
cpython-b1d44dbf1f21be116768ca5c4adf0f0b9bd7616c.tar.bz2
Issue #12042: merge with 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/whatsnew/2.6.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index be2c6ff..9462ef5 100644
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -615,8 +615,8 @@ multiple of 4.
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