# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1627659250 -7200
# Node ID aa98b5fdfbbb1524d13ae35fc977d26c7ce62c5f
# Parent  2420f8f62ebe58ec644fbc4f23835d87faa87ce0# Parent  a3ac00db296b98e958fceee8e5bab1d00319bc25
maint: Merge stable to default.

diff -r 2420f8f62ebe -r aa98b5fdfbbb libinterp/octave-value/ov.cc
--- a/libinterp/octave-value/ov.cc	Fri Jul 30 17:05:56 2021 +0200
+++ b/libinterp/octave-value/ov.cc	Fri Jul 30 17:34:10 2021 +0200
@@ -3636,15 +3636,15 @@
 @deftypefn  {} {@var{val} =} disable_permutation_matrix ()
 @deftypefnx {} {@var{old_val} =} disable_permutation_matrix (@var{new_val})
 @deftypefnx {} {} disable_permutation_matrix (@var{new_val}, "local")
-Query or set the internal variable that controls whether permutation
-matrices are stored in a special space-efficient format.
-
-The default value is true.  If this option is disabled Octave will store
+Query or set whether storing permutation matrices in a special space-efficient
+format is disabled.
+
+The default value is false.  If this option is set to true, Octave will store
 permutation matrices as full matrices.
 
-When called from inside a function with the @qcode{"local"} option, the
-variable is changed locally for the function and any subroutines it calls.
-The original variable value is restored when exiting the function.
+When called from inside a function with the @qcode{"local"} option, the setting
+is changed locally for the function and any subroutines it calls.  The original
+setting is restored when exiting the function.
 @seealso{disable_range, disable_diagonal_matrix}
 @end deftypefn */)
 {
@@ -3666,15 +3666,15 @@
 @deftypefn  {} {@var{val} =} disable_diagonal_matrix ()
 @deftypefnx {} {@var{old_val} =} disable_diagonal_matrix (@var{new_val})
 @deftypefnx {} {} disable_diagonal_matrix (@var{new_val}, "local")
-Query or set the internal variable that controls whether diagonal
-matrices are stored in a special space-efficient format.
-
-The default value is true.  If this option is disabled Octave will store
+Query or set whether storing diagonal matrices in a special space-efficient
+format is disabled.
+
+The default value is false.  If this option is set to true, Octave will store
 diagonal matrices as full matrices.
 
-When called from inside a function with the @qcode{"local"} option, the
-variable is changed locally for the function and any subroutines it calls.
-The original variable value is restored when exiting the function.
+When called from inside a function with the @qcode{"local"} option, the setting
+is changed locally for the function and any subroutines it calls. The original
+setting is restored when exiting the function.
 @seealso{disable_range, disable_permutation_matrix}
 @end deftypefn */)
 {
@@ -3710,15 +3710,15 @@
 @deftypefn  {} {@var{val} =} disable_range ()
 @deftypefnx {} {@var{old_val} =} disable_range (@var{new_val})
 @deftypefnx {} {} disable_range (@var{new_val}, "local")
-Query or set the internal variable that controls whether ranges are stored
-in a special space-efficient format.
-
-The default value is true.  If this option is disabled Octave will store
+Query or set whether storing ranges in a special space-efficient format is
+disabled.
+
+The default value is false.  If this option is set to true, Octave will store
 ranges as full matrices.
 
-When called from inside a function with the @qcode{"local"} option, the
-variable is changed locally for the function and any subroutines it calls.
-The original variable value is restored when exiting the function.
+When called from inside a function with the @qcode{"local"} option, the setting
+is changed locally for the function and any subroutines it calls.  The original
+setting is restored when exiting the function.
 @seealso{disable_diagonal_matrix, disable_permutation_matrix}
 @end deftypefn */)
 {