# HG changeset patch
# User Rik <rik@octave.org>
# Date 1653663516 25200
# Node ID 39ca6d0b63e4b02387746b7e8aa11cfd549aeed0
# Parent  a357490263f68ade5a03021341b9b698e8829de9# Parent  39876ea8c588215218fe0e076d62829841fd83db
maint: merge stable to default

diff -r a357490263f6 -r 39ca6d0b63e4 etc/NEWS.7.md
--- a/etc/NEWS.7.md	Fri May 27 15:58:10 2022 +0200
+++ b/etc/NEWS.7.md	Fri May 27 07:58:36 2022 -0700
@@ -325,6 +325,10 @@
   `disable_permutation_matrix` | `optimize_permutation_matrix`
   `disable_range`              | `optimize_range`
 
+  For plot functions, the use of numbers to select line colors in
+  shorthand formats was an undocumented feature that is deprecated in
+  Octave 7 and will be removed from Octave 9.
+
 - Operators
 
   Operator | Replacement | Description
@@ -362,11 +366,6 @@
   and a warning is now emitted if it is used, but it will continue to
   work.
 
-- Using numbers to select line colors in short hand formats was an
-  un-documented feature that is deprecated in Octave 7 and will be
-  removed from Octave 9.
-
-
 ### Removed functions, properties, and features
 
 The following functions and properties were deprecated in Octave 5
diff -r a357490263f6 -r 39ca6d0b63e4 scripts/help/warning_ids.m
--- a/scripts/help/warning_ids.m	Fri May 27 15:58:10 2022 +0200
+++ b/scripts/help/warning_ids.m	Fri May 27 07:58:36 2022 -0700
@@ -197,6 +197,11 @@
 ## scheduled for removal from Octave.
 ## By default, the @code{Octave:deprecated-keyword} warning is enabled.
 ##
+## @item Octave:deprecated-option
+## If the @code{Octave:deprecated-option} warning is enabled, a
+## warning is issued when an obsolete option or input to a function is used.
+## By default, the @code{Octave:deprecated-option} warning is enabled.
+##
 ## @item Octave:deprecated-property
 ## If the @code{Octave:deprecated-property} warning is enabled, a
 ## warning is issued when Octave encounters a graphics property that