summaryrefslogtreecommitdiff
path: root/doc/source/user
diff options
context:
space:
mode:
authorGerrit Holl <gerrit.holl@gmail.com>2018-01-25 16:31:16 +0000
committerGitHub <noreply@github.com>2018-01-25 16:31:16 +0000
commit531784bfb464a4d869c821d71bcc628a86f12eba (patch)
treea2d1d946e62c3d2ff0fa7fe52ef0668dba272468 /doc/source/user
parent9404833f9d3c5c02eae6713433a0db081a6f2572 (diff)
downloadnumpy-531784bfb464a4d869c821d71bcc628a86f12eba.tar.gz
DOC: Document A@B in Matlab/NumPy summary table
Document matrix multiplication syntax `A@B` in the summary table comparing Matlab and Python syntaxes.
Diffstat (limited to 'doc/source/user')
-rw-r--r--doc/source/user/numpy-for-matlab-users.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/source/user/numpy-for-matlab-users.rst b/doc/source/user/numpy-for-matlab-users.rst
index 00a627ac4..002a0c9c3 100644
--- a/doc/source/user/numpy-for-matlab-users.rst
+++ b/doc/source/user/numpy-for-matlab-users.rst
@@ -369,7 +369,7 @@ Linear Algebra Equivalents
- conjugate transpose of ``a``
* - ``a * b``
- - ``a.dot(b)``
+ - ``a.dot(b)`` or ``a@b`` (Python 3.5 or newer)
- matrix multiply
* - ``a .* b``