[Python-checkins] r80011 - in python/branches/release26-maint: Doc/library/math.rst

[mark.dickinson]

Author: mark.dickinson
Date: Mon Apr 12 20:43:56 2010
New Revision: 80011

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

........
  r79875 | mark.dickinson | 2010-04-06 23:18:23 +0100 (Tue, 06 Apr 2010) | 1 line
  
  More NaN consistency doc fixes.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Doc/library/math.rst

Modified: python/branches/release26-maint/Doc/library/math.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/math.rst	(original)
+++ python/branches/release26-maint/Doc/library/math.rst	Mon Apr 12 20:43:56 2010
@@ -327,9 +327,9 @@
    :exc:`ValueError` for invalid operations like ``sqrt(-1.0)`` or ``log(0.0)``
    (where C99 Annex F recommends signaling invalid operation or divide-by-zero),
    and :exc:`OverflowError` for results that overflow (for example,
-   ``exp(1000.0)``).  A *NaN* will not be returned from any of the functions
-   above unless one or more of the input arguments was a *NaN*; in that case,
-   most functions will return a *NaN*, but (again following C99 Annex F) there
+   ``exp(1000.0)``).  A NaN will not be returned from any of the functions
+   above unless one or more of the input arguments was a NaN; in that case,
+   most functions will return a NaN, but (again following C99 Annex F) there
    are some exceptions to this rule, for example ``pow(float('nan'), 0.0)`` or
    ``hypot(float('nan'), float('inf'))``.