summaryrefslogtreecommitdiffstats
path: root/Doc/library/math.rst
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-04-12 18:52:08 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-04-12 18:52:08 (GMT)
commit18628400375cb14130fde1502bd646e997b9a6de (patch)
treee549efc8cbd8e83675a5c6a4449cc7c49af3c8e9 /Doc/library/math.rst
parentf3ff883172ee74b2bab1cff82ae4855c477615aa (diff)
downloadcpython-18628400375cb14130fde1502bd646e997b9a6de.zip
cpython-18628400375cb14130fde1502bd646e997b9a6de.tar.gz
cpython-18628400375cb14130fde1502bd646e997b9a6de.tar.bz2
More NaN consistency fixes (manual merge of r79875 to release31-maint).
Diffstat (limited to 'Doc/library/math.rst')
-rw-r--r--Doc/library/math.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/math.rst b/Doc/library/math.rst
index 38bdc46..c760701 100644
--- a/Doc/library/math.rst
+++ b/Doc/library/math.rst
@@ -297,9 +297,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'))``.