summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-10-06 07:17:07 (GMT)
committerGeorg Brandl <georg@python.org>2013-10-06 07:17:07 (GMT)
commit4f00dc570ca229bc9d966671d3c6091508bd9ff5 (patch)
tree89d51a45365ddd96bc4aeb1f060125a520d15d38
parent7f44076f574eb5767a187af3728b5f56daad4d1a (diff)
parent53bf15af476756190a28193ae41155eadc2b1e9e (diff)
downloadcpython-4f00dc570ca229bc9d966671d3c6091508bd9ff5.zip
cpython-4f00dc570ca229bc9d966671d3c6091508bd9ff5.tar.gz
cpython-4f00dc570ca229bc9d966671d3c6091508bd9ff5.tar.bz2
merge with 3.3
-rw-r--r--Doc/tutorial/errors.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst
index 2b76c32..4282151 100644
--- a/Doc/tutorial/errors.rst
+++ b/Doc/tutorial/errors.rst
@@ -45,7 +45,7 @@ programs, however, and result in error messages as shown here::
>>> 10 * (1/0)
Traceback (most recent call last):
File "<stdin>", line 1, in ?
- ZeroDivisionError: int division or modulo by zero
+ ZeroDivisionError: division by zero
>>> 4 + spam*3
Traceback (most recent call last):
File "<stdin>", line 1, in ?