summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
authorStefan Peterson <stefan.peterson@rubico.com>2017-04-04 10:58:20 +0200
committerStefan Peterson <stefan.peterson@rubico.com>2017-04-05 10:01:41 +0200
commit8427866e4fb038f8d3af317e04a9cc9808bea8ca (patch)
treef5580babd3012477127552d31f9a476a59185337 /numpy/core/numeric.py
parentc4f1dec9ff47134840109fa719719a73a9ca79be (diff)
downloadnumpy-8427866e4fb038f8d3af317e04a9cc9808bea8ca.tar.gz
DOC: Fix for issues #7622 and #7914
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r--numpy/core/numeric.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 632266310..c89b4097a 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -2145,8 +2145,8 @@ def fromfunction(function, shape, **kwargs):
The function is called with N parameters, where N is the rank of
`shape`. Each parameter represents the coordinates of the array
varying along a specific axis. For example, if `shape`
- were ``(2, 2)``, then the parameters in turn be (0, 0), (0, 1),
- (1, 0), (1, 1).
+ were ``(2, 2)``, then the parameters would be
+ ``array([[0, 0], [1, 1]])`` and ``array([[0, 1], [0, 1]])``
shape : (N,) tuple of ints
Shape of the output array, which also determines the shape of
the coordinate arrays passed to `function`.