Merged revisions 66928,66936,66939-66940 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66928 | georg.brandl | 2008-10-16 20:20:56 +0000 (Thu, 16 Oct 2008) | 2 lines
Add more TOC to the whatsnew index page.
........
r66936 | georg.brandl | 2008-10-16 21:20:15 +0000 (Thu, 16 Oct 2008) | 2 lines
#4131: FF3 doesn't write cookies.txt files.
........
r66939 | georg.brandl | 2008-10-16 21:36:39 +0000 (Thu, 16 Oct 2008) | 2 lines
part of #4012: kill off old name "processing".
........
r66940 | georg.brandl | 2008-10-16 21:38:48 +0000 (Thu, 16 Oct 2008) | 2 lines
#4083: add "as" to except handler grammar as per PEP 3110.
........
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index c5901fa..0874a80 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -378,8 +378,8 @@
Example usage of some of the methods of :class:`Process`::
- >>> import processing, time, signal
- >>> p = processing.Process(target=time.sleep, args=(1000,))
+ >>> import multiprocessing, time, signal
+ >>> p = multiprocessing.Process(target=time.sleep, args=(1000,))
>>> print p, p.is_alive()
<Process(Process-1, initial)> False
>>> p.start()
@@ -1781,12 +1781,12 @@
Below is an example session with logging turned on::
- >>> import processing, logging
- >>> logger = processing.getLogger()
+ >>> import multiprocessing, logging
+ >>> logger = multiprocessing.getLogger()
>>> logger.setLevel(logging.INFO)
>>> logger.warning('doomed')
[WARNING/MainProcess] doomed
- >>> m = processing.Manager()
+ >>> m = multiprocessing.Manager()
[INFO/SyncManager-1] child process calling self.run()
[INFO/SyncManager-1] manager bound to '\\\\.\\pipe\\pyc-2776-0-lj0tfa'
>>> del m