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

[benjamin.peterson]

http://hg.python.org/cpython/rev/de5b5fa674b6
changeset:   71719:de5b5fa674b6
parent:      71718:fce751202cba
parent:      71717:42f791043f08
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Aug 02 18:49:38 2011 -0500
summary:
  merge heads

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
@@ -1797,7 +1797,7 @@
 .. method:: ArgumentParser.error(message)
 
    This method prints a usage message including the *message* to the
-   standard output and terminates the program with a status code of 2.
+   standard error and terminates the program with a status code of 2.
 
 .. _upgrading-optparse-code:
 

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