# HG changeset patch
# User Rik <rik@octave.org>
# Date 1641507783 28800
# Node ID 916e139297738d7ae79e363d2cafcefcc394e670
# Parent  6848686caf2bdd4c8caf78cd1c4e304c1e8cfbc8# Parent  824c67e2bd66d691d29d3b9f1d101a5233e860b2
maint: merge stable to default.

diff -r 6848686caf2b -r 916e13929773 etc/NEWS.7.md
--- a/etc/NEWS.7.md	Thu Jan 06 13:07:13 2022 +0100
+++ b/etc/NEWS.7.md	Thu Jan 06 14:23:03 2022 -0800
@@ -310,11 +310,11 @@
 
 - Functions
 
-  Function                   | Replacement
-  -------------------------- |----------------------------
-  disable_diagonal_matrix    | optimize_diagonal_matrix
-  disable_permutation_matrix | optimize_permutation_matrix
-  disable_range              | optimize_range
+  Function                     | Replacement
+  ---------------------------- |----------------------------
+  `disable_diagonal_matrix`    | `optimize_diagonal_matrix`
+  `disable_permutation_matrix` | `optimize_permutation_matrix`
+  `disable_range`              | `optimize_range`
 
 - Properties
 
@@ -325,10 +325,10 @@
 
   Operator | Replacement | Description
   ---------|-------------|------------
-  **       | ^           | Matrix exponent
-  .**      | .^          | Element-by-element exponent
-  .+       | +           | Element-by-element addition
-  .-       | -           | Element-by-element subtraction
+  `**`     | `^`         | Matrix exponent
+  `.**`    | `.^`        | Element-by-element exponent
+  `.+`     | `+`         | Element-by-element addition
+  `.-`     | `-`         | Element-by-element subtraction
 
 - Interpreter
 
diff -r 6848686caf2b -r 916e13929773 scripts/deprecated/disable_diagonal_matrix.m
--- a/scripts/deprecated/disable_diagonal_matrix.m	Thu Jan 06 13:07:13 2022 +0100
+++ b/scripts/deprecated/disable_diagonal_matrix.m	Thu Jan 06 14:23:03 2022 -0800
@@ -27,6 +27,10 @@
 ## @deftypefn  {} {@var{val} =} disable_diagonal_matrix ()
 ## @deftypefnx {} {@var{old_val} =} disable_diagonal_matrix (@var{new_val})
 ## @deftypefnx {} {@var{old_val} =} disable_diagonal_matrix (@var{new_val}, "local")
+##
+## @code{disable_diagonal_matrix} is deprecated and will be removed in Octave
+## version 9.  Use @code{optimize_diagonal_matrix} instead.
+##
 ## Query or set whether storing diagonal matrices in a special space-efficient
 ## format is disabled.
 ##
diff -r 6848686caf2b -r 916e13929773 scripts/deprecated/disable_permutation_matrix.m
--- a/scripts/deprecated/disable_permutation_matrix.m	Thu Jan 06 13:07:13 2022 +0100
+++ b/scripts/deprecated/disable_permutation_matrix.m	Thu Jan 06 14:23:03 2022 -0800
@@ -27,6 +27,10 @@
 ## @deftypefn  {} {@var{val} =} disable_permutation_matrix ()
 ## @deftypefnx {} {@var{old_val} =} disable_permutation_matrix (@var{new_val})
 ## @deftypefnx {} {@var{old_val} =} disable_permutation_matrix (@var{new_val}, "local")
+##
+## @code{disable_permutation_matrix} is deprecated and will be removed in
+## Octave version 9.  Use @code{optimize_permutation_matrix} instead.
+##
 ## Query or set whether storing permutation matrices in a special
 ## space-efficient format is disabled.
 ##
diff -r 6848686caf2b -r 916e13929773 scripts/deprecated/disable_range.m
--- a/scripts/deprecated/disable_range.m	Thu Jan 06 13:07:13 2022 +0100
+++ b/scripts/deprecated/disable_range.m	Thu Jan 06 14:23:03 2022 -0800
@@ -27,6 +27,10 @@
 ## @deftypefn  {} {@var{val} =} disable_range ()
 ## @deftypefnx {} {@var{old_val} =} disable_range (@var{new_val})
 ## @deftypefnx {} {@var{old_val} =} disable_range (@var{new_val}, "local")
+##
+## @code{disable_range} is deprecated and will be removed in Octave version 9.
+## Use @code{optimize_range} instead.
+##
 ## Query or set whether storing ranges in a special space-efficient format is
 ## disabled.
 ##