Mercurial > octave
changeset 25842:e9910742d968
maint: merge stable to default
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Wed, 29 Aug 2018 14:34:24 -0700 |
| parents | 31af3806a230 (current diff) 0d4b88086f36 (diff) |
| children | dd10eea0be97 |
| files | scripts/pkg/pkg.m |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/pkg/pkg.m Wed Aug 29 15:16:05 2018 -0400 +++ b/scripts/pkg/pkg.m Wed Aug 29 14:34:24 2018 -0700 @@ -345,7 +345,7 @@ page_output_immediately (true, "local"); case "-forge" if (! __octave_config_info__ ("CURL_LIBS")) - error ("pkg: can't download from forge without the cURL library"); + error ("pkg: can't download from Octave Forge without the cURL library"); endif octave_forge = true; case "-local" @@ -589,7 +589,7 @@ try forge_pkg_version = get_forge_pkg (installed_pkg_name); catch - warning ("pkg: package %s not found on forge - skipping update\n", + warning ("pkg: package %s not found on Octave Forge - skipping update\n", installed_pkg_name); forge_pkg_version = "0"; end_try_catch
--- a/scripts/pkg/private/get_forge_pkg.m Wed Aug 29 15:16:05 2018 -0400 +++ b/scripts/pkg/private/get_forge_pkg.m Wed Aug 29 14:34:24 2018 -0700 @@ -19,7 +19,7 @@ ## -*- texinfo -*- ## @deftypefn {} {[@var{ver}, @var{url}] =} get_forge_pkg (@var{name}) -## Try to discover the current version of an OctaveForge package from the web, +## Try to discover the current version of an Octave Forge package from the web, ## using a working internet connection and the urlread function. ## If two output arguments are requested, also return an address from which ## to download the file.
--- a/scripts/pkg/private/list_forge_packages.m Wed Aug 29 15:16:05 2018 -0400 +++ b/scripts/pkg/private/list_forge_packages.m Wed Aug 29 14:34:24 2018 -0700 @@ -33,7 +33,7 @@ if (nargout == 0) page_screen_output (false, "local"); - puts ("OctaveForge provides these packages:\n"); + puts ("Octave Forge provides these packages:\n"); for i = 1:length (list) try ver = get_forge_pkg (list{i});