summaryrefslogtreecommitdiff
path: root/doc/source/reference/ufuncs.rst
diff options
context:
space:
mode:
Diffstat (limited to 'doc/source/reference/ufuncs.rst')
-rw-r--r--doc/source/reference/ufuncs.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/source/reference/ufuncs.rst b/doc/source/reference/ufuncs.rst
index a97534612..f14a2c168 100644
--- a/doc/source/reference/ufuncs.rst
+++ b/doc/source/reference/ufuncs.rst
@@ -333,8 +333,8 @@ advanced usage and will not typically be used.
with previous versions of NumPy, this defaults to 'unsafe' for numpy < 1.7.
In numpy 1.7 a transition to 'same_kind' was begun where ufuncs produce a
DeprecationWarning for calls which are allowed under the 'unsafe'
- rules, but not under the 'same_kind' rules. In numpy 1.10 the default
- will be 'same_kind'.
+ rules, but not under the 'same_kind' rules. From numpy 1.10 and
+ onwards, the default is 'same_kind'.
*order*