merge heads

benjaminp · benjaminp · commit 05cd4c602b4f · 2011-08-02T18:49:38.000-05:00
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
@@ -1797,7 +1797,7 @@ Exiting methods
 .. 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:
 
