# HG changeset patch
# User Kai T. Ohlhus <k.ohlhus@gmail.com>
# Date 1521122681 -3600
# Node ID df131a44310bc0d6f3360696bea501c526d469a0
# Parent  120e75853dab19ce34f0b0c9035e142b38424420# Parent  088506eadb44ecade8c0d81aa2f1f04e64af5801
maint: merge stable to default

diff -r 120e75853dab -r df131a44310b COPYING
--- a/COPYING	Wed Mar 14 18:40:00 2018 -0700
+++ b/COPYING	Thu Mar 15 15:04:41 2018 +0100
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -671,4 +671,4 @@
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff -r 120e75853dab -r df131a44310b doc/doxyhtml/Doxyfile.in
--- a/doc/doxyhtml/Doxyfile.in	Wed Mar 14 18:40:00 2018 -0700
+++ b/doc/doxyhtml/Doxyfile.in	Thu Mar 15 15:04:41 2018 +0100
@@ -1,6 +1,6 @@
 # -*- mode: conf; -*-
 
-## Copyright (C) 2013-2017 Jordi Gutiérrez Hermoso
+## Copyright (C) 2013-2018 Jordi Gutiérrez Hermoso
 ##
 ## This file is part of Octave.
 ##
@@ -40,7 +40,7 @@
 # This tag specifies the encoding used for all characters in the config file
 # that follow. The default is UTF-8 which is also the encoding used for all text
 # before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# built into libc) for the transcoding. See https://www.gnu.org/software/libiconv
 # for the list of possible encodings.
 # The default value is: UTF-8.
 
@@ -385,7 +385,7 @@
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# documentation (see: https://www.gnu.org/software/libiconv) for the list of
 # possible encodings.
 # The default value is: UTF-8.
 
@@ -580,6 +580,27 @@
 
 GENERATE_TREEVIEW      = YES
 
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
 #---------------------------------------------------------------------------
 # Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
diff -r 120e75853dab -r df131a44310b doc/doxyhtml/DoxyfileQt.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/doxyhtml/DoxyfileQt.patch	Thu Mar 15 15:04:41 2018 +0100
@@ -0,0 +1,8 @@
+
+# The following lines are used to create a minimal version to be used
+# as documentation within the GNU Octave GUI widget Qt Assistant.
+
+HTML_OUTPUT            = doxyhtml/doxyqt
+HAVE_DOT               = NO
+GENERATE_TREEVIEW      = NO
+SEARCHENGINE           = NO
diff -r 120e75853dab -r df131a44310b doc/doxyhtml/module.mk
--- a/doc/doxyhtml/module.mk	Wed Mar 14 18:40:00 2018 -0700
+++ b/doc/doxyhtml/module.mk	Thu Mar 15 15:04:41 2018 +0100
@@ -8,16 +8,23 @@
   %reldir%/pages/macros.dox \
   %reldir%/pages/README.md
 
+doxyqt: %reldir%/Doxyfile $(DOXYGEN_PAGES) | %reldir%/$(octave_dirstamp)
+	cp %reldir%/Doxyfile %reldir%/DoxyfileQt
+	cat $(srcdir)/%reldir%/DoxyfileQt.patch >> %reldir%/DoxyfileQt
+	doxygen %reldir%/DoxyfileQt
+
 doxyhtml: %reldir%/Doxyfile $(DOXYGEN_PAGES) | %reldir%/$(octave_dirstamp)
 	doxygen %reldir%/Doxyfile
 
+# This target is important for in source tree builds.
 doxyhtml-maintainer-clean:
-	rm -f %reldir%/pages/README.md
-	rm -rf `ls -d %reldir%/* 2>/dev/null | $(GREP) -v 'module\.mk\|Doxyfile\.in\|README\|pages$$'`
+	$(RM) %reldir%/pages/README.md
+	$(RM) -r `ls -d %reldir%/* 2>/dev/null | $(GREP) -v 'module\.mk\|Doxyfile\.in\|DoxyfileQt\.patch\|README\|pages$$'`
 
 doc_EXTRA_DIST += \
   $(DOXYGEN_PAGES) \
   %reldir%/Doxyfile.in \
