changeset 25580:c71d13bf2b63

maint: merge stable to default.
author Rik <rik@octave.org>
date Wed, 11 Jul 2018 08:41:10 -0700
parents 7d7970c7b3e8 (current diff) 07c2c42f457e (diff)
children 0df6454f58ea
files libinterp/corefcn/data.cc libinterp/corefcn/defaults.cc libinterp/corefcn/error.cc libinterp/corefcn/load-save.cc
diffstat 16 files changed, 19 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/plot.txi	Tue Jul 10 15:22:39 2018 -0700
+++ b/doc/interpreter/plot.txi	Wed Jul 11 08:41:10 2018 -0700
@@ -2251,7 +2251,7 @@
 @cindex contour series
 
 Contour group objects are created by the @code{contour}, @code{contourf}, and
-@code{contour3} functions.  The are also one of the handles returned by the
+@code{contour3} functions.  They are also one of the handles returned by the
 @code{surfc} and @code{meshc} functions.  The properties of the contour group
 are
 
--- a/examples/code/embedded.cc	Tue Jul 10 15:22:39 2018 -0700
+++ b/examples/code/embedded.cc	Wed Jul 11 08:41:10 2018 -0700
@@ -33,7 +33,7 @@
       //       exit (status);
       //     }
       //
-      // You may skip this step if you don't need to do do anything
+      // You may skip this step if you don't need to do anything
       // between reading the startup files and telling the interpreter
       // that you are ready to execute commands.
 
--- a/libinterp/corefcn/data.cc	Tue Jul 10 15:22:39 2018 -0700
+++ b/libinterp/corefcn/data.cc	Wed Jul 11 08:41:10 2018 -0700
@@ -2624,7 +2624,7 @@
 with multiple output arguments, @code{size} returns the size of dimension N
 in the Nth argument.  The number of rows, dimension 1, is returned in the
 first argument, the number of columns, dimension 2, is returned in the
-second argument, etc.  If there are more dimensions in @var{a} then there are
+second argument, etc.  If there are more dimensions in @var{a} than there are
 output arguments, @code{size} returns the total number of elements in the
 remaining dimensions in the final output argument.
 
--- a/libinterp/corefcn/defaults.cc	Tue Jul 10 15:22:39 2018 -0700
+++ b/libinterp/corefcn/defaults.cc	Wed Jul 11 08:41:10 2018 -0700
@@ -468,7 +468,7 @@
 
 DEFUN (OCTAVE_EXEC_HOME, args, ,
        doc: /* -*- texinfo -*-
-@deftypefn {} {} OCTAVE_HOME ()
+@deftypefn {} {} OCTAVE_EXEC_HOME ()
 Return the name of the top-level Octave installation directory for
 architecture-dependent files.  If not specified separately, the value
 is the same as OCTAVE_HOME@.  OCTAVE_EXEC_HOME corresponds to the
--- a/libinterp/corefcn/error.cc	Tue Jul 10 15:22:39 2018 -0700
+++ b/libinterp/corefcn/error.cc	Wed Jul 11 08:41:10 2018 -0700
@@ -1433,7 +1433,7 @@
 @deftypefnx {} {} warning (@var{warning_struct})
 @deftypefnx {} {@var{warning_struct} =} warning (@dots{})
 @deftypefnx {} {@var{mode_struct} =} warning (@var{state}, @var{mode})
-@deftypefnx {} {} warning (@var{mode_st})
+@deftypefnx {} {} warning (@var{mode_struct})
 
 Display a warning message or control the behavior of Octave's warning system.
 
--- a/libinterp/corefcn/hex2num.cc	Tue Jul 10 15:22:39 2018 -0700
+++ b/libinterp/corefcn/hex2num.cc	Wed Jul 11 08:41:10 2018 -0700
@@ -294,7 +294,7 @@
 @end group
 @end example
 
-With the optional second argument @qcode{"cell}, return a cell array of
+With the optional second argument @qcode{"cell"}, return a cell array of
 strings instead of a character array.
 @seealso{hex2num, hex2dec, dec2hex}
 @end deftypefn */)
--- a/libinterp/corefcn/load-save.cc	Tue Jul 10 15:22:39 2018 -0700
+++ b/libinterp/corefcn/load-save.cc	Wed Jul 11 08:41:10 2018 -0700
@@ -1802,8 +1802,8 @@
 that Octave will save when writing a crash dump file.
 
 The limit is measured in kilobytes and is applied to the top-level workspace.
-The name of the crash dump file is is specified by
-@var{octave_core_file_name}).
+The name of the crash dump file is specified by
+@var{octave_core_file_name}.
 
 If @var{octave_core_file_options} flags specify a binary format, then
 @var{octave_core_file_limit} will be approximately the maximum size of the
--- a/scripts/general/integral2.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/general/integral2.m	Wed Jul 11 08:41:10 2018 -0700
@@ -88,7 +88,7 @@
 ## @end example
 ##
 ## The result is a volume, which for this constant-value integrand, is just
