summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrés Delfino <adelfino@gmail.com>2018-06-15 19:23:00 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2018-06-15 19:23:00 (GMT)
commit695118600fecaa7b95634e168ad7cbbc561fd1ec (patch)
tree0a68c3eb8017cb583cbccbbb35e79f60788cafb7
parent4fddd4e4069aad9efad999d8d9ce3cd9fb523a5c (diff)
downloadcpython-695118600fecaa7b95634e168ad7cbbc561fd1ec.zip
cpython-695118600fecaa7b95634e168ad7cbbc561fd1ec.tar.gz
cpython-695118600fecaa7b95634e168ad7cbbc561fd1ec.tar.bz2
bpo-33847: Add '@' operator entry to index (GH-7669)
-rw-r--r--Doc/reference/expressions.rst4
-rw-r--r--Misc/NEWS.d/next/Documentation/2018-06-15-14-58-45.bpo-33847.IIDp6t.rst1
2 files changed, 4 insertions, 1 deletions
diff --git a/Doc/reference/expressions.rst b/Doc/reference/expressions.rst
index 61bc912..17f1f2c 100644
--- a/Doc/reference/expressions.rst
+++ b/Doc/reference/expressions.rst
@@ -1139,7 +1139,9 @@ the other must be a sequence. In the former case, the numbers are converted to a
common type and then multiplied together. In the latter case, sequence
repetition is performed; a negative repetition factor yields an empty sequence.
-.. index:: single: matrix multiplication
+.. index::
+ single: matrix multiplication
+ operator: @
The ``@`` (at) operator is intended to be used for matrix multiplication. No
builtin Python types implement this operator.
diff --git a/Misc/NEWS.d/next/Documentation/2018-06-15-14-58-45.bpo-33847.IIDp6t.rst b/Misc/NEWS.d/next/Documentation/2018-06-15-14-58-45.bpo-33847.IIDp6t.rst
new file mode 100644
index 0000000..3c7e0cd
--- /dev/null
+++ b/Misc/NEWS.d/next/Documentation/2018-06-15-14-58-45.bpo-33847.IIDp6t.rst
@@ -0,0 +1 @@
+Add '@' operator entry to index.