summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-04-04 06:43:39 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-04-04 06:43:39 (GMT)
commitc9da90a74e0df57c8562723139d30adf78faac6f (patch)
tree344c946cc1379a11464db1f806567d7ec1b3035c
parent8de959252a9823d9f7014222118551d1f351a7f5 (diff)
downloadcpython-c9da90a74e0df57c8562723139d30adf78faac6f.zip
cpython-c9da90a74e0df57c8562723139d30adf78faac6f.tar.gz
cpython-c9da90a74e0df57c8562723139d30adf78faac6f.tar.bz2
Merged revisions 71123 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71123 | r.david.murray | 2009-04-04 02:39:56 -0400 (Sat, 04 Apr 2009) | 2 lines Fix error in description of 'oct' (issue 5678). ........
-rw-r--r--Doc/library/future_builtins.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/future_builtins.rst b/Doc/library/future_builtins.rst
index 6a1fdab..7ee7110 100644
--- a/Doc/library/future_builtins.rst
+++ b/Doc/library/future_builtins.rst
@@ -54,7 +54,7 @@ Available builtins are:
Works like the builtin :func:`oct`, but instead of :meth:`__oct__` it will
use the :meth:`__index__` method on its argument to get an integer that is
- then converted to hexadecimal.
+ then converted to octal.
.. function:: zip(*iterables)