# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1599058630 14400
# Node ID 7db56a2694aea2d93fbd23360c98fed93129563f
# Parent  e80fff360be945b38e13fd609917e6d82a29a2bf# Parent  f044b9951df5a47790b312b5ce89c6ff1293c305
maint: merge stable to default.

diff -r e80fff360be9 -r 7db56a2694ae configure.ac
diff -r e80fff360be9 -r 7db56a2694ae etc/HACKING.md
--- a/etc/HACKING.md	Wed Sep 02 11:20:01 2020 +0200
+++ b/etc/HACKING.md	Wed Sep 02 10:57:10 2020 -0400
@@ -307,6 +307,7 @@
   5.0.0   (experimental)  active development of Octave 5 on default branch
   5.0.1   (pre-release)   stabilization period of Octave 5 on stable branch
   5.0.90  (pre-release)   first release candidate for 5.1.0
+  5.0.91  (pre-release)   continued stabilization of Octave 5 on stable branch
   6.0.0   (experimental)  active development of Octave 6 on default branch
   5.1.0   (release)       first release of Octave 5 from stable branch
   5.1.1   (pre-release)   bug fixing on stable branch after 5.1.0 release
@@ -326,7 +327,9 @@
   * Any version X.Y.Z with Z > 0 means, "this is a pre-release version
     meant for bug fixing and testing".  In practice, Z will be either 1
     (stabilization period after and before making release candidates) or
-    90, 91, etc. (release candidate snapshots leading up to release).
+    90, 92, etc. (release candidate snapshots leading up to release).
+    91, 93, etc. (stabilization period on stable branch during the
+    process of making release candidates).
 
   * Any version X.Y.0 with Y != 0 means "this is a released version".