http://hg.python.org/cpython/rev/0ddb0bb63550 changeset: 74211:0ddb0bb63550 parent: 74208:43b10c2d2553 parent: 74209:ed4f7d9e0e96 user: Sandro Tosi <sandro.tosi@gmail.com> date: Sat Dec 31 19:03:30 2011 +0100 summary: merge with 3.2 files: Doc/howto/functional.rst | 6 +++--- Doc/howto/webservers.rst | 10 +++++----- Doc/library/atexit.rst | 2 -- Doc/using/unix.rst | 4 ++-- 4 files changed, 10 insertions(+), 12 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@pobox.com> .. sectionauthor:: Skip Montanaro <skip@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/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_... for Fedora users http://www.slackbook.org/html/package-management-making-packages.html for Slackware users -- Repository URL: http://hg.python.org/cpython