[Python-checkins] cpython (merge 3.2 -> 3.2): merge heads

Sun Jan 1 05:45:47 CET 2012

http://hg.python.org/cpython/rev/c68bb5e41755
changeset: 74213:c68bb5e41755
branch: 3.2
parent: 74212:879798e70473
parent: 74209:ed4f7d9e0e96
user: Benjamin Peterson <benjamin at python.org>
date: Sat Dec 31 22:42:45 2011 -0600
summary:
 merge heads
files:
 Doc/howto/functional.rst | 6 ++--
 Doc/howto/webservers.rst | 10 +++---
 Doc/library/atexit.rst | 2 -
 Doc/library/multiprocessing.rst | 28 ++++++++++----------
 Doc/using/unix.rst | 4 +-
 5 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -1151,9 +1151,9 @@
 
 Mertz also wrote a 3-part series of articles on functional programming
 for IBM's DeveloperWorks site; see
-`part 1 <http://www-128.ibm.com/developerworks/library/l-prog.html>`__,
-`part 2 <http://www-128.ibm.com/developerworks/library/l-prog2.html>`__, and
-`part 3 <http://www-128.ibm.com/developerworks/linux/library/l-prog3.html>`__,
+`part 1 <http://www.ibm.com/developerworks/linux/library/l-prog/index.html>`__,
+`part 2 <http://www.ibm.com/developerworks/linux/library/l-prog2/index.html>`__, and
+`part 3 <http://www.ibm.com/developerworks/linux/library/l-prog3/index.html>`__,
 
 
 Python documentation
diff --git a/Doc/howto/webservers.rst b/Doc/howto/webservers.rst
--- a/Doc/howto/webservers.rst
+++ b/Doc/howto/webservers.rst
@@ -274,7 +274,7 @@
 Each web server requires a specific module.
 
 * Apache has both `mod_fastcgi <http://www.fastcgi.com/drupal/>`_ and `mod_fcgid
- <http://fastcgi.coremail.cn/>`_. ``mod_fastcgi`` is the original one, but it
+ <http://httpd.apache.org/mod_fcgid/>`_. ``mod_fastcgi`` is the original one, but it
 has some licensing issues, which is why it is sometimes considered non-free.
 ``mod_fcgid`` is a smaller, compatible alternative. One of these modules needs
 to be loaded by Apache.
@@ -365,7 +365,7 @@
 
 A really great WSGI feature is middleware. Middleware is a layer around your
 program which can add various functionality to it. There is quite a bit of
-`middleware <http://wsgi.org/wsgi/Middleware_and_Utilities>`_ already
+`middleware <http://www.wsgi.org/en/latest/libraries.html>`_ already
 available. For example, instead of writing your own session management (HTTP
 is a stateless protocol, so to associate multiple HTTP requests with a single
 user your application must create and manage such state via a session), you can
@@ -396,9 +396,9 @@
 
 .. seealso::
 
- A good overview of WSGI-related code can be found in the `WSGI wiki
- <http://wsgi.org/wsgi>`_, which contains an extensive list of `WSGI servers
- <http://wsgi.org/wsgi/Servers>`_ which can be used by *any* application
+ A good overview of WSGI-related code can be found in the `WSGI homepage
+ <http://www.wsgi.org/en/latest/index.html>`_, which contains an extensive list of `WSGI servers
+ <http://www.wsgi.org/en/latest/servers.html>`_ which can be used by *any* application
 supporting WSGI.
 
 You might be interested in some WSGI-supporting modules already contained in
diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst
--- a/Doc/library/atexit.rst
+++ b/Doc/library/atexit.rst
@@ -6,9 +6,6 @@
 .. moduleauthor:: Skip Montanaro <skip at pobox.com>
 .. sectionauthor:: Skip Montanaro <skip at pobox.com>
 
-**Source code:** :source:`Lib/atexit.py`
-
---------------
 
 The :mod:`atexit` module defines functions to register and unregister cleanup
 functions. Functions thus registered are automatically executed upon normal
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -472,7 +472,7 @@
 
 If you use :class:`JoinableQueue` then you **must** call
 :meth:`JoinableQueue.task_done` for each task removed from the queue or else the
-semaphore used to count the number of unfinished tasks may eventually overflow
+semaphore used to count the number of unfinished tasks may eventually overflow,
 raising an exception.
 
 Note that one can also create a shared queue by using a manager object -- see
@@ -490,7 +490,7 @@
 
 If a process is killed using :meth:`Process.terminate` or :func:`os.kill`
 while it is trying to use a :class:`Queue`, then the data in the queue is
