[Python-checkins] cpython (merge 3.3 -> default): #16796: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/07421f9fcfb0
changeset:   81116:07421f9fcfb0
parent:      81111:eb3a4ae095a8
parent:      81115:1e35d1f514b3
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Fri Dec 28 02:00:41 2012 +0200
summary:
  #16796: merge with 3.3.

files:
  Doc/library/argparse.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -1459,7 +1459,7 @@
    different functions which require different kinds of command-line arguments.
    :class:`ArgumentParser` supports the creation of such sub-commands with the
    :meth:`add_subparsers` method.  The :meth:`add_subparsers` method is normally
-   called with no arguments and returns an special action object.  This object
+   called with no arguments and returns a special action object.  This object
    has a single method, :meth:`~ArgumentParser.add_parser`, which takes a
    command name and any :class:`ArgumentParser` constructor arguments, and
    returns an :class:`ArgumentParser` object that can be modified as usual.

-- 
Repository URL: http://hg.python.org/cpython