Author: stefan
Date: 2008-04-03 02:06:46 -0500 (Thu, 03 Apr 2008)
New Revision: 4955
Modified:
trunk/numpy/core/fromnumeric.py
Log:
Fix mean docstring.
Modified: trunk/numpy/core/fromnumeric.py
===================================================================
--- trunk/numpy/core/fromnumeric.py 2008-04-01 17:03:17 UTC (rev 4954)
+++ trunk/numpy/core/fromnumeric.py 2008-04-03 07:06:46 UTC (rev 4955)
@@ -1578,7 +1578,7 @@
Returns the average of the array elements. The average is taken
over the flattened array by default, otherwise over the specified
- axis. The dtype returned for integer type arrays is float
+ axis. The dtype returned for integer type arrays is float.
Parameters
----------
@@ -1587,9 +1587,9 @@
array, a conversion is attempted.
axis : {None, integer}, optional
Axis along which the means are computed. The default is to compute
- the standard deviation of the flattened array.
+ the mean of the flattened array.
dtype : {None, dtype}, optional
- Type to use in computing the means. For arrays of integer type the
+ Type to use in computing the mean. For arrays of integer type the
default is float32, for arrays of float types it is the same as the
array type.
out : {None, array}, optional
@@ -1605,8 +1605,7 @@
See Also
--------
- var : Variance
- std : Standard deviation
+ average : Weighted average
Notes
-----