summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-07-11 09:34:16 (GMT)
committerGeorg Brandl <georg@python.org>2010-07-11 09:34:16 (GMT)
commit4303fcaa7d863a28e582694c7e6516ed22076e88 (patch)
treea2884c5e983cc2fc8b5c4f926a8fe5dd4e3638c7
parent2e73a3f39e6a49c99ab29da61156f01489cb392a (diff)
downloadcpython-4303fcaa7d863a28e582694c7e6516ed22076e88.zip
cpython-4303fcaa7d863a28e582694c7e6516ed22076e88.tar.gz
cpython-4303fcaa7d863a28e582694c7e6516ed22076e88.tar.bz2
Merged revisions 82799 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82799 | georg.brandl | 2010-07-11 11:26:57 +0200 (So, 11 Jul 2010) | 1 line Fix typo. ........
-rw-r--r--Doc/whatsnew/2.7.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 86068f4..23d9971 100644
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -144,7 +144,7 @@ A partial list of 3.1 features that were backported to 2.7:
* Float-to-string and string-to-float conversions now round their
results more correctly, and :func:`repr` of a floating-point
number *x* returns a result that's guaranteed to round back to the
- same number when converted back to a string.
+ same number when converted back to a float.
* The :ctype:`PyCapsule` type, used to provide a C API for extension modules.
* The :cfunc:`PyLong_AsLongAndOverflow` C API function.