Mercurial > octave
changeset 23133:03736526b6d8
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Wed, 01 Feb 2017 20:41:45 -0800 |
parents | 3ade23e8fdc7 (current diff) 0f2582425a9e (diff) |
children | be2654b2f34f |
files | doc/interpreter/oop.txi |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/oop.txi Wed Feb 01 17:05:06 2017 -0500 +++ b/doc/interpreter/oop.txi Wed Feb 01 20:41:45 2017 -0800 @@ -516,7 +516,7 @@ @item @code{a - b} @tab @code{minus (a, b)} @tab Binary subtraction @item @code{+a} @tab @code{uplus (a)} @tab Unary addition @item @code{-a} @tab @code{uminus (a)} @tab Unary subtraction -@item @code{a.* b} @tab @code{times (a, b)} @tab Element-wise multiplication +@item @code{a .* b} @tab @code{times (a, b)} @tab Element-wise multiplication @item @code{a * b} @tab @code{mtimes (a, b)} @tab Matrix multiplication @item @code{a ./ b} @tab @code{rdivide (a, b)} @tab Element-wise right division @item @code{a / b} @tab @code{mrdivide (a, b)} @tab Matrix right division @@ -532,7 +532,7 @@ @item @code{a != b} @tab @code{ne (a, b)} @tab Not equal to @item @code{a & b} @tab @code{and (a, b)} @tab Logical and @item @code{a | b} @tab @code{or (a, b)} @tab Logical or -@item @code{!b} @tab @code{not (a)} @tab Logical not +@item @code{!a} @tab @code{not (a)} @tab Logical not @item @code{a'} @tab @code{ctranspose (a)} @tab Complex conjugate transpose @item @code{a.'} @tab @code{transpose (a)} @tab Transpose @item @code{a:b} @tab @code{colon (a, b)} @tab Two element range