# HG changeset patch # User Rik # Date 1535561563 25200 # Node ID 0da1b45c23f22eed24b8da6b391f6b21a5813c14 # Parent 4530c5824bbe5d8a66dd4677820d62e9044ce57e# Parent 07cb3e098c0a95731c00dc13ef0829d8f3dc9660 maint: merge stable to default. diff -r 4530c5824bbe -r 0da1b45c23f2 NEWS --- a/NEWS Wed Aug 29 09:26:09 2018 -0700 +++ b/NEWS Wed Aug 29 09:52:43 2018 -0700 @@ -104,7 +104,7 @@ Function | Replacement ---------------------|------------------ bitmax | flintmax - mahalanobis | mahal in Octave-Forge statistics pkg + mahalanobis | mahal in Octave Forge statistics pkg md5sum | hash octave_config_info | __octave_config_info__ onenormest | normest1 diff -r 4530c5824bbe -r 0da1b45c23f2 doc/interpreter/obsolete.txi --- a/doc/interpreter/obsolete.txi Wed Aug 29 09:26:09 2018 -0700 +++ b/doc/interpreter/obsolete.txi Wed Aug 29 09:52:43 2018 -0700 @@ -151,8 +151,8 @@ @item @code{str2mat} @tab @code{char} @tab 3.6.0 @item @code{unmark_command} @tab None @tab 3.6.0 @item @code{unmark_rawcommand} @tab None @tab 3.6.0 -@item @code{autocor} @tab Octave-Forge signal pkg, @code{xcor} @tab 3.8.0 -@item @code{autocov} @tab Octave-Forge signal pkg, @code{xcov} @tab 3.8.0 +@item @code{autocor} @tab Octave Forge signal pkg, @code{xcor} @tab 3.8.0 +@item @code{autocov} @tab Octave Forge signal pkg, @code{xcov} @tab 3.8.0 @item @code{betai} @tab @code{betainc} @tab 3.8.0 @item @code{cellidx} @tab @code{ismember} @tab 3.8.0 @item @code{cquad} @tab @code{quadcc} @tab 3.8.0 diff -r 4530c5824bbe -r 0da1b45c23f2 doc/interpreter/package.txi --- a/doc/interpreter/package.txi Wed Aug 29 09:26:09 2018 -0700 +++ b/doc/interpreter/package.txi Wed Aug 29 09:52:43 2018 -0700 @@ -21,9 +21,9 @@ Since Octave is Free Software users are encouraged to share their programs with others. To aid this sharing Octave supports the -installation of extra packages. The `Octave-Forge' project is a +installation of extra packages. The `Octave Forge' project is a community-maintained set of packages that can be downloaded and -installed in Octave. At the time of writing the `Octave-Forge' project +installed in Octave. At the time of writing the `Octave Forge' project can be found online at @url{https://octave.sourceforge.io}, but since the Internet is an ever-changing place this may not be true at the time of reading. Therefore it is recommended to see the Octave diff -r 4530c5824bbe -r 0da1b45c23f2 etc/NEWS.4 --- a/etc/NEWS.4 Wed Aug 29 09:26:09 2018 -0700 +++ b/etc/NEWS.4 Wed Aug 29 09:52:43 2018 -0700 @@ -961,7 +961,7 @@ Function | Replacement ---------------------|------------------ bitmax | flintmax - mahalanobis | mahal in Octave-Forge statistics pkg + mahalanobis | mahal in Octave Forge statistics pkg md5sum | hash octave_config_info | __octave_config_info__ onenormest | normest1 diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/general/bitcmp.m --- a/scripts/general/bitcmp.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/general/bitcmp.m Wed Aug 29 09:52:43 2018 -0700 @@ -36,7 +36,7 @@ ## @seealso{bitand, bitor, bitxor, bitset, bitget, bitcmp, bitshift, flintmax} ## @end deftypefn -## Liberally based on the version by Kai Habel from octave-forge +## Liberally based on the version by Kai Habel from Octave Forge function C = bitcmp (A, k) diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/general/bitget.m --- a/scripts/general/bitget.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/general/bitget.m Wed Aug 29 09:52:43 2018 -0700 @@ -31,7 +31,7 @@ ## @seealso{bitand, bitor, bitxor, bitset, bitcmp, bitshift, intmax, flintmax} ## @end deftypefn -## Liberally based of the version by Kai Habel from octave-forge +## Liberally based of the version by Kai Habel from Octave Forge function C = bitget (A, n) diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/help/__makeinfo__.m --- a/scripts/help/__makeinfo__.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/help/__makeinfo__.m Wed Aug 29 09:52:43 2018 -0700 @@ -72,7 +72,7 @@ error ("__makeinfo__: second input argument must be a string"); endif - ## NOTE: The 3rd argument is used by Octave-Forge function + ## NOTE: The 3rd argument is used by Octave Forge function ## generate_package_html, not by core Octave. This functionality ## can only be removed when that function has been updated. if (nargin < 3) diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/miscellaneous/dos.m --- a/scripts/miscellaneous/dos.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/miscellaneous/dos.m Wed Aug 29 09:52:43 2018 -0700 @@ -32,7 +32,7 @@ ## @seealso{unix, system, isunix, ismac, ispc} ## @end deftypefn -## Author: octave-forge ??? +## Author: Octave Forge ??? ## Adapted by: jwe function [status, text] = dos (command, echo_arg) diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/miscellaneous/unix.m --- a/scripts/miscellaneous/unix.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/miscellaneous/unix.m Wed Aug 29 09:52:43 2018 -0700 @@ -32,7 +32,7 @@ ## @seealso{dos, system, isunix, ismac, ispc} ## @end deftypefn -## Author: octave-forge ??? +## Author: Octave Forge ??? ## Adapted by: jwe function [status, text] = unix (command, echo_arg) diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/pkg/pkg.m --- a/scripts/pkg/pkg.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/pkg/pkg.m Wed Aug 29 09:52:43 2018 -0700 @@ -79,7 +79,7 @@ ## the user doesn't normally have system privileges. ## ## @item -forge -## Install a package directly from the Octave-Forge repository. This +## Install a package directly from the Octave Forge repository. This ## requires an internet connection and the cURL library. ## ## @emph{Security risk}: no verification of the package is performed @@ -94,7 +94,7 @@ ## @end table ## ## @item update -## Check installed Octave-Forge packages against repository and update any +## Check installed Octave Forge packages against repository and update any ## outdated items. This requires an internet connection and the cURL library. ## Usage: ## @@ -164,7 +164,7 @@ ## [user_packages, system_packages] = pkg ("list") ## @end example ## -## The @qcode{"-forge"} option lists packages available at the Octave-Forge +## The @qcode{"-forge"} option lists packages available at the Octave Forge ## repository. This requires an internet connection and the cURL library. ## For example: ## diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/plot/draw/pie.m --- a/scripts/plot/draw/pie.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/plot/draw/pie.m Wed Aug 29 09:52:43 2018 -0700 @@ -49,7 +49,7 @@ ## @seealso{pie3, bar, hist, rose} ## @end deftypefn -## Very roughly based on pie.m from octave-forge whose author was +## Very roughly based on pie.m from Octave Forge whose author was ## Daniel Heiserer function h = pie (varargin) diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/plot/draw/pie3.m --- a/scripts/plot/draw/pie3.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/plot/draw/pie3.m Wed Aug 29 09:52:43 2018 -0700 @@ -50,7 +50,7 @@ ## @seealso{pie, bar, hist, rose} ## @end deftypefn -## Very roughly based on pie.m from octave-forge whose author was +## Very roughly based on pie.m from Octave Forge whose author was ## Daniel Heiserer function h = pie3 (varargin) diff -r 4530c5824bbe -r 0da1b45c23f2 scripts/polynomial/spline.m --- a/scripts/polynomial/spline.m Wed Aug 29 09:26:09 2018 -0700 +++ b/scripts/polynomial/spline.m Wed Aug 29 09:52:43 2018 -0700 @@ -69,7 +69,7 @@ ## @seealso{pchip, ppval, mkpp, unmkpp} ## @end deftypefn -## This code is based on csape.m from octave-forge, but has been +## This code is based on csape.m from Octave Forge, but has been ## modified to use the sparse solver code in octave that itself allows ## special casing of tri-diagonal matrices, modified for NDArrays and ## for the treatment of vectors y 2 elements longer than x as complete