Mercurial > octave
changeset 27970:9e769371fb45
maint: merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 21 Jan 2020 09:10:37 -0600 |
| parents | a9a8699a3749 (current diff) 6628a284d56d (diff) |
| children | ec769a7ab9fb |
| files | configure.ac doc/interpreter/doccheck/spellcheck etc/HACKING.md libgui/src/documentation.h libinterp/octave-value/ov-classdef.h scripts/help/__unimplemented__.m scripts/plot/draw/shrinkfaces.m scripts/plot/util/private/__gnuplot_draw_axes__.m |
| diffstat | 7 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Jan 20 00:13:21 2020 -0500 +++ b/configure.ac Tue Jan 21 09:10:37 2020 -0600 @@ -1657,7 +1657,7 @@ PKG_CHECK_EXISTS([$magick++], [ dnl Make sure we only get -I, -L, and -l flags. dnl Some Graphics/ImageMagick++ dnl packages add extra flags that are - dnl useful when building Graphics/ImageMagick++ extentions. These extra + dnl useful when building Graphics/ImageMagick++ extensions. These extra dnl flags break the Octave build. MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')"
--- a/doc/interpreter/doccheck/spellcheck Mon Jan 20 00:13:21 2020 -0500 +++ b/doc/interpreter/doccheck/spellcheck Tue Jan 21 09:10:37 2020 -0600 @@ -57,7 +57,7 @@ if ($?) { unlink ($tmp_fname); - die ("aspell command unsuccesful. Cannot continue\n"); + die ("aspell command unsuccessful. Cannot continue\n"); } open (FH, "<$tmp_fname")
--- a/etc/HACKING.md Mon Jan 20 00:13:21 2020 -0500 +++ b/etc/HACKING.md Tue Jan 21 09:10:37 2020 -0600 @@ -217,7 +217,7 @@ Classes that define the parse tree for the interpreter. - `corefcn` statically linked `DEFUN` functions (callable from the - scripting langauge) as well as internal C++ functions used by + scripting language) as well as internal C++ functions used by the interpreter. - `dldfcn` dynamically linked `DEFUN` functions (callable from the
--- a/libgui/src/documentation.h Mon Jan 20 00:13:21 2020 -0500 +++ b/libgui/src/documentation.h Tue Jan 21 09:10:37 2020 -0600 @@ -90,7 +90,7 @@ }; - //! The documentaiton main class derived from QSplitter + //! The documentation main class derived from QSplitter class documentation : public QSplitter {
--- a/scripts/help/__unimplemented__.m Mon Jan 20 00:13:21 2020 -0500 +++ b/scripts/help/__unimplemented__.m Tue Jan 21 09:10:37 2020 -0600 @@ -79,8 +79,8 @@ txt = ["polarplot is not implemented. Consider using polar."]; case "startup" - txt = ["startup is not implemented. ", ... - 'Octave uses the file ".octaverc" instead.']; + txt = ["'startup.m' is a user startup and configuration script. ", ... + "Try @code{doc startup} for more information."]; case {"xlsread", "xlsfinfo", "xlswrite", "wk1read", "wk1finfo", "wk1write"} txt = ["Functions for spreadsheet style I/O ", ...
--- a/scripts/plot/draw/shrinkfaces.m Mon Jan 20 00:13:21 2020 -0500 +++ b/scripts/plot/draw/shrinkfaces.m Tue Jan 21 09:10:37 2020 -0600 @@ -203,7 +203,7 @@ %! axis auto; # Kludge required for Octave %! axis equal; %! grid on; -%! title ("shrinkfaces() on 2-D complex shapes tesselated with triangles"); +%! title ("shrinkfaces() on 2-D complex shapes tessellated with triangles"); %!demo %! clf;
--- a/scripts/plot/util/private/__gnuplot_draw_axes__.m Mon Jan 20 00:13:21 2020 -0500 +++ b/scripts/plot/util/private/__gnuplot_draw_axes__.m Tue Jan 21 09:10:37 2020 -0600 @@ -1860,7 +1860,7 @@ if (length (color) == 3) colorspec = sprintf ('rgb "#%02x%02x%02x"', round (255*color)); else - colorspec = sprintf ("palatte %d", round (color)); + colorspec = sprintf ("palette %d", round (color)); endif else colorspec = sprintf ('"%s"', color);