Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge with 3.2

This commit is contained in:
Sandro Tosi 2011-12-31 19:03:30 +01:00
parent eb90caa48d 1abde3628b
commit 8df168cc7b
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/howto/functional.rst
View File

@ -1151,9 +1151,9 @@ Text Processing".
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

10
Doc/howto/webservers.rst
View File

@ -274,7 +274,7 @@ Setting up FastCGI
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 @@ testing.
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 @@ compared with other web technologies.
.. 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

3
Doc/library/atexit.rst
View File

@ -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

4
Doc/using/unix.rst
View File

@ -26,11 +26,11 @@ following links:
.. 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