Merged revisions 79873 via svnmerge from

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

................
  r79873 | mark.dickinson | 2010-04-06 23:13:37 +0100 (Tue, 06 Apr 2010) | 9 lines

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

  ........
    r79871 | mark.dickinson | 2010-04-06 23:10:55 +0100 (Tue, 06 Apr 2010) | 2 lines

    Use consistent spelling for nans (thanks Georg for noticing).
  ........
................

Doc/library/math.rst

@@ -303,9 +303,9 @@ Constants
    are some exceptions to this rule, for example ``pow(float('nan'), 0.0)`` or
    ``hypot(float('nan'), float('inf'))``.
 
-   Note that Python makes no effort to distinguish signaling nans from
-   quiet nans, and behavior for signaling nans remains unspecified.
-   Typical behavior is to treat all nans as though they were quiet.
+   Note that Python makes no effort to distinguish signaling NaNs from
+   quiet NaNs, and behavior for signaling NaNs remains unspecified.
+   Typical behavior is to treat all NaNs as though they were quiet.
 
 
 .. seealso::