summaryrefslogtreecommitdiffstats
path: root/Doc/tutorial
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-08-14 17:52:04 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-08-14 17:52:04 (GMT)
commit488cc36123dc57bbb261f97592ec89d02e019f9a (patch)
tree4bced0e3684a9249aa3f1145cb8cd86f5ce3d403 /Doc/tutorial
parentc85951eb4c9b77f671a955f5c63e30f30a36980e (diff)
parenta17ef14632002172f9e957cf9bc3f379fa15663b (diff)
downloadcpython-488cc36123dc57bbb261f97592ec89d02e019f9a.zip
cpython-488cc36123dc57bbb261f97592ec89d02e019f9a.tar.gz
cpython-488cc36123dc57bbb261f97592ec89d02e019f9a.tar.bz2
merge with 3.2
Diffstat (limited to 'Doc/tutorial')
-rw-r--r--Doc/tutorial/inputoutput.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 00f5aea..45de518 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -37,7 +37,7 @@ or :func:`str` functions.
The :func:`str` function is meant to return representations of values which are
fairly human-readable, while :func:`repr` is meant to generate representations
which can be read by the interpreter (or will force a :exc:`SyntaxError` if
-there is not equivalent syntax). For objects which don't have a particular
+there is no equivalent syntax). For objects which don't have a particular
representation for human consumption, :func:`str` will return the same value as
:func:`repr`. Many values, such as numbers or structures like lists and
dictionaries, have the same representation using either function. Strings, in