From: Sandro Tosi <sandro.tosi@gmail.com>
Date: Sat, 2 Jun 2012 21:40:59 +0000 (+0200)
Subject: backport c4bd68be5fc6 to 2.7
X-Git-Tag: v2.7.4rc1~774
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd4c4b1e011e93509bd4d7e5176b27481f05cca4;p=python

backport c4bd68be5fc6 to 2.7
---

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index d2d5e32a26..de6cd89bb4 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`.