Merged revisions 76904 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76904 | ezio.melotti | 2009-12-20 00:41:49 +0200 (Sun, 20 Dec 2009) | 1 line

  #7388: "python".capitalize() in the Doc
........

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 2e2aa6404464012a0777876f9c1cfd473df0c0e0..650aec214fb476841eeda24b71f3c2998ba828a7 100644 (file)
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -808,7 +808,7 @@ pointer and a void argument.
 .. index:: single: setcheckinterval() (in module sys)
 
 Every check interval, when the global interpreter lock is released and
-reacquired, python will also call any such provided functions.  This can be used
+reacquired, Python will also call any such provided functions.  This can be used
 for example by asynchronous IO handlers.  The notification can be scheduled from
 a worker thread and the actual call than made at the earliest convenience by the
 main thread where it has possession of the global interpreter lock and can
@@ -826,7 +826,7 @@ perform any Python API calls.
    exception.  The notification function won't be interrupted to perform another
    asynchronous notification recursively, but it can still be interrupted to
    switch threads if the global interpreter lock is released, for example, if it
-   calls back into python code.
+   calls back into Python code.
 
    This function returns 0 on success in which case the notification has been
    scheduled.  Otherwise, for example if the notification buffer is full, it

diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index e7c630054ad45db3adff129fcce528cb39aec2bc..5ec94c7ea5a6144dc3f0b39978fdc38185fa8d6f 100644 (file)
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -646,7 +646,7 @@ information is sometimes used to indicate sub-releases.  These are
 1.0.1a2
     the second alpha release of the first patch version of 1.0
 