+  %reldir%/DoxyfileQt.patch \
   %reldir%/README
 
 DIRSTAMP_FILES += %reldir%/$(octave_dirstamp)
diff -r 120e75853dab -r df131a44310b doc/interpreter/install.txi
--- a/doc/interpreter/install.txi	Wed Mar 14 18:40:00 2018 -0700
+++ b/doc/interpreter/install.txi	Thu Mar 15 15:04:41 2018 +0100
@@ -125,13 +125,13 @@
 The Octave sources are primarily written in C++, but some portions are
 also written in C and Fortran.  The Octave sources are intended to be
 portable.  Recent versions of the GNU compiler collection (GCC) should
-work (@url{http://gcc.gnu.org}).  If you use GCC, you should avoid
+work (@url{https://gcc.gnu.org}).  If you use GCC, you should avoid
 mixing versions.  For example, be sure that you are not using the
 obsolete @code{g77} Fortran compiler with modern versions of @code{gcc}
 and @code{g++}.
 
 @item GNU Make
-Tool for building software (@url{http://www.gnu.org/software/make}).
+Tool for building software (@url{https://www.gnu.org/software/make}).
 Octave's build system requires GNU Make.  Other versions of Make will
 not work.  Fortunately, GNU Make is highly portable and easy to install.
 
@@ -145,40 +145,40 @@
 
 @table @asis
 @item Bison
-Parser generator (@url{http://www.gnu.org/software/bison}).
+Parser generator (@url{https://www.gnu.org/software/bison}).
 You will need Bison if you modify the @code{oct-parse.yy} source file or
 if you delete the files that are generated from it.
 
 @item Flex
-Lexer analyzer (@url{http://www.gnu.org/software/flex}).  You will need
+Lexer analyzer (@url{https://www.gnu.org/software/flex}).  You will need
 Flex if you modify the @code{lex.ll} source file or if you delete the
 files that are generated from it.
 
 @item Autoconf
 Package for software configuration
-(@url{http://www.gnu.org/software/autoconf}).  Autoconf is required if
+(@url{https://www.gnu.org/software/autoconf}).  Autoconf is required if
 you modify Octave's @code{configure.ac} file or other files that it
 requires.
 
 @item Automake
 Package for Makefile generation
-(@url{http://www.gnu.org/software/automake}).  Automake is required if
+(@url{https://www.gnu.org/software/automake}).  Automake is required if
 you modify Octave's @code{Makefile.am} files or other files that they
 depend on.
 
 @item Libtool
 Package for building software libraries
-(@url{http://www.gnu.org/software/libtool}).  Libtool is required by
+(@url{https://www.gnu.org/software/libtool}).  Libtool is required by
 Automake.
 
 @item gperf
-Perfect hash function generator (@url{http://www.gnu.org/software/gperf}).
+Perfect hash function generator (@url{https://www.gnu.org/software/gperf}).
 You will need gperf if you modify the @code{octave.gperf} file or if you
 delete the file that is generated from it.
 
 @item Texinfo
 Package for generating online and print documentation
-(@url{http://www.gnu.org/software/texinfo}).  You will need Texinfo to
+(@url{https://www.gnu.org/software/texinfo}).  You will need Texinfo to
 build Octave's documentation or if you modify the documentation source
 files or the docstring of any Octave function.
 @end table
@@ -246,7 +246,7 @@
 to perform font rendering for Octave's OpenGL-based graphics functions.
 
 @item GLPK
-GNU Linear Programming Kit (@url{http://www.gnu.org/software/glpk}).
+GNU Linear Programming Kit (@url{https://www.gnu.org/software/glpk}).
 GPLK is required for the function @code{glpk}.
 
 @item @nospell{gl2ps}
diff -r 120e75853dab -r df131a44310b doc/liboctave/gpl.texi
--- a/doc/liboctave/gpl.texi	Wed Mar 14 18:40:00 2018 -0700
+++ b/doc/liboctave/gpl.texi	Thu Mar 15 15:04:41 2018 +0100
@@ -23,7 +23,7 @@
 @center Version 3, 29 June 2007
 
 @display
-Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
+Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{https://fsf.org/}
 
 Everyone is permitted to copy and distribute verbatim copies of this
 license document, but changing it is not allowed.
@@ -641,12 +641,12 @@
 @item Disclaimer of Warranty.
 
 THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+APPLICABLE LAW@.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
 WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
+A PARTICULAR PURPOSE@.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU@.  SHOULD THE PROGRAM PROVE
 DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
 CORRECTION.
 
@@ -698,11 +698,11 @@
 
 This program 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
+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 @url{http://www.gnu.org/licenses/}.
+along with this program.  If not, see @url{https://www.gnu.org/licenses/}.
 @end smallexample
 
 Also add information on how to contact you by electronic and paper mail.
@@ -725,11 +725,11 @@
 You should also get your employer (if you work as a programmer) or school,
 if any, to sign a ``copyright disclaimer'' for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-@url{http://www.gnu.org/licenses/}.
+@url{https://www.gnu.org/licenses/}.
 
 The GNU General Public License does not permit incorporating your
 program into proprietary programs.  If your program is a subroutine
 library, you may consider it more useful to permit linking proprietary
 applications with the library.  If this is what you want to do, use
 the GNU Lesser General Public License instead of this License.  But
-first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
+first, please read @url{https://www.gnu.org/licenses/why-not-lgpl.html}.
diff -r 120e75853dab -r df131a44310b libgui/src/m-editor/find-dialog.cc
--- a/libgui/src/m-editor/find-dialog.cc	Wed Mar 14 18:40:00 2018 -0700
+++ b/libgui/src/m-editor/find-dialog.cc	Thu Mar 15 15:04:41 2018 +0100
@@ -38,7 +38,7 @@
 ** Foundation and appearing in the file LICENSE.LGPL included in the
 ** packaging of this file.  Please review the following information to
 ** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** will be met: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights.  These rights are described in the Nokia Qt LGPL Exception
@@ -50,7 +50,7 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.  Please review the following information to
 ** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** met: https://www.gnu.org/copyleft/gpl.html.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
diff -r 120e75853dab -r df131a44310b libgui/src/m-editor/find-dialog.h
--- a/libgui/src/m-editor/find-dialog.h	Wed Mar 14 18:40:00 2018 -0700
+++ b/libgui/src/m-editor/find-dialog.h	Thu Mar 15 15:04:41 2018 +0100
@@ -38,7 +38,7 @@
 ** Foundation and appearing in the file LICENSE.LGPL included in the
 ** packaging of this file.  Please review the following information to
 ** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** will be met: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights.  These rights are described in the Nokia Qt LGPL Exception
@@ -50,7 +50,7 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.  Please review the following information to
 ** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** met: https://www.gnu.org/copyleft/gpl.html.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
diff -r 120e75853dab -r df131a44310b m4/ax_blas.m4
--- a/m4/ax_blas.m4	Wed Mar 14 18:40:00 2018 -0700
+++ b/m4/ax_blas.m4	Thu Mar 15 15:04:41 2018 +0100
@@ -1,5 +1,5 @@
 # ===========================================================================
-#          http://www.gnu.org/software/autoconf-archive/ax_blas.html
+#          https://www.gnu.org/software/autoconf-archive/ax_blas.html
 # ===========================================================================
 #
 # SYNOPSIS
diff -r 120e75853dab -r df131a44310b m4/ax_compare_version.m4
--- a/m4/ax_compare_version.m4	Wed Mar 14 18:40:00 2018 -0700
+++ b/m4/ax_compare_version.m4	Thu Mar 15 15:04:41 2018 +0100
@@ -1,5 +1,5 @@
 # ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
+#    https://www.gnu.org/software/autoconf-archive/ax_compare_version.html
 # ===========================================================================
 #
 # SYNOPSIS
diff -r 120e75853dab -r df131a44310b m4/ax_lapack.m4
--- a/m4/ax_lapack.m4	Wed Mar 14 18:40:00 2018 -0700
+++ b/m4/ax_lapack.m4	Thu Mar 15 15:04:41 2018 +0100
@@ -1,5 +1,5 @@
 # ===========================================================================
-#         http://www.gnu.org/software/autoconf-archive/ax_lapack.html
+#         https://www.gnu.org/software/autoconf-archive/ax_lapack.html
 # ===========================================================================
 #
 # SYNOPSIS
diff -r 120e75853dab -r df131a44310b m4/ax_openmp.m4
--- a/m4/ax_openmp.m4	Wed Mar 14 18:40:00 2018 -0700
+++ b/m4/ax_openmp.m4	Thu Mar 15 15:04:41 2018 +0100
@@ -1,5 +1,5 @@
 # ===========================================================================
-#         http://www.gnu.org/software/autoconf-archive/ax_openmp.html
+#         https://www.gnu.org/software/autoconf-archive/ax_openmp.html
 # ===========================================================================
 #
 # SYNOPSIS
diff -r 120e75853dab -r df131a44310b m4/ax_pthread.m4
--- a/m4/ax_pthread.m4	Wed Mar 14 18:40:00 2018 -0700
+++ b/m4/ax_pthread.m4	Thu Mar 15 15:04:41 2018 +0100
@@ -1,5 +1,5 @@
 # ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
 # ===========================================================================
 #
 # SYNOPSIS
diff -r 120e75853dab -r df131a44310b m4/octave_blas_f77_func.m4
--- a/m4/octave_blas_f77_func.m4	Wed Mar 14 18:40:00 2018 -0700
+++ b/m4/octave_blas_f77_func.m4	Thu Mar 15 15:04:41 2018 +0100
@@ -6,7 +6,7 @@
 # match the size of integers used by the BLAS library.
 
 # ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_blas_f77_func.html
+#     https://www.gnu.org/software/autoconf-archive/ax_blas_f77_func.html
 # ===========================================================================
 #
 # SYNOPSIS
diff -r 120e75853dab -r df131a44310b scripts/general/repelem.m
--- a/scripts/general/repelem.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/general/repelem.m	Thu Mar 15 15:04:41 2018 +0100
@@ -13,8 +13,8 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  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{xxx} =} repelem (@var{x}, @var{R})
diff -r 120e75853dab -r df131a44310b scripts/optimization/humps.m
--- a/scripts/optimization/humps.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/optimization/humps.m	Thu Mar 15 15:04:41 2018 +0100
@@ -13,8 +13,8 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not,
-## see <https://www.gnu.org/licenses/>.
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## Author: Nicholas R. Jankowski <jankowskin@asme.org>
 
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/camlookat.m
--- a/scripts/plot/appearance/camlookat.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/camlookat.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {} camlookat ()
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/camorbit.m
--- a/scripts/plot/appearance/camorbit.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/camorbit.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {} camorbit (@var{theta}, @var{phi})
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/campos.m
--- a/scripts/plot/appearance/campos.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/campos.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {@var{P} =} campos ()
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/camroll.m
--- a/scripts/plot/appearance/camroll.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/camroll.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {} camroll (@var{theta})
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/camtarget.m
--- a/scripts/plot/appearance/camtarget.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/camtarget.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {@var{T} =} camtarget ()
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/camup.m
--- a/scripts/plot/appearance/camup.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/camup.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {@var{up} =} camup ()
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/camva.m
--- a/scripts/plot/appearance/camva.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/camva.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {@var{a} =} camva ()
diff -r 120e75853dab -r df131a44310b scripts/plot/appearance/camzoom.m
--- a/scripts/plot/appearance/camzoom.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/plot/appearance/camzoom.m	Thu Mar 15 15:04:41 2018 +0100
@@ -4,17 +4,17 @@
 ##
 ## 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.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 ##
-## This software 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.
+## 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 software; see the file COPYING.
-## If not, see <https://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {} camzoom (@var{zf})
diff -r 120e75853dab -r df131a44310b scripts/sparse/private/__alltohandles__.m
--- a/scripts/sparse/private/__alltohandles__.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/sparse/private/__alltohandles__.m	Thu Mar 15 15:04:41 2018 +0100
@@ -2,9 +2,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
@@ -13,8 +13,8 @@
 ## GNU General Public License for more details.
 ##
 ## 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/>.
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {[@var{Afun}, @var{M1fun}, @var{M2fun}] =} __alltohandles__ (@var{A}, @var{b}, @var{M1}, @var{M2}, @var{solver_name})
diff -r 120e75853dab -r df131a44310b scripts/sparse/private/__default__input__.m
--- a/scripts/sparse/private/__default__input__.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/sparse/private/__default__input__.m	Thu Mar 15 15:04:41 2018 +0100
@@ -2,9 +2,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
@@ -13,8 +13,8 @@
 ## GNU General Public License for more details.
 ##
 ## 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/>.
+## along with Octave; see the file COPYING.  If not, see
+## <https://www.gnu.org/licenses/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {@var{[varargout]} =} __default__input__ (@var{def_val}, @var{varargin})
diff -r 120e75853dab -r df131a44310b scripts/sparse/tfqmr.m
--- a/scripts/sparse/tfqmr.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/sparse/tfqmr.m	Thu Mar 15 15:04:41 2018 +0100
@@ -2,10 +2,10 @@
 ##
 ## 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 (at
-## your option) any later version.
+## 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
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +14,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/>.
 
 ## -*- texinfo -*-
 ## @deftypefn  {} {@var{x} =} tfqmr (@var{A}, @var{b}, @var{tol}, @var{maxit}, @var{M1}, @var{M2}, @var{x0}, @dots{})
diff -r 120e75853dab -r df131a44310b scripts/statistics/corrcoef.m
--- a/scripts/statistics/corrcoef.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/statistics/corrcoef.m	Thu Mar 15 15:04:41 2018 +0100
@@ -6,7 +6,6 @@
 ## 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.
-## your option) any later version.
 ##
 ## Octave is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
diff -r 120e75853dab -r df131a44310b scripts/strings/native2unicode.m
--- a/scripts/strings/native2unicode.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/strings/native2unicode.m	Thu Mar 15 15:04:41 2018 +0100
@@ -28,7 +28,7 @@
 ## @var{codepage} must be an identifier of a valid code page.  Examples for
 ## valid code pages are @qcode{"ISO-8859-1"}, @qcode{"Shift-JIS"}, or
 ## @qcode{"UTF-16"}.  For a list of supported code pages, see
-## @url{http://www.gnu.org/software/libiconv}.  If @var{codepage} is omitted
+## @url{https://www.gnu.org/software/libiconv}.  If @var{codepage} is omitted
 ## or empty, the system default codepage is used.
 ##
 ## If @var{native_bytes} is a string vector, it is returned as is.
diff -r 120e75853dab -r df131a44310b scripts/strings/unicode2native.m
--- a/scripts/strings/unicode2native.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/strings/unicode2native.m	Thu Mar 15 15:04:41 2018 +0100
@@ -26,7 +26,7 @@
 ## string @var{codepage} must be an identifier of a valid code page.
 ## Examples for valid code pages are @qcode{"ISO-8859-1"},
 ## @qcode{"Shift-JIS"}, or @qcode{"UTF-16"}.  For a list of supported code
-## pages, see @url{http://www.gnu.org/software/libiconv}.  If @var{codepage}
+## pages, see @url{https://www.gnu.org/software/libiconv}.  If @var{codepage}
 ## is omitted or empty, the system default codepage is used.
 ##
 ## If any of the characters cannot be mapped into the codepage @var{codepage},
diff -r 120e75853dab -r df131a44310b scripts/strings/untabify.m
--- a/scripts/strings/untabify.m	Wed Mar 14 18:40:00 2018 -0700
+++ b/scripts/strings/untabify.m	Thu Mar 15 15:04:41 2018 +0100
@@ -7,8 +7,8 @@
 ## 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 WITHOUT ANY WARRANTY; without even the implied warranty of
+## 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.
 ##