changeset 31597:65157e496f5d

maint: Merge stable to default.
author Arun Giridhar <arungiridhar@gmail.com>
date Wed, 30 Nov 2022 08:03:06 -0500
parents d6f9be74b208 (current diff) e03694e047fa (diff)
children 53fee053d962
files
diffstat 16 files changed, 28 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/octave.texi	Tue Nov 29 13:15:17 2022 -0800
+++ b/doc/interpreter/octave.texi	Wed Nov 30 08:03:06 2022 -0500
@@ -625,7 +625,7 @@
 Graphics Toolkits
 
 * Customizing Toolkit Behavior::
-* Hardware vs. Software Rendering::
+* Hardware vs Software Rendering::
 * Precision issues::
 
 Matrix Manipulation
--- a/doc/interpreter/plot.txi	Tue Nov 29 13:15:17 2022 -0800
+++ b/doc/interpreter/plot.txi	Wed Nov 30 08:03:06 2022 -0500
@@ -2764,7 +2764,7 @@
 
 @menu
 * Customizing Toolkit Behavior::
-* Hardware vs. Software Rendering::
+* Hardware vs Software Rendering::
 * Precision issues::
 @end menu
 
@@ -2794,8 +2794,8 @@
 @end group
 @end example
 
-@node Hardware vs. Software Rendering
-@subsubsection Hardware vs. Software Rendering
+@node Hardware vs Software Rendering
+@subsubsection Hardware vs Software Rendering
 @cindex opengl rendering slow windows
 
 On Windows platforms, Octave uses software rendering for the OpenGL graphics
--- a/libinterp/corefcn/interpreter.cc	Tue Nov 29 13:15:17 2022 -0800
+++ b/libinterp/corefcn/interpreter.cc	Wed Nov 30 08:03:06 2022 -0500
@@ -308,7 +308,7 @@
 DEFMETHOD (__traditional__, interp, , ,
            doc: /* -*- texinfo -*-
 @deftypefn {} {@var{tf} =} __traditional__ ()
-Return true if Octave was invoked with the @env{--traditional} option.
+Return true if Octave was invoked with the @w{@env{--traditional}} option.
 @end deftypefn */)
 {
   return ovl (interp.traditional ());
--- a/libinterp/corefcn/load-path.cc	Tue Nov 29 13:15:17 2022 -0800
+++ b/libinterp/corefcn/load-path.cc	Wed Nov 30 08:03:06 2022 -0500
@@ -2515,7 +2515,7 @@
            doc: /* -*- texinfo -*-
 @deftypefn {} {@var{pathstr} =} command_line_path ()
 Return the path argument given to Octave at the command line when the
-interpreter was started (@env{--path @var{arg}}).
+interpreter was started (@w{@env{--path @var{arg}}}).
 
 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}
 @end deftypefn */)
