diff options
author | Nathaniel J. Smith <njs@pobox.com> | 2016-01-14 17:27:40 -0800 |
---|---|---|
committer | Nathaniel J. Smith <njs@pobox.com> | 2016-01-14 17:27:40 -0800 |
commit | c0f6c3744ff6a54d4e9be5a98aa2d4253f537f49 (patch) | |
tree | 89fda1d32d9dfb8523711c9b7154ffd5410c5351 /doc | |
parent | 4b82b1bba72ef7539c06a4577b7102da9564ca02 (diff) | |
download | numpy-c0f6c3744ff6a54d4e9be5a98aa2d4253f537f49.tar.gz |
DOC: Clean up/fix several references to the "future" 1.10 release
Fixes gh-7010
Diffstat (limited to 'doc')
-rw-r--r-- | doc/source/reference/ufuncs.rst | 4 |
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* |