summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-08-02 23:49:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-08-02 23:49:38 (GMT)
commit05cd4c602b4f16606dd046dfad51f1d0465d9d85 (patch)
tree0392ca53241122ca4957e19f4a2c89f5bd73e2fb
parent18592ca58916e3e1526a84dad8652a5329fefa08 (diff)
parentbbb8dec69edf0d7b11f68df32bbb3b442560dbe2 (diff)
downloadcpython-05cd4c602b4f16606dd046dfad51f1d0465d9d85.zip
cpython-05cd4c602b4f16606dd046dfad51f1d0465d9d85.tar.gz
cpython-05cd4c602b4f16606dd046dfad51f1d0465d9d85.tar.bz2
merge heads
-rw-r--r--Doc/library/argparse.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
index 8a1005e..17a56dd 100644
--- 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: