From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 3 Mar 2010 11:55:53 +0000 (+0000)
Subject: Merged revisions 78622 via svnmerge from
X-Git-Tag: v3.1.2rc1~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7494de5bfeb116ea28ec153eddd95b4a2831e84;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 78622 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78622 | florent.xicluna | 2010-03-03 12:54:54 +0100 (mer, 03 mar 2010) | 9 lines

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

  ........
    r78620 | florent.xicluna | 2010-03-03 12:49:53 +0100 (mer, 03 mar 2010) | 2 lines

    Revert a nonexistent docstring typo, r42805.
  ........
................
---

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index fa39480e8cb6..c87fd824554b 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -107,7 +107,7 @@ sys_displayhook(PyObject *self, PyObject *o)
 PyDoc_STRVAR(displayhook_doc,
 "displayhook(object) -> None\n"
 "\n"
-"Print an object to sys.stdout and also save it in builtins.\n"
+"Print an object to sys.stdout and also save it in builtins._\n"
 );
 
 static PyObject *