[Python-checkins] cpython (2.7): backport c4bd68be5fc6 to 2.7

[sandro.tosi]

http://hg.python.org/cpython/rev/50d6592791bd
changeset:   77305:50d6592791bd
branch:      2.7
parent:      77300:01ab23aadca3
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sat Jun 02 23:40:59 2012 +0200
summary:
  backport c4bd68be5fc6 to 2.7

files:
  Doc/glossary.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/glossary.rst b/Doc/glossary.rst
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -200,7 +200,7 @@
       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`.

-- 
Repository URL: http://hg.python.org/cpython