Merged revisions 78959,79170,79175,79177,79180,79183,79186,79193,79581 via svnmerge from

svn+ssh://svn.python.org/python/branches/py3k

................
  r78959 | georg.brandl | 2010-03-14 11:56:14 +0100 (So, 14 Mär 2010) | 33 lines

  Merged revisions 78760,78771-78773,78802,78922,78952 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r78760 | georg.brandl | 2010-03-07 16:23:59 +0100 (So, 07 Mär 2010) | 1 line

    #5341: more built-in vs builtin fixes.
  ........
    r78771 | georg.brandl | 2010-03-07 21:58:31 +0100 (So, 07 Mär 2010) | 1 line

    #8085: The function is called PyObject_NewVar, not PyObject_VarNew.
  ........
    r78772 | georg.brandl | 2010-03-07 22:12:28 +0100 (So, 07 Mär 2010) | 1 line

    #8039: document conditional expressions better, giving them their own section.
  ........
    r78773 | georg.brandl | 2010-03-07 22:32:06 +0100 (So, 07 Mär 2010) | 1 line

    #8044: document Py_{Enter,Leave}RecursiveCall functions.
  ........
    r78802 | georg.brandl | 2010-03-08 17:28:40 +0100 (Mo, 08 Mär 2010) | 1 line

    Fix typo.
  ........
    r78922 | georg.brandl | 2010-03-13 14:41:58 +0100 (Sa, 13 Mär 2010) | 1 line

    Update for new download location.
  ........
    r78952 | georg.brandl | 2010-03-14 10:55:08 +0100 (So, 14 Mär 2010) | 1 line

    #8137: add iso-8859-16 to the standard encodings table.
  ........
................
  r79170 | georg.brandl | 2010-03-21 10:02:59 +0100 (So, 21 Mär 2010) | 1 line

  Fix some issues found by Jacques Ducasse on the docs list.
................
  r79175 | georg.brandl | 2010-03-21 10:10:32 +0100 (So, 21 Mär 2010) | 9 lines

  Merged revisions 79172 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79172 | georg.brandl | 2010-03-21 10:08:00 +0100 (So, 21 Mär 2010) | 1 line

    Add a paragraph about set displays.
  ........
................
  r79177 | georg.brandl | 2010-03-21 10:25:54 +0100 (So, 21 Mär 2010) | 1 line

  Need to use list(range()) to get a list.
................
  r79180 | georg.brandl | 2010-03-21 10:50:49 +0100 (So, 21 Mär 2010) | 9 lines

  Merged revisions 79178 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79178 | georg.brandl | 2010-03-21 10:28:16 +0100 (So, 21 Mär 2010) | 1 line

    Clarify that for shell=True, the shell PID will be the child PID.
  ........
................
  r79183 | georg.brandl | 2010-03-21 10:52:24 +0100 (So, 21 Mär 2010) | 9 lines

  Merged revisions 79181 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79181 | georg.brandl | 2010-03-21 10:51:16 +0100 (So, 21 Mär 2010) | 1 line

    Update os.kill() emulation example for Windows to use ctypes.
  ........
................
  r79186 | georg.brandl | 2010-03-21 11:03:36 +0100 (So, 21 Mär 2010) | 13 lines

  Merged revisions 79184-79185 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79184 | georg.brandl | 2010-03-21 10:58:36 +0100 (So, 21 Mär 2010) | 1 line

    Update text for newest US DST regulation.  The sample file already has the calculation right.
  ........
    r79185 | georg.brandl | 2010-03-21 11:02:47 +0100 (So, 21 Mär 2010) | 1 line

    Include structmember.h correctly.
  ........
................
  r79193 | georg.brandl | 2010-03-21 12:53:50 +0100 (So, 21 Mär 2010) | 9 lines

  Merged revisions 79192 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79192 | georg.brandl | 2010-03-21 12:50:58 +0100 (So, 21 Mär 2010) | 1 line

    Remove leftover word.
  ........
................
  r79581 | georg.brandl | 2010-04-02 10:47:07 +0200 (Fr, 02 Apr 2010) | 1 line

  #8213: document behavior of -u on py3k better.
................

1 files changed, 6 insertions, 6 deletions

diff --git a/Misc/python.man b/Misc/python.man
index 9a406a8e95a..b96c8608b14 100644
--- a/Misc/python.man
+++ b/Misc/python.man
@@ -165,12 +165,12 @@ and the site-dependent manipulations of
 that it entails.
 .TP
 .B \-u
-Force stdin, stdout and stderr to be totally unbuffered.  On systems
-where it matters, also put stdin, stdout and stderr in binary mode.
-Note that there is internal buffering in readlines() and
-file-object iterators ("for line in sys.stdin") which is not
-influenced by this option.  To work around this, you will want to use
-"sys.stdin.readline()" inside a "while 1:" loop.
+Force the binary I/O layers of stdin, stdout and stderr to be unbuffered.
+The text I/O layer will still be line-buffered.
+.\" Note that there is internal buffering in readlines() and
+.\" file-object iterators ("for line in sys.stdin") which is not
+.\" influenced by this option.  To work around this, you will want to use
+.\" "sys.stdin.readline()" inside a "while 1:" loop.
 .TP
 .B \-v
 Print a message each time a module is initialized, showing the place