# HG changeset patch
# User Rik <rik@octave.org>
# Date 1513985536 28800
# Node ID 6558d0d3fdac9b8e00be3ca61097b90826b07f03
# Parent  4827cbef0949b2cd5bb39d6d7c588aaa8dd5ce05# Parent  b9d482dd90f32c78d544125ec063dbd88c6da476
maint: merge stable to default.

diff -r 4827cbef0949 -r 6558d0d3fdac doc/interpreter/expr.txi
--- a/doc/interpreter/expr.txi	Wed Dec 20 20:10:10 2017 +0100
+++ b/doc/interpreter/expr.txi	Fri Dec 22 15:32:16 2017 -0800
@@ -134,17 +134,17 @@
 @node Advanced Indexing
 @subsection Advanced Indexing
 
-An array with @samp{n} dimensions can be indexed using @samp{m}
+An array with @samp{nd} dimensions can be indexed using @samp{m}
 indices.  More generally, the set of index tuples determining the
 result is formed by the Cartesian product of the index vectors (or
 ranges or scalars).
 
-For the ordinary and most common case, @w{@code{m == n}}, and each
-index corresponds to its respective dimension.  If @w{@code{m < n}}
-and every index is less than the size of the array in the
-@math{i^{th}} dimension, @code{m(i) < n(i)}, then the index expression
-is padded with trailing singleton dimensions (@code{[ones (m-n, 1)]}).
-If @w{@code{m < n}} but one of the indices @code{m(i)} is outside the
+For the ordinary and most common case, @w{@code{m == nd}}, and each
+index corresponds to its respective dimension.  If @w{@code{m < nd}},
+and every index is less than the size of the array in the @math{i^{th}}
+dimension (@code{m(i) < size (@var{array}, i)}), then the index expression
+is padded with @w{@code{n - m}} trailing singleton dimensions. 
+If @w{@code{m < nd}} but one of the indices @code{m(i)} is outside the
 size of the current array, then the last @w{@code{n-m+1}} dimensions
 are folded into a single dimension with an extent equal to the product
 of extents of the original dimensions.  This is easiest to understand
@@ -535,8 +535,7 @@
 @item @var{x} * @var{y}
 @opindex *
 Matrix multiplication.  The number of columns of @var{x} must agree with
-the number of rows of @var{y}, or they must be broadcastable to the same
-shape.
+the number of rows of @var{y}.
 
 @item @var{x} .* @var{y}
 @opindex .*
diff -r 4827cbef0949 -r 6558d0d3fdac scripts/plot/draw/ezmesh.m
--- a/scripts/plot/draw/ezmesh.m	Wed Dec 20 20:10:10 2017 +0100
+++ b/scripts/plot/draw/ezmesh.m	Fri Dec 22 15:32:16 2017 -0800
@@ -32,8 +32,8 @@
 ## @code{-2*pi <= @var{x} | @var{y} <= 2*pi} with 60 points in each dimension.
 ##
 ## If three functions are passed, then plot the parametrically defined
-## function @code{[@var{fx} (@var{s}, @var{t}), @var{fy} (@var{s}, @var{t}),
-## @var{fz} (@var{s}, @var{t})]}.
+## function @code{[@var{fx}(@var{s}, @var{t}), @var{fy}(@var{s}, @var{t}),
+## @var{fz}(@var{s}, @var{t})]}.
 ##
 ## If @var{dom} is a two element vector, it represents the minimum and maximum
 ## values of both @var{x} and @var{y}.  If @var{dom} is a four element vector,
diff -r 4827cbef0949 -r 6558d0d3fdac scripts/plot/draw/ezmeshc.m
--- a/scripts/plot/draw/ezmeshc.m	Wed Dec 20 20:10:10 2017 +0100
+++ b/scripts/plot/draw/ezmeshc.m	Fri Dec 22 15:32:16 2017 -0800
@@ -32,8 +32,8 @@
 ## @code{-2*pi <= @var{x} | @var{y} <= 2*pi} with 60 points in each dimension.
 ##
 ## If three functions are passed, then plot the parametrically defined
-## function @code{[@var{fx} (@var{s}, @var{t}), @var{fy} (@var{s}, @var{t}),
-## @var{fz} (@var{s}, @var{t})]}.
+## function @code{[@var{fx}(@var{s}, @var{t}), @var{fy}(@var{s}, @var{t}),
+## @var{fz}(@var{s}, @var{t})]}.
 ##
 ## If @var{dom} is a two element vector, it represents the minimum and maximum
 ## values of both @var{x} and @var{y}.  If @var{dom} is a four element vector,
diff -r 4827cbef0949 -r 6558d0d3fdac scripts/plot/draw/ezsurf.m
--- a/scripts/plot/draw/ezsurf.m	Wed Dec 20 20:10:10 2017 +0100
+++ b/scripts/plot/draw/ezsurf.m	Fri Dec 22 15:32:16 2017 -0800
@@ -32,8 +32,8 @@
 ## @code{-2*pi <= @var{x} | @var{y} <= 2*pi} with 60 points in each dimension.
 ##
 ## If three functions are passed, then plot the parametrically defined
-## function @code{[@var{fx} (@var{s}, @var{t}), @var{fy} (@var{s}, @var{t}),
-## @var{fz} (@var{s}, @var{t})]}.
+## function @code{[@var{fx}(@var{s}, @var{t}), @var{fy}(@var{s}, @var{t}),
+## @var{fz}(@var{s}, @var{t})]}.
 ##
 ## If @var{dom} is a two element vector, it represents the minimum and maximum
 ## values of both @var{x} and @var{y}.  If @var{dom} is a four element vector,
diff -r 4827cbef0949 -r 6558d0d3fdac scripts/plot/draw/ezsurfc.m
--- a/scripts/plot/draw/ezsurfc.m	Wed Dec 20 20:10:10 2017 +0100
+++ b/scripts/plot/draw/ezsurfc.m	Fri Dec 22 15:32:16 2017 -0800
@@ -32,8 +32,8 @@
 ## @code{-2*pi <= @var{x} | @var{y} <= 2*pi} with 60 points in each dimension.
 ##
 ## If three functions are passed, then plot the parametrically defined
-## function @code{[@var{fx} (@var{s}, @var{t}), @var{fy} (@var{s}, @var{t}),
-## @var{fz} (@var{s}, @var{t})]}.
+## function @code{[@var{fx}(@var{s}, @var{t}), @var{fy}(@var{s}, @var{t}),
+## @var{fz}(@var{s}, @var{t})]}.
 ##
 ## If @var{dom} is a two element vector, it represents the minimum and maximum
 ## values of both @var{x} and @var{y}.  If @var{dom} is a four element vector,