changeset 24441:9fbb5de78ec7

maint: merge stable to default.
author Rik <rik@octave.org>
date Thu, 21 Dec 2017 03:45:09 -0800
parents 1df2cb3aa251 (current diff) f8bbaacefc33 (diff)
children 98a03a1097b4
files doc/interpreter/container.txi doc/interpreter/var.txi libinterp/corefcn/data.cc libinterp/corefcn/error.cc libinterp/corefcn/qz.cc libinterp/corefcn/strfns.cc scripts/miscellaneous/setfield.m
diffstat 7 files changed, 18 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/container.txi	Thu Dec 21 03:06:12 2017 -0800
+++ b/doc/interpreter/container.txi	Thu Dec 21 03:45:09 2017 -0800
@@ -258,7 +258,7 @@
 @end example
 
 @noindent
-which creates a 2-by-1 structure array with two fields.  Another way
+which creates a 1-by-2 structure array with two fields.  Another way
 to create a structure array is with the @code{struct} function
 (@pxref{Creating Structures}).  As previously, to print the value of
 the structure array, you can type its name:
--- a/doc/interpreter/var.txi	Thu Dec 21 03:06:12 2017 -0800
+++ b/doc/interpreter/var.txi	Thu Dec 21 03:45:09 2017 -0800
@@ -312,10 +312,10 @@
 @example
 @group
 str = "A random string";
-who -variables
-     @print{} *** local user variables:
-     @print{}
-     @print{} __nargin__  str
+who
+ @print{} Variables in the current scope:
+ @print{}
+ @print{} ans  str
 @end group
 @end example
 
--- a/libinterp/corefcn/data.cc	Thu Dec 21 03:06:12 2017 -0800
+++ b/libinterp/corefcn/data.cc	Thu Dec 21 03:45:09 2017 -0800
@@ -3226,9 +3226,9 @@
 @w{@code{@var{x} + 0i}}.
 
 With 2 real arguments, return the complex result
-@w{@code{@var{re} + @var{im}}}.
+@w{@code{@var{re} + @var{im}i}}.
 @code{complex} can often be more convenient than expressions such as
-@w{@code{a + i*b}}.
+@w{@code{a + b*i}}.
 For example:
 
 @example
--- a/libinterp/corefcn/error.cc	Thu Dec 21 03:06:12 2017 -0800
+++ b/libinterp/corefcn/error.cc	Thu Dec 21 03:45:09 2017 -0800
@@ -1456,7 +1456,8 @@
 The optional warning identifier @var{id} allows users to enable or disable
 warnings tagged by this identifier.  A message identifier is a string of the
 form @qcode{"NAMESPACE:WARNING-NAME"}.  Octave's own warnings use the
-@qcode{"Octave"} namespace (@pxref{XREFwarning_ids}).  For example:
+@qcode{"Octave"} namespace (@pxref{XREFwarning_ids,,warning_ids}).  For
+example:
 
 @example
 @group
--- a/libinterp/corefcn/qz.cc	Thu Dec 21 03:06:12 2017 -0800
+++ b/libinterp/corefcn/qz.cc	Thu Dec 21 03:45:09 2017 -0800
@@ -227,7 +227,7 @@
 @end enumerate
 
 Note: @code{qz} performs permutation balancing, but not scaling
-(@pxref{XREFbalance}), which may be lead to less accurate results than
+(@pxref{XREFbalance,,balance}), which may be lead to less accurate results than
 @code{eig}.  The order of output arguments was selected for compatibility with
 @sc{matlab}.
 @seealso{eig, balance, lu, chol, hess, qr, qzhess, schur, svd}
--- a/libinterp/corefcn/strfns.cc	Thu Dec 21 03:06:12 2017 -0800
+++ b/libinterp/corefcn/strfns.cc	Thu Dec 21 03:45:09 2017 -0800
@@ -68,13 +68,13 @@
 @example
 @group
 char ([97, 98, 99], "", @{"98", "99", 100@}, "str1", ["ha", "lf"])
-   @result{} ["abc  "
-       "     "
-       "98   "
-       "99   "
-       "d    "
-       "str1 "
-       "half "]
+   @result{} ["abc "
+       "    "
+       "98  "
+       "99  "
+       "d   "
+       "str1"
+       "half"]
 @end group
 @end example
 @seealso{strvcat, cellstr}
--- a/scripts/miscellaneous/setfield.m	Thu Dec 21 03:06:12 2017 -0800
+++ b/scripts/miscellaneous/setfield.m	Thu Dec 21 03:45:09 2017 -0800
@@ -46,7 +46,7 @@
 ## the space character.  Using arbitrary strings for field names is
 ## incompatible with @sc{matlab}, and this usage will emit a warning if the
 ## warning ID @code{Octave:language-extension} is enabled.
-## @xref{XREFwarning_ids}.
+## @xref{XREFwarning_ids,,warning_ids}.
 ##
 ## With the second calling form, set a field of a structure array.  The
 ## input @var{sidx} selects an element of the structure array, @var{field}