[Python-checkins] r78624 - in python/branches/release31-maint: Python/sysmodule.c

Wed Mar 3 12:55:53 CET 2010

Author: florent.xicluna
Date: Wed Mar 3 12:55:53 2010
New Revision: 78624
Log:
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.
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Python/sysmodule.c
Modified: python/branches/release31-maint/Python/sysmodule.c
==============================================================================

--- python/branches/release31-maint/Python/sysmodule.c	(original)
+++ python/branches/release31-maint/Python/sysmodule.c	Wed Mar 3 12:55:53 2010
@@ -107,7 +107,7 @@
 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 *
