summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-04-16 20:14:40 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-04-16 20:14:40 (GMT)
commit2476ee32b181a3270b7ae85b60f21e64be9df13b (patch)
tree549ce2bbd5be5e75faedb5c53848f333590b7318
parentcf645db8090ab2a7e98d1fa2174f7a6620f85025 (diff)
parent2409d770d9eefd17133b2446c1cb9719e3081726 (diff)
downloadcpython-2476ee32b181a3270b7ae85b60f21e64be9df13b.zip
cpython-2476ee32b181a3270b7ae85b60f21e64be9df13b.tar.gz
cpython-2476ee32b181a3270b7ae85b60f21e64be9df13b.tar.bz2
Merge with 3.2.
-rw-r--r--Doc/library/argparse.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
index 2961429..c8b0a61 100644
--- 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@gmail.com>
.. sectionauthor:: Steven Bethard <steven.bethard@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 @@ The add_argument() method
* 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.