--- a/libinterp/corefcn/ordschur.cc	Tue Nov 29 13:15:17 2022 -0800
+++ b/libinterp/corefcn/ordschur.cc	Wed Nov 30 08:03:06 2022 -0500
@@ -37,7 +37,7 @@
 DEFUN (ordschur, args, ,
        doc: /* -*- texinfo -*-
 @deftypefn {} {[@var{UR}, @var{SR}] =} ordschur (@var{U}, @var{S}, @var{select})
-Reorders the real Schur factorization (@var{U},@var{S}) obtained with the
+Reorder the real Schur factorization (@var{U},@var{S}) obtained with the
 @code{schur} function, so that selected eigenvalues appear in the upper left
 diagonal blocks of the quasi triangular Schur matrix.
 
--- a/libinterp/corefcn/stream-euler.cc	Tue Nov 29 13:15:17 2022 -0800
+++ b/libinterp/corefcn/stream-euler.cc	Wed Nov 30 08:03:06 2022 -0500
@@ -507,7 +507,7 @@
 DEFUN (__streameuler2d__, args, ,
        doc: /* -*- texinfo -*-
 @deftypefn {} {@var{output} =} __streameuler2d__ (@var{U}, @var{V}, @var{TX}, @var{TY}, @var{ZETA}, @var{XI}, @var{H}, @var{MAXNVERTS})
-Calculates the streamline in a vector field @code{[@var{U}, @var{V}]} starting
+Calculate the streamline in a vector field @code{[@var{U}, @var{V}]} starting
 from a seed point at position @code{[@var{ZETA}, @var{XI}]}.  The integrator
 used is Heun's Scheme.  The step size can be controlled by @var{H}.  The
 Jacobian matrix can be defined for each grid cell by
@@ -522,7 +522,7 @@
 DEFUN (__streameuler3d__, args, ,
        doc: /* -*- texinfo -*-
 @deftypefn {} {@var{output} =} __streameuler3d__ (@var{U}, @var{V}, @var{W}, @var{TX}, @var{TY}, @var{TZ}, @var{ZETA}, @var{XI}, @var{RHO}, @var{H}, @var{MAXNVERTS})
-Calculates the streamline in a vector field @code{[@var{U}, @var{V}, @var{W}]}
+Calculate the streamline in a vector field @code{[@var{U}, @var{V}, @var{W}]}
 starting from a seed point at position
 @code{[@var{ZETA}, @var{XI}, @var{RHO}]}.  The integrator used is Heun's
 Scheme.  The step size can be controlled by @var{H}.  The Jacobian matrix can
--- a/libinterp/octave-value/ov-class.cc	Tue Nov 29 13:15:17 2022 -0800
+++ b/libinterp/octave-value/ov-class.cc	Wed Nov 30 08:03:06 2022 -0500
@@ -2139,7 +2139,7 @@
 DEFUN (__inline_ctor__, args, ,
        doc: /* -*- texinfo -*-
 @deftypefn {} {@var{inline_obj} =} __inline_ctor__ (@var{prop_struct})
-Implements final construction for inline objects.
+Implement final construction for inline objects.
 @end deftypefn */)
 {
   // Input validation has already been done in input.m.
--- a/libinterp/octave-value/ov-classdef.cc	Tue Nov 29 13:15:17 2022 -0800
+++ b/libinterp/octave-value/ov-classdef.cc	Wed Nov 30 08:03:06 2022 -0500
@@ -618,7 +618,7 @@
 DEFUN (metaclass, args, ,
        doc: /* -*- texinfo -*-
 @deftypefn {} {@var{metaclass_obj} =} metaclass (obj)
-Returns the meta.class object corresponding to the class of @var{obj}.
+Return the meta.class object corresponding to the class of @var{obj}.
 @end deftypefn */)
 {
   if (args.length () != 1)
@@ -724,7 +724,7 @@
            doc: /* -*- texinfo -*-
 @deftypefn  {} {@var{mtds} =} __methods__ (@var{obj})
 @deftypefnx {} {@var{mtds} =} __methods__ ("classname")
-Implements @code{methods} for Octave class objects and classnames.
+Implement @code{methods} for Octave class objects and classnames.
 @seealso{methods}
 @end deftypefn */)
 {
--- a/scripts/gui/uigetfile.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/gui/uigetfile.m	Wed Nov 30 08:03:06 2022 -0500
@@ -48,14 +48,12 @@
 ##
 ## @item A 2-column cell array
 ## containing a file extension in the first column and a brief description in
-## the second column.
-## Example: @code{uigetfile (@{"*.ext", "My Description";"*.xyz",
-## "XYZ-Format"@})}
+## the second column.  Example:
+## @code{uigetfile (@{"*.ext", "My Description";"*.xyz", "XYZ-Format"@})}
 ##
 ## The filter string can also contain a semicolon separated list of filter
-## extensions.
-## Example: @code{uigetfile (@{"*.gif;*.png;*.jpg", "Supported Picture
-## Formats"@})}
+## extensions.  Example:
+## @code{uigetfile (@{"*.gif;*.png;*.jpg", "Supported Picture Formats"@})}
 ##
 ## @item A directory name or path name
 ## If the folder name of path name contains a trailing file separator, the
--- a/scripts/gui/uiputfile.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/gui/uiputfile.m	Wed Nov 30 08:03:06 2022 -0500
@@ -46,15 +46,13 @@
 ##
 ## @item @code{@{"*.ext", "My Description"@}}
 ## A 2-column cell array containing the file extension in the 1st column and
-## a brief description in the 2nd column.
-## Example: @code{uiputfile (@{"*.ext","My Description";"*.xyz",
-## "XYZ-Format"@})}
+## a brief description in the 2nd column.  Example:
+## @code{uiputfile (@{"*.ext","My Description";"*.xyz", "XYZ-Format"@})}
 ## @end table
 ##
 ## The filter string can also contain a semicolon separated list of filter
-## extensions.
-## Example: @code{uiputfile (@{"*.gif;*.png;*.jpg",
-## "Supported Picture Formats"@})}
+## extensions.  Example:
+## @code{uiputfile (@{"*.gif;*.png;*.jpg", "Supported Picture Formats"@})}
 ##
 ## @var{dialog_name} can be used to customize the dialog title.
 ## If @var{default_file} is given it is preselected in the GUI dialog.
--- a/scripts/help/warning_ids.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/help/warning_ids.m	Wed Nov 30 08:03:06 2022 -0500
@@ -434,7 +434,8 @@
 ##
 ## @item Octave:LaTeX:internal-error
 ## If the @code{Octave:LaTeX:internal-error} warning is enabled, a warning is
-## printed whenever the LaTeX renderer for text in plots encounters an issue.
+## printed whenever the @LaTeX{} renderer for text in plots encounters an
+## issue.
 ## By default, the @code{Octave:LaTeX:internal-error} warning is enabled.
 ##
 ## @item Octave:unimplemented-matlab-functionality
@@ -458,5 +459,5 @@
 endfunction
 
 
-## Mark file as being tested.  No real test needed for a documentation .m file
+## Mark file as tested.  No test needed for a documentation m-file.
 %!assert (1)
--- a/scripts/miscellaneous/memory.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/miscellaneous/memory.m	Wed Nov 30 08:03:06 2022 -0500
@@ -103,7 +103,6 @@
 ## Example #2 : return structs with memory usage information
 ##
 ## @example
-## @group
 ## [userdata, systemdata] = memory ()
 ## @result{}
 ##  userdata =
@@ -141,7 +140,6 @@
 ##
 ##          Available = 2.8147e+14
 ##          Total = 2.8147e+14
-## @end group
 ## @end example
 ##
 ## Programming Note: This function is implemented for Linux and Windows only.
--- a/scripts/miscellaneous/private/__memoize__.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/miscellaneous/private/__memoize__.m	Wed Nov 30 08:03:06 2022 -0500
@@ -25,7 +25,7 @@
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {@var{mem_fcn_handle} =} __memoize__ (@var{fcn_handle})
-## @deftypefn  {} {} __memoize__ ()
+## @deftypefnx {} {} __memoize__ ()
 ## Internal function used by @code{memoize}.
 ##
 ## @seealso{clearAllMemoizedCaches, memoize}
--- a/scripts/plot/util/print.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/plot/util/print.m	Wed Nov 30 08:03:06 2022 -0500
@@ -127,8 +127,8 @@
 ## JPEG) and @qcode{"painters"} for vector formats (e.g., PDF)@.  These options
 ## are only supported for the "qt" graphics toolkit.
 ##
-## @item -svgconvert (default)
-## @item -nosvgconvert
+## @item  -svgconvert (default)
+## @itemx -nosvgconvert
 ##   When using the @option{-painters} renderer, this enables or disables the
 ## SVG based backend toolchain with enhanced characteristics:
 ##
--- a/scripts/testfun/private/compare_plot_demos.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/testfun/private/compare_plot_demos.m	Wed Nov 30 08:03:06 2022 -0500
@@ -27,7 +27,7 @@
 ## @deftypefn  {} {} compare_plot_demos ()
 ## @deftypefnx {} {} compare_plot_demos ("toolkits", @{@var{toolkit1}, @var{toolkit2}, @dots{}@})
 ##
-## Uses @code{dump_demos} and @code{html_compare_plot_demos} to produce an
+## Use @code{dump_demos} and @code{html_compare_plot_demos} to produce an
 ## html comparison of the plot demos for each of Octave's graphics toolkits.
 ##
 ## An m-file named @file{dump_plots.m} will be created in the current working
--- a/scripts/testfun/private/html_compare_plot_demos.m	Tue Nov 29 13:15:17 2022 -0800
+++ b/scripts/testfun/private/html_compare_plot_demos.m	Wed Nov 30 08:03:06 2022 -0500
@@ -27,7 +27,7 @@
 ## @deftypefn  {} {} html_compare (@var{toolkits})
 ## @deftypefnx {} {} html_compare (@var{toolkits}, @var{name}, @var{value}, @dots{})
 ##
-## Produces an html document to compare the plot demos produced by
+## Produce an html document to compare the plot demos produced by
 ## @var{toolkits}.
 ##
 ## Valid property names, and their defaults, are: