From b30da1277f4157fe2b7c9774d0629297f00dd016 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 12 Apr 2010 18:43:56 +0000 Subject: [PATCH] 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. ........ --- Doc/library/math.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/math.rst b/Doc/library/math.rst index 38b22293f99..c85862a866a 100644 --- a/Doc/library/math.rst +++ b/Doc/library/math.rst @@ -327,9 +327,9 @@ Constants :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'))``.