summaryrefslogtreecommitdiff
path: root/numpy/add_newdocs.py
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2015-08-29 18:16:52 +0300
committerPauli Virtanen <pav@iki.fi>2015-08-29 18:20:06 +0300
commit3a52e1942aac937e8ae8381f9ea519b9328fd052 (patch)
tree45213b57444d5c8d232207688e5b9682bcdb1a83 /numpy/add_newdocs.py
parentda0a4dc64708cf9082f67a6a06ce00a26235a9b1 (diff)
downloadnumpy-3a52e1942aac937e8ae8381f9ea519b9328fd052.tar.gz
DOC: update docs + release notes vs shares_memory
Diffstat (limited to 'numpy/add_newdocs.py')
-rw-r--r--numpy/add_newdocs.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/add_newdocs.py b/numpy/add_newdocs.py
index 0af053f89..607e28a28 100644
--- a/numpy/add_newdocs.py
+++ b/numpy/add_newdocs.py
@@ -3796,9 +3796,8 @@ add_newdoc('numpy.core.multiarray', 'shares_memory',
Input arrays
max_work : int, optional
Effort to spend on solving the overlap problem (maximum number
- of candidate solutions to consider). Note max_work=1 handles
- most usual cases. In addition, the following special values
- are recognized:
+ of candidate solutions to consider). The following special
+ values are recognized:
max_work=MAY_SHARE_EXACT (default)
The problem is solved exactly. In this case, the function returns