[Python-checkins] cpython (merge 3.2 -> default): Merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/c33596e6f723
changeset:   69408:c33596e6f723
parent:      69405:0ecfa2ce6561
parent:      69407:fcce2f49ef6d
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Apr 16 23:14:40 2011 +0300
summary:
  Merge with 3.2.

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


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -2,7 +2,7 @@
 ===============================================================================
 
 .. module:: argparse
-   :synopsis: Command-line option and argument parsing library.
+   :synopsis: Command-line option and argument-parsing library.
 .. moduleauthor:: Steven Bethard <steven.bethard at gmail.com>
 .. sectionauthor:: Steven Bethard <steven.bethard at gmail.com>
 
@@ -12,7 +12,7 @@
 
 --------------
 
-The :mod:`argparse` module makes it easy to write user friendly command line
+The :mod:`argparse` module makes it easy to write user-friendly command-line
 interfaces. The program defines what arguments it requires, and :mod:`argparse`
 will figure out how to parse those out of :data:`sys.argv`.  The :mod:`argparse`
 module also automatically generates help and usage messages and issues errors
@@ -610,7 +610,7 @@
    * default_ - The value produced if the argument is absent from the
      command line.
 
-   * type_ - The type to which the command-line arg should be converted.
+   * type_ - The type to which the command-line argument should be converted.
 
    * choices_ - A container of the allowable values for the argument.
 

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