summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-05-19 14:14:05 +0000
committerGeorg Brandl <georg@python.org>2010-05-19 14:14:05 +0000
commit29ec677f6fabeab0341c8e2cc89261acfc676122 (patch)
tree42812ca8e7a9f30d9a725789cb9be70e8990948a
parentf5dec8e9efd2bc756831f23b30158046eb5883ac (diff)
downloadcpython-git-29ec677f6fabeab0341c8e2cc89261acfc676122.tar.gz
Merged revisions 78328 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78328 | jack.diederich | 2010-02-22 19:17:16 +0100 (Mo, 22 Feb 2010) | 1 line fixes issue #7530, serve_forever() ........
-rw-r--r--Doc/library/multiprocessing.rst6
1 files changed, 1 insertions, 5 deletions
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 4133b68231..66be83b25c 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -1124,7 +1124,7 @@ their parent process exits. The manager classes are defined in the
Create a BaseManager object.
- Once created one should call :meth:`start` or :meth:`serve_forever` to ensure
+ Once created one should call :meth:`start` or ```get_server().serve_forever()`` to ensure
that the manager object refers to a started manager process.
*address* is the address on which the manager process listens for new
@@ -1139,10 +1139,6 @@ their parent process exits. The manager classes are defined in the
Start a subprocess to start the manager.
- .. method:: serve_forever()
-
- Run the server in the current process.
-
.. method:: get_server()
Returns a :class:`Server` object which represents the actual server under