diff options
| author | Eric Wieser <wieser.eric@gmail.com> | 2017-04-06 11:14:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 11:14:00 +0100 |
| commit | aa746c68d092022df0952e43b29ca4abe092d03b (patch) | |
| tree | 38488b60714bd99330384d1846c03b365991c6a6 /numpy/add_newdocs.py | |
| parent | eb12b7106fb2962167627af21bc0bef24f6f650d (diff) | |
| parent | 8427866e4fb038f8d3af317e04a9cc9808bea8ca (diff) | |
| download | numpy-aa746c68d092022df0952e43b29ca4abe092d03b.tar.gz | |
Merge pull request #8890 from sjpet/documentation-issues
DOC: fixes #7622 and #7914
Diffstat (limited to 'numpy/add_newdocs.py')
| -rw-r--r-- | numpy/add_newdocs.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py index ca735cbc2..6e859bd90 100644 --- a/numpy/add_newdocs.py +++ b/numpy/add_newdocs.py @@ -1452,8 +1452,8 @@ add_newdoc('numpy.core.multiarray', 'where', condition : array_like, bool When True, yield `x`, otherwise yield `y`. x, y : array_like, optional - Values from which to choose. `x` and `y` need to have the same - shape as `condition`. + Values from which to choose. `x`, `y` and `condition` need to be + broadcastable to some shape. Returns ------- |