Mercurial > octave
changeset 30378:c66cc7e61f84
maint: merge stable to default.
author | Rik <rik@octave.org> |
---|---|
date | Fri, 26 Nov 2021 18:13:42 -0800 |
parents | 3c4639e42855 (current diff) 26f2daafa270 (diff) |
children | 0b3d917678a8 |
files | libinterp/corefcn/data.cc libinterp/corefcn/error.cc libinterp/corefcn/input.cc libinterp/corefcn/mappers.cc |
diffstat | 16 files changed, 42 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc Fri Nov 26 16:22:19 2021 -0800 +++ b/libinterp/corefcn/data.cc Fri Nov 26 18:13:42 2021 -0800 @@ -6813,7 +6813,7 @@ When given the identifier @var{id} of a specific timer, return the number of seconds elapsed since the timer @var{id} was initialized. -@xref{XREFtic, , tic}, for examples of the use of @code{tic}/@code{toc}. +@xref{XREFtic,,@code{tic}}, for examples of the use of @code{tic}/@code{toc}. @seealso{tic, cputime} @end deftypefn */)
--- a/libinterp/corefcn/error.cc Fri Nov 26 16:22:19 2021 -0800 +++ b/libinterp/corefcn/error.cc Fri Nov 26 18:13:42 2021 -0800 @@ -1386,7 +1386,7 @@ print a traceback of all the function calls leading to the warning. If the warning message does end in a newline character, Octave will suppress the traceback messages as it returns control to the top level. For more details -and examples, see @ref{XREFerror,,error}. +and examples, @pxref{XREFerror,,@code{error}}. 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
--- a/libinterp/corefcn/input.cc Fri Nov 26 16:22:19 2021 -0800 +++ b/libinterp/corefcn/input.cc Fri Nov 26 18:13:42 2021 -0800 @@ -1338,7 +1338,7 @@ If @var{file} is omitted, read the default initialization file (normally @file{~/.inputrc}). -@xref{Readline Init File, , , readline, GNU Readline Library}, +@xref{Readline Init File,,,readline, GNU Readline Library}, for details. @seealso{readline_re_read_init_file} @end deftypefn */) @@ -1365,7 +1365,7 @@ @deftypefn {} {} readline_re_read_init_file () Re-read the last readline library initialization file that was read. -@xref{Readline Init File, , , readline, GNU Readline Library}, +@xref{Readline Init File,,,readline, GNU Readline Library}, for details. @seealso{readline_read_init_file} @end deftypefn */)
--- a/libinterp/corefcn/jsondecode.cc Fri Nov 26 16:22:19 2021 -0800 +++ b/libinterp/corefcn/jsondecode.cc Fri Nov 26 18:13:42 2021 -0800 @@ -498,8 +498,8 @@ decoding @var{JSON_txt}. For more information about the options @qcode{"ReplacementStyle"} and -@qcode{"Prefix"}, see -@ref{XREFmatlab_lang_makeValidName,,matlab.lang.makeValidName}. +@qcode{"Prefix"}, +@pxref{XREFmatlab_lang_makeValidName,,@code{matlab.lang.makeValidName}}. If the value of the option @qcode{"makeValidName"} is false then names will not be changed by @code{matlab.lang.makeValidName} and the
--- a/libinterp/corefcn/mappers.cc Fri Nov 26 16:22:19 2021 -0800 +++ b/libinterp/corefcn/mappers.cc Fri Nov 26 18:13:42 2021 -0800 @@ -956,7 +956,7 @@ @end ifnottex for each element of @var{x}. -To compute the matrix exponential, see @ref{Linear Algebra}. +To compute the matrix exponential, @pxref{Linear Algebra}. @seealso{log} @end deftypefn */) { @@ -1721,7 +1721,7 @@ @end ifnottex for each element of @var{x}. -To compute the matrix logarithm, see @ref{Linear Algebra}. +To compute the matrix logarithm, @pxref{Linear Algebra}. @seealso{exp, log1p, log2, log10, logspace} @end deftypefn */) { @@ -1966,7 +1966,7 @@ otherwise. This behavior is consistent with the other logical functions. -See @ref{Logical Values}. The behavior differs from the C language function +@xref{Logical Values}. The behavior differs from the C language function which returns nonzero if the sign bit is set. This is not the same as @code{x < 0.0}, because IEEE 754 floating point @@ -2065,7 +2065,7 @@ If @var{x} is negative, a complex result is returned. -To compute the matrix square root, see @ref{Linear Algebra}. +To compute the matrix square root, @pxref{Linear Algebra}. @seealso{realsqrt, nthroot} @end deftypefn */) {
--- a/libinterp/corefcn/pager.cc Fri Nov 26 16:22:19 2021 -0800 +++ b/libinterp/corefcn/pager.cc Fri Nov 26 18:13:42 2021 -0800 @@ -696,7 +696,7 @@ pager. This allows you to view one screenful at a time. Some pagers -(such as @code{less}---see @ref{Installation}) are also capable of moving +(such as @code{less}---@pxref{Installation}) are also capable of moving backward on the output. When called from inside a function with the @qcode{"local"} option, the
--- a/scripts/gui/setappdata.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/gui/setappdata.m Fri Nov 26 18:13:42 2021 -0800 @@ -35,8 +35,8 @@ ## ## Multiple @var{name}/@var{value} pairs can be specified. Alternatively, a ## cell array of @var{names} and a corresponding cell array of @var{values} can -## be specified. Details on obtaining a list of valid application data -## properties can be found in @ref{XREFgetappdata, ,getappdata}. +## be specified. For details on obtaining a list of valid application data +## properties, @pxref{XREFgetappdata,,@code{getappdata}}. ## ## @seealso{getappdata, isappdata, rmappdata, guidata, get, set, getpref, ## setpref}
--- a/scripts/miscellaneous/jupyter_notebook.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/miscellaneous/jupyter_notebook.m Fri Nov 26 18:13:42 2021 -0800 @@ -1,19 +1,25 @@ +######################################################################## +## ## Copyright (C) 2021 The Octave Project Developers ## -## This program is free software: you can redistribute it and/or modify it +## See the file COPYRIGHT.md in the top-level directory of this +## distribution or <https://octave.org/copyright/>. +## +## Octave is free software: you can redistribute it and/or modify it ## under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## This program is distributed in the hope that it will be useful, but +## Octave is distributed in the hope that it will be useful, but ## WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program. If not, see +## along with Octave; see the file COPYING. If not, see ## <https://www.gnu.org/licenses/>. - +## +######################################################################## classdef jupyter_notebook < handle
--- a/scripts/miscellaneous/open.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/miscellaneous/open.m Fri Nov 26 18:13:42 2021 -0800 @@ -43,7 +43,8 @@ ## @xref{XREFload,,load function}. ## ## @item .ofig -## Open the figure with @code{hgload}. @xref{XREFhgload,,hgload function}. +## Open the figure with @code{hgload}. +## @xref{XREFhgload,,hgload function}. ## ## @item .fig, .ofig ## Load the figure
--- a/scripts/optimization/fminbnd.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/optimization/fminbnd.m Fri Nov 26 18:13:42 2021 -0800 @@ -51,7 +51,8 @@ ## @qcode{"TolX"} specifies the termination tolerance for the solution @var{x}. ## The default is @code{1e-4}. ## -## For a description of the other options, see @ref{XREFoptimset,,optimset}. +## For a description of the other options, +## @pxref{XREFoptimset,,@code{optimset}}. ## To initialize an options structure with default values for @code{fminbnd} ## use @code{options = optimset ("fminbnd")}. ##
--- a/scripts/optimization/fzero.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/optimization/fzero.m Fri Nov 26 18:13:42 2021 -0800 @@ -61,7 +61,8 @@ ## @qcode{"TolX"} specifies the termination tolerance for the solution @var{x}. ## The default value is @code{eps}. ## -## For a description of the other options, see @ref{XREFoptimset,,optimset}. +## For a description of the other options, +## @pxref{XREFoptimset,,@code{optimset}}. ## To initialize an options structure with default values for @code{fzero} use ## @code{options = optimset ("fzero")}. ##
--- a/scripts/pkg/private/make_rel_paths.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/pkg/private/make_rel_paths.m Fri Nov 26 18:13:42 2021 -0800 @@ -5,18 +5,21 @@ ## See the file COPYRIGHT.md in the top-level directory of this ## distribution or <https://octave.org/copyright/>. ## -## This program is free software: you can redistribute it and/or modify +## Octave is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by ## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## -## This program is distributed in the hope that it will be useful, +## Octave is distributed in the hope that it will be useful, ## but WITHOUT ANY WARRANTY; without even the implied warranty of ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program. If not, see <https://www.gnu.org/licenses/>. +## along with Octave; see the file COPYING. If not, see +## <https://www.gnu.org/licenses/>. +## +######################################################################## ## -*- texinfo -*- ## @deftypefn {} {@var{pkg_list} =} make_rel_paths (@var{pkg_list})
--- a/scripts/plot/appearance/camorbit.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/plot/appearance/camorbit.m Fri Nov 26 18:13:42 2021 -0800 @@ -95,7 +95,7 @@ ## (Note: the rotation by @var{phi} is unaffected by @qcode{"camera"}.) ## ## The @code{camorbit} command modifies two camera properties: -## @ref{XREFcampos,,campos} and @ref{XREFcamup,,camup}. +## @ref{XREFcampos,,@code{campos}} and @ref{XREFcamup,,@code{camup}}. ## ## By default, this command affects the current axis; alternatively, an axis ## can be specified by the optional argument @var{hax}.
--- a/scripts/plot/appearance/camup.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/plot/appearance/camup.m Fri Nov 26 18:13:42 2021 -0800 @@ -71,7 +71,7 @@ ## A consequence is that ``pulling back'' on the up vector does not pitch the ## camera view (as that would require changing the target). Setting the up ## vector is thus typically used only to roll the camera. A more intuitive -## command for this purpose is @ref{XREFcamroll,,camroll}. +## command for this purpose is @ref{XREFcamroll,,@code{camroll}}. ## ## Finally, we can reset the up vector to automatic mode: ##
--- a/scripts/plot/draw/stem3.m Fri Nov 26 16:22:19 2021 -0800 +++ b/scripts/plot/draw/stem3.m Fri Nov 26 18:13:42 2021 -0800 @@ -50,8 +50,8 @@ ## ## The optional return value @var{h} is a handle to the @nospell{"stem series"} ## hggroup containing the line and marker objects used for the plot. -## @xref{XREFstem,,stem}, for a description of the @nospell{"stem series"} -## object. +## @xref{XREFstem,,@code{stem}}, for a description of the +## @nospell{"stem series"} object. ## ## Example: ##
--- a/src/octave-svgconvert.cc Fri Nov 26 16:22:19 2021 -0800 +++ b/src/octave-svgconvert.cc Fri Nov 26 18:13:42 2021 -0800 @@ -7,9 +7,9 @@ // // This file is part of Octave. // -// Octave is free software; you can redistribute it and/or modify it +// Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 3 of the License, or +// the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but @@ -19,7 +19,7 @@ // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see -// <http://www.gnu.org/licenses/>. +// <https://www.gnu.org/licenses/>. // ////////////////////////////////////////////////////////////////////////