summaryrefslogtreecommitdiff
path: root/numpy/lib/nanfunctions.py
diff options
context:
space:
mode:
authorEric Wieser <wieser.eric@gmail.com>2017-04-19 18:40:40 +0100
committerEric Wieser <wieser.eric@gmail.com>2017-04-19 18:42:12 +0100
commit871bd932dcea92891fbbc2edc1ec1246c9394170 (patch)
tree89981a8e916d34757feae8ac27abd0827926ecb9 /numpy/lib/nanfunctions.py
parentf031cdf83593907431ca2666d8484cb1c36315bd (diff)
parent3b2a7a761d5ceef3b9dcca3fff10380cb7a6f976 (diff)
downloadnumpy-871bd932dcea92891fbbc2edc1ec1246c9394170.tar.gz
Merge remote-tracking branch 'upstream/master' into remove-setslice
Diffstat (limited to 'numpy/lib/nanfunctions.py')
-rw-r--r--numpy/lib/nanfunctions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/nanfunctions.py b/numpy/lib/nanfunctions.py
index 9b9df77c3..c96e925aa 100644
--- a/numpy/lib/nanfunctions.py
+++ b/numpy/lib/nanfunctions.py
@@ -1070,8 +1070,8 @@ def nanpercentile(a, q, axis=None, out=None, overwrite_input=False,
Notes
-----
Given a vector ``V`` of length ``N``, the ``q``-th percentile of
- ``V`` is the value ``q/100`` of the way from the mimumum to the
- maximum in in a sorted copy of ``V``. The values and distances of
+ ``V`` is the value ``q/100`` of the way from the minimum to the
+ maximum in a sorted copy of ``V``. The values and distances of
the two nearest neighbors as well as the `interpolation` parameter
will determine the percentile if the normalized ranking does not
match the location of ``q`` exactly. This function is the same as