summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-06-02 21:40:59 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-06-02 21:40:59 (GMT)
commitfd4c4b1e011e93509bd4d7e5176b27481f05cca4 (patch)
tree4642b7bf9142a0c7d6a6d00545aa964edbaaa67f
parent5fae78c09d7f26c2fa05e52e610f142c3eb08917 (diff)
downloadcpython-fd4c4b1e011e93509bd4d7e5176b27481f05cca4.zip
cpython-fd4c4b1e011e93509bd4d7e5176b27481f05cca4.tar.gz
cpython-fd4c4b1e011e93509bd4d7e5176b27481f05cca4.tar.bz2
backport c4bd68be5fc6 to 2.7
-rw-r--r--Doc/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index d2d5e32..de6cd89 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -200,7 +200,7 @@ Glossary
An object exposing a file-oriented API (with methods such as
:meth:`read()` or :meth:`write()`) to an underlying resource. Depending
on the way it was created, a file object can mediate access to a real
- on-disk file or to another other type of storage or communication device
+ on-disk file or to another type of storage or communication device
(for example standard input/output, in-memory buffers, sockets, pipes,
etc.). File objects are also called :dfn:`file-like objects` or
:dfn:`streams`.