# HG changeset patch
# User Rik <rik@octave.org>
# Date 1521495484 25200
# Node ID ecb5688b875feabfc75fdb6121bc0488481b6574
# Parent  f38ac278ff7d20cb04764bba6f98f0104e875f0b# Parent  16155531bda4b01c659d00a37e24026eede565da
maint: merge stable to default.

diff -r f38ac278ff7d -r ecb5688b875f scripts/image/imwrite.m
--- a/scripts/image/imwrite.m	Mon Mar 19 13:50:10 2018 -0700
+++ b/scripts/image/imwrite.m	Mon Mar 19 14:38:04 2018 -0700
@@ -209,7 +209,7 @@
 %! [g] = write_and_read (".jpeg", gray, "quality", 100);
 %! assert (g, gray);
 
-%!function [compression] = get_bmp_compression (ext, cmap = [], varargin)
+%!function compression = get_bmp_compression (ext, cmap = [], varargin)
 %!  gray = repmat (uint8 (0:255), 100, 1);
 %!  filename = [tempname() ext];
 %!  unwind_protect
diff -r f38ac278ff7d -r ecb5688b875f scripts/miscellaneous/edit.m
--- a/scripts/miscellaneous/edit.m	Mon Mar 19 13:50:10 2018 -0700
+++ b/scripts/miscellaneous/edit.m	Mon Mar 19 14:38:04 2018 -0700
@@ -493,7 +493,7 @@
         if (any (exists == [2, 103]))
           body = type (name){1};
         else
-          body = ["function [retval] = " basename " (input1, input2)\n\n" ...
+          body = ["function retval = " basename " (input1, input2)\n\n" ...
                   "endfunction\n"];
         endif
         if (isempty (head))
diff -r f38ac278ff7d -r ecb5688b875f scripts/miscellaneous/mkdir.m
--- a/scripts/miscellaneous/mkdir.m	Mon Mar 19 13:50:10 2018 -0700
+++ b/scripts/miscellaneous/mkdir.m	Mon Mar 19 14:38:04 2018 -0700
@@ -1,7 +1,7 @@
 ## Copyright (C) 2016-2017 Lachlan Andrew
 ## Copyright (C) 2012 Carnë Draug
 ##
-## This program 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.
diff -r f38ac278ff7d -r ecb5688b875f scripts/pkg/private/get_description.m
--- a/scripts/pkg/private/get_description.m	Mon Mar 19 13:50:10 2018 -0700
+++ b/scripts/pkg/private/get_description.m	Mon Mar 19 14:38:04 2018 -0700
@@ -137,7 +137,7 @@
 
 endfunction
 
-function [valid] = is_valid_pkg_version_string (str)
+function valid = is_valid_pkg_version_string (str)
   ## We are limiting ourselves to this set of characters because the
   ## version will appear on the filepath.  The portable character, according to
   ## http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_278