merge with 3.3

2013-10-06 09:17:07 +02:00 · 2013-10-06 09:17:07 +02:00 · 4f00dc570c
parent 7f44076f57 53bf15af47
commit 4f00dc570c
1 changed files with 1 additions and 1 deletions
--- 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 ?