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).
........

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)