Merged revisions 82478 via svnmerge from

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

................
  r82478 | mark.dickinson | 2010-07-03 10:17:16 +0100 (Sat, 03 Jul 2010) | 9 lines

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

  ........
    r82476 | mark.dickinson | 2010-07-03 10:15:09 +0100 (Sat, 03 Jul 2010) | 1 line

    Fix typo in sys.float_info docs.
  ........
................

Doc/library/sys.rst

@@ -233,7 +233,7 @@ always available.
    +---------------------+----------------+--------------------------------------------------+
    | attribute           | float.h macro  | explanation                                      |
    +=====================+================+==================================================+
-   | :const:`epsilon`    | DBL_MAX        | difference between 1 and the least value greater |
+   | :const:`epsilon`    | DBL_EPSILON    | difference between 1 and the least value greater |
    |                     |                | than 1 that is representable as a float          |
    +---------------------+----------------+--------------------------------------------------+
    | :const:`dig`        | DBL_DIG        | maximum number of decimal digits that can be     |