summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNathaniel J. Smith <njs@pobox.com>2014-03-18 18:13:19 +0000
committerNathaniel J. Smith <njs@pobox.com>2014-03-18 18:13:19 +0000
commit1d884dd4425cae52c4558c354c39908800741f59 (patch)
tree9a49c9da22151bd06d1d6f8be86a032b54a3dd27 /doc
parent0e933e6ccb3d273e09d7cbcebf4ee6d7467a0085 (diff)
downloadnumpy-1d884dd4425cae52c4558c354c39908800741f59.tar.gz
fix PEP headers to placate PEP-0000 builder, mention Julia in notation section, and remove stray ^^ operator left over from the @@ purge
Diffstat (limited to 'doc')
-rw-r--r--doc/neps/return-of-revenge-of-matmul-pep.rst16
1 files changed, 8 insertions, 8 deletions
diff --git a/doc/neps/return-of-revenge-of-matmul-pep.rst b/doc/neps/return-of-revenge-of-matmul-pep.rst
index 861c7663b..d9a910b75 100644
--- a/doc/neps/return-of-revenge-of-matmul-pep.rst
+++ b/doc/neps/return-of-revenge-of-matmul-pep.rst
@@ -5,9 +5,9 @@ Last-Modified: $Date$
Author: Nathaniel J. Smith <njs@pobox.com>
Status: Draft
Type: Standards Track
-Python-Version: 3.5
Content-Type: text/x-rst
Created: 20-Feb-2014
+Python-Version: 3.5
Post-History: 13-Mar-2014
Abstract
@@ -833,12 +833,12 @@ one is the special case.
Finally, there is the option of using multi-character tokens. Some
options:
-* Matlab uses a ``.*`` operator. Aside from being visually confusable
- with ``*``, this would be a terrible choice for us because in
- Matlab, ``*`` means matrix multiplication and ``.*`` means
- elementwise multiplication, so using ``.*`` for matrix
- multiplication would make us exactly backwards from what Matlab
- users expect.
+* Matlab and Julia use a ``.*`` operator. Aside from being visually
+ confusable with ``*``, this would be a terrible choice for us
+ because in Matlab and Julia, ``*`` means matrix multiplication and
+ ``.*`` means elementwise multiplication, so using ``.*`` for matrix
+ multiplication would make us exactly backwards from what Matlab and
+ Julia users expect.
* APL apparently used ``+.×``, which by combining a multi-character
token, confusing attribute-access-like . syntax, and a unicode
@@ -863,7 +863,7 @@ options:
``[*]`` or ``|*|`` (but when used in context, the use of vertical
grouping symbols tends to recreate the nested parentheses visual
clutter that was noted as one of the major downsides of the function
- syntax we're trying to get away from); ``^*`` and ``^^``.
+ syntax we're trying to get away from); ``^*``.
So, it doesn't matter much, but ``@`` seems as good or better than any
of the alternatives: