[Python-checkins] cpython (merge 3.4 -> default): merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/65018d952340
changeset:   91987:65018d952340
parent:      91985:90db391ce7a5
parent:      91986:42ca62b6547a
user:        Raymond Hettinger <python at rcn.com>
date:        Sun Aug 03 23:44:59 2014 -0700
summary:
  merge

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


diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -1235,7 +1235,7 @@
 Action classes implement the Action API, a callable which returns a callable
 which processes arguments from the command-line. Any object which follows
 this API may be passed as the ``action`` parameter to
-:method:`add_argument`.
+:meth:`add_argument`.
 
 .. class:: Action(option_strings, dest, nargs=None, const=None, default=None,
                   type=None, choices=None, required=False, help=None,
@@ -1244,7 +1244,7 @@
 Action objects are used by an ArgumentParser to represent the information
 needed to parse a single argument from one or more strings from the
 command line. The Action class must accept the two positional arguments
-plus any keyword arguments passed to :method:`ArgumentParser.add_argument`
+plus any keyword arguments passed to :meth:`ArgumentParser.add_argument`
 except for the ``action`` itself.
 
 Instances of Action (or return value of any callable to the ``action``

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