-:option:`classifiers` are specified in a python list::
+:option:`classifiers` are specified in a Python list::
 
     setup(...,
           classifiers=[

diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index 7f3fda7351d194d54fee3fb707e85fad9d702260..9091193df25a2f13a08b04810f4363c87c562fa2 100644 (file)
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -434,7 +434,7 @@ How do I find undefined g++ symbols __builtin_new or __pure_virtual?
 --------------------------------------------------------------------
 
 To dynamically load g++ extension modules, you must recompile Python, relink it
-using g++ (change LINKCC in the python Modules Makefile), and link your
+using g++ (change LINKCC in the Python Modules Makefile), and link your
 extension module using g++ (e.g., ``g++ -shared -o mymodule.so mymodule.o``).
 
 

diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst
index b5c469ef60f0144d804a472d4327622af3424e99..a7d70528b4c557fcc983f69bdfba958170c1e46f 100644 (file)
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -61,7 +61,7 @@ interpreter is installed on your platform.
 
 If you would like the script to be independent of where the Python interpreter
 lives, you can use the "env" program.  Almost all Unix variants support the
-following, assuming the python interpreter is in a directory on the user's
+following, assuming the Python interpreter is in a directory on the user's
 $PATH::
 
   #!/usr/bin/env python

diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index a5ede41c22fea003e39eaf5b05dc338450413e53..2a19c981fc51d8ce6c2121c8a1050be4a95b80b0 100644 (file)
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -208,7 +208,7 @@ The important things to remember are:
    for developing code by experiment.
 
 
-How do I make python scripts executable?
+How do I make Python scripts executable?
 ----------------------------------------
 
 On Windows 2000, the standard Python installer already associates the .py

diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 2ee294935c7a93a943d9072674394ee4173710db..377c144a3effd0aff7783b59b27062031a1bcaab 100644 (file)
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -469,7 +469,7 @@ added elements by appending to the right and popping to the left::
             yield s / n
 
 The :meth:`rotate` method provides a way to implement :class:`deque` slicing and
-deletion.  For example, a pure python implementation of ``del d[n]`` relies on
+deletion.  For example, a pure Python implementation of ``del d[n]`` relies on
 the :meth:`rotate` method to position elements to be popped::
 
    def delete_nth(d, n):

diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
index 4952e053bd94ceec0aff7b19ba8de05fb29b8281..a9e1b5ba145ce517e56becaa58cbd8eaa1f4849b 100644 (file)
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -1059,7 +1059,7 @@ capabilities, then you should use the advanced API.
 The advanced API revolves around two container classes, which are used to store
 the interactive examples extracted from doctest cases:
 
-* :class:`Example`: A single python :term:`statement`, paired with its expected
+* :class:`Example`: A single Python :term:`statement`, paired with its expected
   output.
 
 * :class:`DocTest`: A collection of :class:`Example`\ s, typically extracted

diff --git a/Doc/library/hmac.rst b/Doc/library/hmac.rst
index faaedf46e48a4ac0a76d4402c6c96216e3e857d8..6ffd00aa04f47938cc7f1c9d54acd5d4ce560242 100644 (file)
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
@@ -54,5 +54,5 @@ An HMAC object has the following methods:
 .. seealso::
 
    Module :mod:`hashlib`
-      The python module providing secure hash functions.
+      The Python module providing secure hash functions.
 

diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 5e77e137aaa8fb01f6cd27216fdf2a6804bac5b2..b05282b502daf478361655a714764f118b0a0cab 100644 (file)
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -2196,7 +2196,7 @@ A Formatter can be initialized with a format string which makes use of knowledge
 of the :class:`LogRecord` attributes - such as the default value mentioned above
 making use of the fact that the user's message and arguments are pre-formatted
 into a :class:`LogRecord`'s *message* attribute.  This format string contains
-standard python %-style mapping keys. See section :ref:`old-string-formatting`
+standard Python %-style mapping keys. See section :ref:`old-string-formatting`
 for more information on string formatting.
 
 Currently, the useful mapping keys in a :class:`LogRecord` are:

diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
index 14f685f2a4db2cef69147a3351004d20f7845b0f..a2cdb0295b4157ebaa958902dac27d7f6406f00e 100644 (file)
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -686,7 +686,7 @@ Miscellaneous
 
 .. function:: set_executable()
 
-   Sets the path of the python interpreter to use when starting a child process.
+   Sets the path of the Python interpreter to use when starting a child process.
    (By default :data:`sys.executable` is used).  Embedders will probably need to
    do some thing like ::
 

diff --git a/Doc/library/pdb.rst b/Doc/library/pdb.rst
index 9a0c00ef811d49fee9fe1deec2a549d3c4255a47..bfeaa04ab733405eddc06f28c16861b5f3cf7d0b 100644 (file)
--- a/Doc/library/pdb.rst
+++ b/Doc/library/pdb.rst
@@ -369,7 +369,7 @@ unalias *name*
       (Pdb)
 
 run [*args* ...]
-   Restart the debugged python program. If an argument is supplied, it is split
+   Restart the debugged Python program. If an argument is supplied, it is split
    with "shlex" and the result is used as the new sys.argv. History, breakpoints,
    actions and debugger options are preserved. "restart" is an alias for "run".
 

diff --git a/Doc/library/random.rst b/Doc/library/random.rst
index 2ce2c8532b6a0e6cae83312abfa82781b023762b..54211f4f9d346bd2b1cf2f1728824ec9f4dfff13 100644 (file)
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -67,7 +67,7 @@ Bookkeeping functions:
 
 .. function:: getrandbits(k)
 
-   Returns a python integer with *k* random bits. This method is supplied with
+   Returns a Python integer with *k* random bits. This method is supplied with
    the MersenneTwister generator and some other generators may also provide it
    as an optional part of the API. When available, :meth:`getrandbits` enables
    :meth:`randrange` to handle arbitrarily large ranges.

diff --git a/Doc/library/smtplib.rst b/Doc/library/smtplib.rst
index 79396f9626a8109666ea6ff15f486c6252b75a59..daba9a1dbdb71e07ab0b12049adaa929941030fa 100644 (file)
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -257,7 +257,7 @@ An :class:`SMTP` instance has the following methods:
      The server does not support the STARTTLS extension.
 
    :exc:`RuntimeError`
-     SSL/TLS support is not available to your python interpreter.
+     SSL/TLS support is not available to your Python interpreter.
 
 
 .. method:: SMTP.sendmail(from_addr, to_addrs, msg, mail_options=[], rcpt_options=[])

diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
index d9045edc5fd0d832a4470f692cc7014463385393..79a49649932249924c9c1c8c0ac87c830534a5a3 100644 (file)
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -696,7 +696,7 @@ Note that the :meth:`connect` operation is subject to the timeout setting, and
 in general it is recommended to call :meth:`settimeout` before calling
 :meth:`connect` or pass a timeout parameter to :meth:`create_connection`.
 The system network stack may return a connection timeout error
-of its own regardless of any python socket timeout setting.
+of its own regardless of any Python socket timeout setting.
 
 
 .. method:: socket.setsockopt(level, optname, value)

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 89c7b672514b6e58ebee3f4362e4fa2a36f25ea0..eaa413b0d2e06fcdd454d3d68c615f99835ebea4 100644 (file)
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1311,10 +1311,10 @@ The conversion types are:
 | ``'c'``    | Single character (accepts integer or single         |       |
 |            | character string).                                  |       |
 +------------+-----------------------------------------------------+-------+
-| ``'r'``    | String (converts any python object using            | \(5)  |
+| ``'r'``    | String (converts any Python object using            | \(5)  |
 |            | :func:`repr`).                                      |       |
 +------------+-----------------------------------------------------+-------+
-| ``'s'``    | String (converts any python object using            |       |
+| ``'s'``    | String (converts any Python object using            |       |
 |            | :func:`str`).                                       |       |
 +------------+-----------------------------------------------------+-------+
 | ``'%'``    | No argument is converted, results in a ``'%'``      |       |

diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index d9471869cbb4b5c7a36295539ddfe71f02a9ad97..232305c92360afe86b08ff4502f28cd57570fe58 100644 (file)
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -36,7 +36,7 @@ the module from within IDLE run with the ``-n`` switch.
 
 The turtle module provides turtle graphics primitives, in both object-oriented
 and procedure-oriented ways.  Because it uses :mod:`Tkinter` for the underlying
-graphics, it needs a version of python installed with Tk support.
+graphics, it needs a version of Python installed with Tk support.
 
 The object-oriented interface uses essentially two+two classes:
 

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index e1d4779ae4ad61d33aa1d450f6682407e7feb37c..e134c9e2119b8d6fc6e89ed9d07fbee285fc617a 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1591,7 +1591,7 @@ name then the package :file:`__init__.py` will be checked for ``load_tests``.
 
 .. note::
 
-   The default pattern is 'test*.py'. This matches all python files
+   The default pattern is 'test*.py'. This matches all Python files
    that start with 'test' but *won't* match any test directories.
 
    A pattern like 'test*' will match test packages as well as

diff --git a/Doc/license.rst b/Doc/license.rst
index 76aa5038c7b23d2355990d46bb4a9318044915f2..ec82b8d649c7bd2b62f8d19b66dd855cff7639ba 100644 (file)
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -578,7 +578,7 @@ The :mod:`uu` module contains the following notice::
    - Use binascii module to do the actual line-by-line conversion
      between ascii and binary. This results in a 1000-fold speedup. The C
      version is still 5 times faster, though.
-   - Arguments more compliant with python standard
+   - Arguments more compliant with Python standard
 
 
 XML Remote Procedure Calls

diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst
index 98702a55c18bf0b21574b050e185e6f83347cff9..d9a15fa70037de4ee9bac1f0bc76352550b39521 100644 (file)
--- a/Doc/tutorial/stdlib.rst
+++ b/Doc/tutorial/stdlib.rst
@@ -308,7 +308,7 @@ sophisticated and robust capabilities of its larger packages. For example:
 * The :mod:`xml.dom` and :mod:`xml.sax` packages provide robust support for
   parsing this popular data interchange format. Likewise, the :mod:`csv` module
   supports direct reads and writes in a common database format. Together, these
-  modules and packages greatly simplify data interchange between python
+  modules and packages greatly simplify data interchange between Python
   applications and other tools.
 
 * Internationalization is supported by a number of modules including

diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index 2d52591472ce802476bc428456a8440574158b18..fe7f027b53928fb60a81b8c58f48c9fef9cff254 100644 (file)
--- a/Doc/tutorial/stdlib2.rst
+++ b/Doc/tutorial/stdlib2.rst
@@ -289,7 +289,7 @@ The :mod:`array` module provides an :class:`array()` object that is like a list
 that stores only homogeneous data and stores it more compactly.  The following
 example shows an array of numbers stored as two byte unsigned binary numbers
 (typecode ``"H"``) rather than the usual 16 bytes per entry for regular lists of
-python int objects::
+Python int objects::
 
    >>> from array import array
    >>> a = array('H', [4000, 10, 700, 22222])

diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
index 3d562a8b09f86825c04e256a228c5841518e98b0..61e707b11c777eb2a6495711f91153b90ea06841 100644 (file)
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -131,14 +131,14 @@ which searches for the Python interpreter in the whole :envvar:`PATH`.  However,
 some Unices may not have the :program:`env` command, so you may need to hardcode
 ``/usr/bin/python`` as the interpreter path.
 
-To use shell commands in your python scripts, look at the :mod:`subprocess` module.
+To use shell commands in your Python scripts, look at the :mod:`subprocess` module.
 
 
 Editors
 =======
 
 Vim and Emacs are excellent editors which support Python very well.  For more
-information on how to code in python in these editors, look at:
+information on how to code in Python in these editors, look at:
 
 * http://www.vim.org/scripts/script.php?script_id=790
 * http://sourceforge.net/projects/python-mode

diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 7961a60c0aa50800a83d646effe47f04ac32bf76..7c61703e7fcfa4fbb62d157b22cb428b2dd0af74 100644 (file)
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -69,7 +69,7 @@ key features:
 
 `Enthought Python Distribution <http://www.enthought.com/products/epd.php>`_
     Popular modules (such as PyWin32) with their respective documentation, tool
-    suite for building extensible python applications
+    suite for building extensible Python applications
 
 Notice that these packages are likely to install *older* versions of Python.