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/library/collections.rst b/Doc/library/collections.rst
index c1c88e9..459afa9 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -334,7 +334,7 @@
yield s / float(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 bd990b4..de9340c 100644
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -1132,7 +1132,7 @@
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 10d41f7..8b3b92b 100644
--- a/Doc/library/hmac.rst
+++ b/Doc/library/hmac.rst
@@ -57,5 +57,5 @@
.. seealso::
Module :mod:`hashlib`
- The python module providing secure hash functions.
+ The Python module providing secure hash functions.
diff --git a/Doc/library/hotshot.rst b/Doc/library/hotshot.rst
index b59d2b9..0ee0767 100644
--- a/Doc/library/hotshot.rst
+++ b/Doc/library/hotshot.rst
@@ -127,7 +127,7 @@
Example Usage
-------------
-Note that this example runs the python "benchmark" pystones. It can take some
+Note that this example runs the Python "benchmark" pystones. It can take some
time to run, and will produce large output files. ::
>>> import hotshot, hotshot.stats, test.pystone
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index 715bc31..6d3e42b 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -2213,7 +2213,7 @@
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:`string-formatting`
+standard Python %-style mapping keys. See section :ref:`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 46e8795..4133b68 100644
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -688,7 +688,7 @@
.. 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 72332a6..060b743 100644
--- a/Doc/library/pdb.rst
+++ b/Doc/library/pdb.rst
@@ -352,7 +352,7 @@
(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/smtplib.rst b/Doc/library/smtplib.rst
index 4c1c614..c8f4ed1 100644
--- a/Doc/library/smtplib.rst
+++ b/Doc/library/smtplib.rst
@@ -271,7 +271,7 @@
.. versionchanged:: 2.6
: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 8055ab4..15d55fd 100644
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -756,7 +756,7 @@
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 0115fc1..a20ae33 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1362,10 +1362,10 @@
| ``'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 | \(6) |
+| ``'s'`` | String (converts any Python object using | \(6) |
| | :func:`str`). | |
+------------+-----------------------------------------------------+-------+
| ``'%'`` | No argument is converted, results in a ``'%'`` | |
diff --git a/Doc/library/turtle.rst b/Doc/library/turtle.rst
index da38c1d..1696aaf 100644
--- a/Doc/library/turtle.rst
+++ b/Doc/library/turtle.rst
@@ -36,7 +36,7 @@
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: