Mercurial > octave-nkf
changeset 14809:2e2a336c6b48
maint: periodic merge of stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 26 Jun 2012 16:50:35 -0400 |
| parents | 616981c9907c (current diff) f06a16021024 (diff) |
| children | d40349493d87 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/oop.txi Tue Jun 26 16:25:13 2012 -0400 +++ b/doc/interpreter/oop.txi Tue Jun 26 16:50:35 2012 -0400 @@ -549,7 +549,7 @@ & $a >= b$ && ge (a, b) && Greater than or equal to operator&\cr & $a == b$ && eq (a, b) && Equal to operator&\cr & $a != b$ && ne (a, b) && Not equal to operator&\cr -& $a & b$ && and (a, b) && Logical and operator&\cr +& $a \& b$ && and (a, b) && Logical and operator&\cr & $a | b$ && or (a, b) && Logical or operator&\cr & $! b$ && not (a) && Logical not operator&\cr & $a'$ && ctranspose (a) && Complex conjugate transpose operator &\cr @@ -586,7 +586,7 @@ @item @tab a >= b @tab ge (a, b) @tab Greater than or equal to operator @tab @item @tab a == b @tab eq (a, b) @tab Equal to operator @tab @item @tab a != b @tab ne (a, b) @tab Not equal to operator @tab -@item @tab a \& b @tab and (a, b) @tab Logical and operator @tab +@item @tab a & b @tab and (a, b) @tab Logical and operator @tab @item @tab a | b @tab or (a, b) @tab Logical or operator @tab @item @tab ! b @tab not (a) @tab Logical not operator @tab @item @tab a' @tab ctranspose (a) @tab Complex conjugate transpose operator @tab