From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Wed, 3 Mar 2010 11:50:46 +0000 (+0000)
Subject: Merged revisions 78620 via svnmerge from
X-Git-Tag: v2.6.5rc2~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90193c01b93e7021634d35b8668fc2ff84a949ff;p=python

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 721f77da9a..4a46a728e9 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -126,7 +126,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 __builtin__.\n"
+"Print an object to sys.stdout and also save it in __builtin__._\n"
 );
 
 static PyObject *