-## @code{@var{Length} * @var{Width} x @var{Height}}.
+## @code{@var{Length} * @var{Width} * @var{Height}}.
 ##
 ## Example 2 : integrate a triangular region in x-y plane
 ##
--- a/scripts/general/integral3.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/general/integral3.m	Wed Jul 11 08:41:10 2018 -0700
@@ -89,7 +89,7 @@
 ## @end example
 ##
 ## For this constant-value integrand, the result is a volume which is just
-## @code{@var{Length} * @var{Width} x @var{Height}}.
+## @code{@var{Length} * @var{Width} * @var{Height}}.
 ##
 ## Example 2 : integrate over a spherical volume
 ##
--- a/scripts/general/quad2d.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/general/quad2d.m	Wed Jul 11 08:41:10 2018 -0700
@@ -93,7 +93,7 @@
 ## @end example
 ##
 ## The result is a volume, which for this constant-value integrand, is just
-## @code{@var{Length} * @var{Width} x @var{Height}}.
+## @code{@var{Length} * @var{Width} * @var{Height}}.
 ##
 ## Example 2 : integrate a triangular region in x-y plane
 ##
--- a/scripts/help/warning_ids.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/help/warning_ids.m	Wed Jul 11 08:41:10 2018 -0700
@@ -174,8 +174,7 @@
 ## If the @code{Octave:erase:chararray} warning is enabled then the erase
 ## function will issue a warning if the input pattern is a character array
 ## rather than a string or cell array of strings.
-## By default, the @code{Octave:eigs:UnconvergedEigenvalues} warning is
-## enabled.
+## By default, the @code{Octave:erase:chararray} warning is enabled.
 ##
 ## @item Octave:data-file-in-path
 ## If the @code{Octave:data-file-in-path} warning is enabled, a warning is
--- a/scripts/ode/decic.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/ode/decic.m	Wed Jul 11 08:41:10 2018 -0700
@@ -61,9 +61,9 @@
 ## compute the initial conditions.
 ##
 ## The function typically returns two outputs.  Variable @var{y0_new} is a
-## column vector and contains the consistent initial value of y.  The output
-## @var{yp0_new} is a column vector and contains the consistent initial value
-## of yp.
+## column vector and contains the consistent initial value of @var{y}.  The
+## output @var{yp0_new} is a column vector and contains the consistent initial
+## value of @var{yp}.
 ##
 ## The optional third output @var{resnorm} is the norm of the vector of
 ## residuals.  If @var{resnorm} is small, @code{decic} has successfully
--- a/scripts/optimization/lsqnonneg.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/optimization/lsqnonneg.m	Wed Jul 11 08:41:10 2018 -0700
@@ -36,7 +36,7 @@
 ## @var{x0} is an optional initial guess for the solution @var{x}.
 ##
 ## @var{options} is an options structure to change the behavior of the
-## algorithm (@pxref{XREFoptimset,,optimset}.  @code{lsqnonneg} recognizes
+## algorithm (@pxref{XREFoptimset,,optimset}).  @code{lsqnonneg} recognizes
 ## these options: @qcode{"MaxIter"}, @qcode{"TolX"}.
 ##
 ## Outputs:
--- a/scripts/optimization/pqpnonneg.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/optimization/pqpnonneg.m	Wed Jul 11 08:41:10 2018 -0700
@@ -36,7 +36,7 @@
 ## @var{x0} is an optional initial guess for the solution @var{x}.
 ##
 ## @var{options} is an options structure to change the behavior of the
-## algorithm (@pxref{XREFoptimset,,optimset}.  @code{pqpnonneg} recognizes
+## algorithm (@pxref{XREFoptimset,,optimset}).  @code{pqpnonneg} recognizes
 ## one option: @qcode{"MaxIter"}.
 ##
 ## Outputs:
--- a/scripts/sparse/bicg.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/sparse/bicg.m	Wed Jul 11 08:41:10 2018 -0700
@@ -142,7 +142,7 @@
 ## M1fun = @@(x, string) strcmp (string, "notransp") * (M1 \ x) + ...
 ##                      strcmp (string, "transp") * (M1' \ x);
 ## M2fun = @@(x, string) strcmp (string, "notransp") * (M2 \ x) + ...
-##                      strcmp (string, "transp") * (M2' \ x);;
+##                      strcmp (string, "transp") * (M2' \ x);
 ## @end group
 ## @end example
 ##
--- a/scripts/specfun/betaincinv.m	Tue Jul 10 15:22:39 2018 -0700
+++ b/scripts/specfun/betaincinv.m	Wed Jul 11 08:41:10 2018 -0700
@@ -55,7 +55,7 @@
 ## The variable @var{y} must be in the interval [0,1], while @var{a} and
 ## @var{b} must be real and strictly positive.
 ##
-## By default, @var{tail} is @qcode{"lower")} and the inverse of the incomplete
+## By default, @var{tail} is @qcode{"lower"} and the inverse of the incomplete
 ## beta function integrated from 0 to @var{x} is computed.  If @var{tail} is
 ## @qcode{"upper"} then the complementary function integrated from @var{x} to 1
 ## is inverted.