[Python-checkins] cpython (merge default -> default): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/54b09bce78af
changeset:   74350:54b09bce78af
parent:      74349:29612a16e346
parent:      74348:22688f5f9d0f
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Jan 12 15:26:20 2012 -0500
summary:
  merge heads

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


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -960,8 +960,8 @@
 
    The *file* argument must be an object with a ``write(string)`` method; if it
    is not present or ``None``, :data:`sys.stdout` will be used. Output buffering
-   is determined by *file*. Use ``sys.stdout.flush()`` to ensure immediate
-   appearance on a screen.
+   is determined by *file*. Use ``file.flush()`` to ensure, for instance,
+   immediate appearance on a screen.
 
 
 .. function:: property(fget=None, fset=None, fdel=None, doc=None)

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