- likely to become corrupted. This may cause any other processes to get an
+ likely to become corrupted. This may cause any other process to get an
 exception when it tries to use the queue later on.
 
 .. warning::
@@ -692,7 +692,7 @@
 (By default :data:`sys.executable` is used). Embedders will probably need to
 do some thing like ::
 
- setExecutable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
+ set_executable(os.path.join(sys.exec_prefix, 'pythonw.exe'))
 
 before they can create child processes. (Windows only)
 
@@ -711,7 +711,7 @@
 Connection objects allow the sending and receiving of picklable objects or
 strings. They can be thought of as message oriented connected sockets.
 
-Connection objects usually created using :func:`Pipe` -- see also
+Connection objects are usually created using :func:`Pipe` -- see also
 :ref:`multiprocessing-listeners-clients`.
 
 .. class:: Connection
@@ -732,7 +732,7 @@
 
 .. method:: fileno()
 
- Returns the file descriptor or handle used by the connection.
+ Return the file descriptor or handle used by the connection.
 
 .. method:: close()
 
@@ -756,7 +756,7 @@
 If *offset* is given then data is read from that position in *buffer*. If
 *size* is given then that many bytes will be read from buffer. Very large
 buffers (approximately 32 MB+, though it depends on the OS) may raise a
- ValueError exception
+ :exc:`ValueError` exception
 
 .. method:: recv_bytes([maxlength])
 
@@ -1329,7 +1329,7 @@
 >>>>>>>>>>>>>>>>>>>
 
 To create one's own manager, one creates a subclass of :class:`BaseManager` and
-use the :meth:`~BaseManager.register` classmethod to register new types or
+uses the :meth:`~BaseManager.register` classmethod to register new types or
 callables with the manager class. For example::
 
 from multiprocessing.managers import BaseManager
@@ -1580,9 +1580,9 @@
 .. method:: apply(func[, args[, kwds]])
 
 Call *func* with arguments *args* and keyword arguments *kwds*. It blocks
- till the result is ready. Given this blocks, :meth:`apply_async` is better
- suited for performing work in parallel. Additionally, the passed in
- function is only executed in one of the workers of the pool.
+ until the result is ready. Given this blocks, :meth:`apply_async` is
+ better suited for performing work in parallel. Additionally, *func*
+ is only executed in one of the workers of the pool.
 
 .. method:: apply_async(func[, args[, kwds[, callback[, error_callback]]]])
 
@@ -1603,7 +1603,7 @@
 .. method:: map(func, iterable[, chunksize])
 
 A parallel equivalent of the :func:`map` built-in function (it supports only
- one *iterable* argument though). It blocks till the result is ready.
+ one *iterable* argument though). It blocks until the result is ready.
 
 This method chops the iterable into a number of chunks which it submits to
 the process pool as separate tasks. The (approximate) size of these
@@ -2060,7 +2060,7 @@
 On Windows many types from :mod:`multiprocessing` need to be picklable so
 that child processes can use them. However, one should generally avoid
 sending shared objects to other processes using pipes or queues. Instead
- you should arrange the program so that a process which need access to a
+ you should arrange the program so that a process which needs access to a
 shared resource created elsewhere can inherit it from an ancestor process.
 
 Avoid terminating processes
@@ -2139,7 +2139,7 @@
 for i in range(10):
 Process(target=f, args=(lock,)).start()
 
-Beware replacing sys.stdin with a "file like object"
+Beware of replacing :data:`sys.stdin` with a "file like object"
 
 :mod:`multiprocessing` originally unconditionally called::
 
@@ -2257,7 +2257,7 @@
 
 
 An example showing how to use queues to feed tasks to a collection of worker
-process and collect the results:
+processes and collect the results:
 
 .. literalinclude:: ../includes/mp_workers.py
 
diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -26,11 +26,11 @@
 
 .. seealso::
 
- http://www.linux.com/articles/60383
+ http://www.debian.org/doc/manuals/maint-guide/first.en.html
 for Debian users
 http://linuxmafia.com/pub/linux/suse-linux-internals/chapter35.html
 for OpenSuse users
- http://docs.fedoraproject.org/drafts/rpm-guide-en/ch-creating-rpms.html
+ http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch-creating-rpms.html
 for Fedora users
 http://www.slackbook.org/html/package-management-making-packages.html
 for Slackware users
-- 
Repository URL: http://hg.python.org/cpython
