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

[georg.brandl]

http://hg.python.org/cpython/rev/660f9c8300e9
changeset:   86078:660f9c8300e9
parent:      86076:91cf263b711b
parent:      86077:5e0411596314
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 13:10:06 2013 +0200
summary:
  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
@@ -1698,7 +1698,7 @@
 Mutual exclusion
 ^^^^^^^^^^^^^^^^
 
-.. method:: add_mutually_exclusive_group(required=False)
+.. method:: ArgumentParser.add_mutually_exclusive_group(required=False)
 
    Create a mutually exclusive group. :mod:`argparse` will make sure that only
    one of the arguments in the mutually exclusive group was present on the

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