Mercurial > hg > octave-lyh

diff doc/interpreter/expr.txi @ 11552:6b6e9051ecb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add merge/ifelse function to documentation.
author Rik <octave@nomad.inbox5.com>
date Sat, 15 Jan 2011 15:13:06 -0800
parents fd0a3ac60b0e
children f60f755ebfe4
line wrap: on
line diff
--- a/doc/interpreter/expr.txi
+++ b/doc/interpreter/expr.txi
@@ -910,7 +910,7 @@
 The ternary operator (?:) is not supported in Octave.  If short-circuiting is
 not important, it can be replaced by the @code{ifelse} function.
 
-@DOCSTRING(ifelse)
+@DOCSTRING(merge)
 
 @node Assignment Ops
 @section Assignment Expressions