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).
........
diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index 4028cc4..38b2229 100644
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -333,9 +333,9 @@
    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.
 
    .. versionchanged:: 2.6
       Behavior in special cases now aims to follow C99 Annex F.  In earlier