# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1295133186 28800
# Node ID 6b6e9051ecb857cc4c736dc2f2ef1ed10c643b18
# Parent  84fa2ba414eecf8d60e5a9fa1c84bce8b6206e16
Add merge/ifelse function to documentation.

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -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>
diff --git a/doc/interpreter/expr.txi b/doc/interpreter/expr.txi
--- 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