Merged revisions 72601 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72601 | r.david.murray | 2009-05-13 09:07:14 -0400 (Wed, 13 May 2009) | 3 lines

  Move news item to correct section, remove spurious 'see below'
  from docstring.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 9278135952a9ba0ad639a2f76d4a80b39f03ce16..373405b9d5d2b00ec7761ab0aa98a5af6ff2764a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@ What's New in Python 2.6.3
 Core and Builtins
 -----------------
 
+- Issue #5994: the marshal module now has docstrings.
+
 - Issue #5981: Fix two minor inf/nan issues in float.fromhex: (1) inf
   and nan strings with trailing whitespace were incorrectly rejected
   and (2) the interpretation of fromhex('-nan') didn't match that of
@@ -45,8 +47,6 @@ Core and Builtins
 Library
 -------
 
-- Issue #5994: the marshal module now has docstrings.
-
 - Issue #5971: StreamHandler.handleError now swallows IOErrors which occur when
   trying to print a traceback.
 

diff --git a/Python/marshal.c b/Python/marshal.c
index c5a643f74e0d6de2bc7499965a97effb85ab064c..52d22573d3de7ddd3dd5e5689fe1cee34e3f7e0a 100644 (file)
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1242,7 +1242,7 @@ The value must be a supported type. Raise a ValueError exception if\n\
 value has (or contains an object that has) an unsupported type.\n\
 \n\
 New in version 2.4: The version argument indicates the data format that\n\
-dumps should use (see below).");
+dumps should use.");
 
 
 static PyObject *