Merged revisions 75207 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75207 | mark.dickinson | 2009-10-03 11:18:40 +0100 (Sat, 03 Oct 2009) | 9 lines

  Merged revisions 75205 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r75205 | mark.dickinson | 2009-10-03 11:14:34 +0100 (Sat, 03 Oct 2009) | 2 lines

    Issue #7028:  Add note to hex() builtin docs pointing to float.hex().
  ........
................

Doc/library/functions.rst

@@ -489,6 +489,11 @@ are always available.  They are listed here in alphabetical order.
    expression.  If *x* is not a Python :class:`int` object, it has to define an
    :meth:`__index__` method that returns an integer.
 
+   .. note::
+
+      To obtain a hexadecimal string representation for a float, use the
+      :meth:`float.hex` method.
+
 
 .. function:: id(object)