Mercurial > octave

changeset 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 84fa2ba414ee
children 01f703952eff
files doc/ChangeLog doc/interpreter/expr.txi
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog	Sun Jan 16 18:31:25 2011 -0500
+++ b/doc/ChangeLog	Sat Jan 15 15:13:06 2011 -0800
@@ -1,6 +1,10 @@
 2011-01-15  Rik  <octave@nomad.inbox5.com>
 
-	* doc/interpreter/func.txi, doc/interpreter/intro.txi: Eliminate
+	* interpreter/expr.txi: Add merge/ifelse function to documentation.
+
+2011-01-15  Rik  <octave@nomad.inbox5.com>
+
+	* interpreter/func.txi, interpreter/intro.txi: Eliminate
 	@deffn macros.
 
 2011-01-15  Rik  <octave@nomad.inbox5.com>
--- a/doc/interpreter/expr.txi	Sun Jan 16 18:31:25 2011 -0500
+++ b/doc/interpreter/expr.txi	Sat Jan 15 15:13:06 2011 -0800
@@ -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