summaryrefslogtreecommitdiff
path: root/numpy/core/fromnumeric.py
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2008-04-26 15:34:37 +0000
committerPauli Virtanen <pav@iki.fi>2008-04-26 15:34:37 +0000
commitba40bc530f9c6c0864cdf61a127d29644ca86cc2 (patch)
tree04ad8cac32da82b05ab96e64bb9571be939c345f /numpy/core/fromnumeric.py
parenta7c3802ecc5261e28ec109ebbe836592730d53a4 (diff)
downloadnumpy-ba40bc530f9c6c0864cdf61a127d29644ca86cc2.tar.gz
Docstrings in fromnumeric: very small fixes.
Diffstat (limited to 'numpy/core/fromnumeric.py')
-rw-r--r--numpy/core/fromnumeric.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index b0b186962..d41b8f52f 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -892,7 +892,7 @@ def clip(a, a_min, a_max):
Parameters
----------
- a : {array_type}
+ a : {array_like}
Array containing elements to clip.
a_min
Minimum value
@@ -901,7 +901,7 @@ def clip(a, a_min, a_max):
Returns
-------
- sum_along_axis : {array}
+ clipped_array : {array}
A new array whose elements are same as for a, but values
< a_min are replaced with a_min, and > a_max with a_max.
@@ -1115,7 +1115,7 @@ def all(a,axis=None, out=None):
a : {array_like}
axis : {None, integer}
Axis to perform the operation over.
- If None, perform over flattened array.
+ If None, perform over flattened array and return a scalar.
out : {None, array}, optional
Array into which the product can be placed. Its type is preserved
and it must be of the right shape to hold the output.