Sat Dec 19 23:59:01 CET 2009

Author: ezio.melotti
Date: Sat Dec 19 23:59:01 2009
New Revision: 76905

Log:
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
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/distutils/setupscript.rst
   python/branches/release26-maint/Doc/faq/extending.rst
   python/branches/release26-maint/Doc/faq/library.rst
   python/branches/release26-maint/Doc/faq/windows.rst
   python/branches/release26-maint/Doc/library/collections.rst
   python/branches/release26-maint/Doc/library/doctest.rst
   python/branches/release26-maint/Doc/library/hmac.rst
   python/branches/release26-maint/Doc/library/hotshot.rst
   python/branches/release26-maint/Doc/library/logging.rst
   python/branches/release26-maint/Doc/library/multiprocessing.rst
   python/branches/release26-maint/Doc/library/pdb.rst
   python/branches/release26-maint/Doc/library/smtplib.rst
   python/branches/release26-maint/Doc/library/socket.rst
   python/branches/release26-maint/Doc/library/stdtypes.rst
   python/branches/release26-maint/Doc/library/turtle.rst
   python/branches/release26-maint/Doc/license.rst
   python/branches/release26-maint/Doc/tutorial/stdlib.rst
   python/branches/release26-maint/Doc/tutorial/stdlib2.rst
   python/branches/release26-maint/Doc/using/unix.rst
   python/branches/release26-maint/Doc/using/windows.rst

Modified: python/branches/release26-maint/Doc/distutils/setupscript.rst
==============================================================================

--- python/branches/release26-maint/Doc/distutils/setupscript.rst	(original)
+++ python/branches/release26-maint/Doc/distutils/setupscript.rst	Sat Dec 19 23:59:01 2009
@@ -620,7 +620,7 @@
 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=[

Modified: python/branches/release26-maint/Doc/faq/extending.rst
==============================================================================
--- python/branches/release26-maint/Doc/faq/extending.rst	(original)
+++ python/branches/release26-maint/Doc/faq/extending.rst	Sat Dec 19 23:59:01 2009
@@ -432,7 +432,7 @@
 --------------------------------------------------------------------
 
 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``).
 
 

Modified: python/branches/release26-maint/Doc/faq/library.rst
==============================================================================
--- python/branches/release26-maint/Doc/faq/library.rst	(original)
+++ python/branches/release26-maint/Doc/faq/library.rst	Sat Dec 19 23:59:01 2009
@@ -61,7 +61,7 @@
 
 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

Modified: python/branches/release26-maint/Doc/faq/windows.rst
==============================================================================
--- python/branches/release26-maint/Doc/faq/windows.rst	(original)
+++ python/branches/release26-maint/Doc/faq/windows.rst	Sat Dec 19 23:59:01 2009
@@ -204,7 +204,7 @@
    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

Modified: python/branches/release26-maint/Doc/library/collections.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/collections.rst	(original)
+++ python/branches/release26-maint/Doc/library/collections.rst	Sat Dec 19 23:59:01 2009
@@ -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):

Modified: python/branches/release26-maint/Doc/library/doctest.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/doctest.rst	(original)
+++ python/branches/release26-maint/Doc/library/doctest.rst	Sat Dec 19 23:59:01 2009
@@ -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

Modified: python/branches/release26-maint/Doc/library/hmac.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/hmac.rst	(original)
+++ python/branches/release26-maint/Doc/library/hmac.rst	Sat Dec 19 23:59:01 2009
@@ -57,5 +57,5 @@
 .. seealso::
 
    Module :mod:`hashlib`
-      The python module providing secure hash functions.
+      The Python module providing secure hash functions.
 

Modified: python/branches/release26-maint/Doc/library/hotshot.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/hotshot.rst	(original)
+++ python/branches/release26-maint/Doc/library/hotshot.rst	Sat Dec 19 23:59:01 2009
@@ -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

Modified: python/branches/release26-maint/Doc/library/logging.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/logging.rst	(original)
+++ python/branches/release26-maint/Doc/library/logging.rst	Sat Dec 19 23:59:01 2009
@@ -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:

Modified: python/branches/release26-maint/Doc/library/multiprocessing.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/multiprocessing.rst	(original)
+++ python/branches/release26-maint/Doc/library/multiprocessing.rst	Sat Dec 19 23:59:01 2009
@@ -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 ::
 

Modified: python/branches/release26-maint/Doc/library/pdb.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/pdb.rst	(original)
+++ python/branches/release26-maint/Doc/library/pdb.rst	Sat Dec 19 23:59:01 2009
@@ -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".
 

Modified: python/branches/release26-maint/Doc/library/smtplib.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/smtplib.rst	(original)
+++ python/branches/release26-maint/Doc/library/smtplib.rst	Sat Dec 19 23:59:01 2009
@@ -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])

Modified: python/branches/release26-maint/Doc/library/socket.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/socket.rst	(original)
+++ python/branches/release26-maint/Doc/library/socket.rst	Sat Dec 19 23:59:01 2009
@@ -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)

Modified: python/branches/release26-maint/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/stdtypes.rst	(original)
+++ python/branches/release26-maint/Doc/library/stdtypes.rst	Sat Dec 19 23:59:01 2009
@@ -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 ``'%'``      |       |

Modified: python/branches/release26-maint/Doc/library/turtle.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/turtle.rst	(original)
+++ python/branches/release26-maint/Doc/library/turtle.rst	Sat Dec 19 23:59:01 2009
@@ -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:
 

Modified: python/branches/release26-maint/Doc/license.rst
==============================================================================
--- python/branches/release26-maint/Doc/license.rst	(original)
+++ python/branches/release26-maint/Doc/license.rst	Sat Dec 19 23:59:01 2009
@@ -624,7 +624,7 @@
    - 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

Modified: python/branches/release26-maint/Doc/tutorial/stdlib.rst
==============================================================================
--- python/branches/release26-maint/Doc/tutorial/stdlib.rst	(original)
+++ python/branches/release26-maint/Doc/tutorial/stdlib.rst	Sat Dec 19 23:59:01 2009
@@ -306,7 +306,7 @@
 * 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

Modified: python/branches/release26-maint/Doc/tutorial/stdlib2.rst
==============================================================================
--- python/branches/release26-maint/Doc/tutorial/stdlib2.rst	(original)
+++ python/branches/release26-maint/Doc/tutorial/stdlib2.rst	Sat Dec 19 23:59:01 2009
@@ -289,7 +289,7 @@
 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])

Modified: python/branches/release26-maint/Doc/using/unix.rst
==============================================================================
--- python/branches/release26-maint/Doc/using/unix.rst	(original)
+++ python/branches/release26-maint/Doc/using/unix.rst	Sat Dec 19 23:59:01 2009
@@ -131,14 +131,14 @@
 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

Modified: python/branches/release26-maint/Doc/using/windows.rst
==============================================================================
--- python/branches/release26-maint/Doc/using/windows.rst	(original)
+++ python/branches/release26-maint/Doc/using/windows.rst	Sat Dec 19 23:59:01 2009
@@ -71,7 +71,7 @@
 
 `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.
 
