diff options
| author | seberg <sebastian@sipsolutions.net> | 2014-01-29 04:36:19 -0800 |
|---|---|---|
| committer | seberg <sebastian@sipsolutions.net> | 2014-01-29 04:36:19 -0800 |
| commit | 0a2be83023ee59c13f16410712129e26716bf4df (patch) | |
| tree | edf2c65207808bd652d25df7295bc092e5855000 | |
| parent | c159cb078b4069ba8fdeddedb0ee7f01dd0656d2 (diff) | |
| parent | b58a854359d06dd5a61cf236c328a2aefc8ecce4 (diff) | |
| download | numpy-0a2be83023ee59c13f16410712129e26716bf4df.tar.gz | |
Merge pull request #4239 from astaric/documentation_fix
DOC: Fix description of ma.average parameter.
| -rw-r--r-- | numpy/ma/extras.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py index d14812093..058bde710 100644 --- a/numpy/ma/extras.py +++ b/numpy/ma/extras.py @@ -448,8 +448,8 @@ def average(a, axis=None, weights=None, returned=False): Data to be averaged. Masked entries are not taken into account in the computation. axis : int, optional - Axis along which the variance is computed. The default is to compute - the variance of the flattened array. + Axis along which the average is computed. The default is to compute + the average of the flattened array. weights : array_like, optional The importance that each element has in the computation of the average. The weights array can either be 1-D (in which case its length must be |