summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorSandro Tosi <sandro.tosi@gmail.com>2012-06-02 21:41:19 (GMT)
committerSandro Tosi <sandro.tosi@gmail.com>2012-06-02 21:41:19 (GMT)
commit7f671338def9208bad1e5032c8c08a6cade46491 (patch)
tree18823c3be310285463b30bfb4c9e873a580c4409 /Doc
parent29d09aa4dd18d08873832b2420a28e3092169786 (diff)
downloadcpython-7f671338def9208bad1e5032c8c08a6cade46491.zip
cpython-7f671338def9208bad1e5032c8c08a6cade46491.tar.gz
cpython-7f671338def9208bad1e5032c8c08a6cade46491.tar.bz2
backport c4bd68be5fc6 to 3.2
Diffstat (limited to 'Doc')
-rw-r--r--Doc/glossary.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index 21b92a9..bf1234d 100644
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -194,7 +194,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`.