summaryrefslogtreecommitdiff
path: root/numpy/core/numeric.py
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2019-10-03 11:37:22 +0300
committerGitHub <noreply@github.com>2019-10-03 11:37:22 +0300
commitcacdf265755ffae9d5c07d35fafa3d1366e342b8 (patch)
tree98f1b7a085e07400fe89514decb0f8a2ede43aac /numpy/core/numeric.py
parente6db9ba115d93651ba61e25e6ec7cbe4ef627972 (diff)
parent61774458477d0761ddd76aaf84f4b063c7e57029 (diff)
downloadnumpy-cacdf265755ffae9d5c07d35fafa3d1366e342b8.tar.gz
Merge pull request #14596 from sethtroisi/old_defines_in_docs
DEP: Complete deprecation of invalid array/memory order
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 c395b1348..6d25f864b 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -523,7 +523,7 @@ def isfortran(a):
C-ordered arrays evaluate as False even if they are also FORTRAN-ordered.
- >>> np.isfortran(np.array([1, 2], order='FORTRAN'))
+ >>> np.isfortran(np.array([1, 2], order='F'))
False
"""
@@ -938,7 +938,7 @@ def tensordot(a, b, axes=2):
Returns
-------
output : ndarray
- The tensor dot product of the input.
+ The tensor dot product of the input.
See Also
--------