# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1641438624 18000
# Node ID 2ace5c035cd24a9c94d0e5eaea5236aff9a34128
# Parent  00ab5e929111740c0682885f6c86a2793078c149# Parent  c52c0ed8b5b9b0a7eb2b2a209c370e5d8d4587c1
maint: Merge stable to default.

diff -r 00ab5e929111 -r 2ace5c035cd2 .hgtags
--- a/.hgtags	Wed Jan 05 19:30:43 2022 +0100
+++ b/.hgtags	Wed Jan 05 22:10:24 2022 -0500
@@ -128,3 +128,4 @@
 754013c3658760136fe473911ba96165a07cb1f5 release-6-3-0
 3dc9decc98f97d0b05fff9dbb66b2400d6139830 rc-6-3-90
 8d7671609955afabf79ceff678cc41eea61583f2 release-6-4-0
+347dbc9049d55b63435d710e1d9d826cbfe5e54c rc-7-0-90
diff -r 00ab5e929111 -r 2ace5c035cd2 CITATION
--- a/CITATION	Wed Jan 05 19:30:43 2022 +0100
+++ b/CITATION	Wed Jan 05 22:10:24 2022 -0500
@@ -1,17 +1,17 @@
 To cite GNU Octave in publications use:
 
   John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2020).
-  GNU Octave version 6.1.0 manual: a high-level interactive language for
+  GNU Octave version 7.1.0 manual: a high-level interactive language for
   numerical computations.
-  URL https://www.gnu.org/software/octave/doc/v6.3.0/
+  URL https://www.gnu.org/software/octave/doc/v7.1.0/
 
 A BibTeX entry for LaTeX users is:
 
   @manual{,
-    title     = {{GNU Octave} version 6.3.0 manual: a high-level interactive language for numerical computations},
+    title     = {{GNU Octave} version 7.1.0 manual: a high-level interactive language for numerical computations},
     author    = {John W. Eaton and David Bateman and S{\o}ren Hauberg and Rik Wehbring},
-    year      = {2021},
-    url       = {https://www.gnu.org/software/octave/doc/v6.3.0/},
+    year      = {2022},
+    url       = {https://www.gnu.org/software/octave/doc/v7.1.0/},
   }
 
 We have invested a lot of time and effort in creating GNU Octave, please
diff -r 00ab5e929111 -r 2ace5c035cd2 configure.ac
--- a/configure.ac	Wed Jan 05 19:30:43 2022 +0100
+++ b/configure.ac	Wed Jan 05 22:10:24 2022 -0500
@@ -48,7 +48,7 @@
 
 OCTAVE_COPYRIGHT="Copyright (C) 2021-2022 The Octave Project Developers."
 
-OCTAVE_RELEASE_DATE="2021-11-24"
+OCTAVE_RELEASE_DATE="2022-01-05"
 
 ## The "API version" is used as a way of checking that interfaces in the
 ## liboctave and libinterp libraries haven't changed in a backwardly
@@ -63,7 +63,7 @@
 dnl FIXME: Since we also set libtool versions for liboctave and libinterp,
 dnl perhaps we should be computing the "api version" from those versions numbers
 dnl in some way instead of setting it independently here.
-OCTAVE_API_VERSION="api-v56+"
+OCTAVE_API_VERSION="api-v57+"
 
 AC_SUBST(OCTAVE_MAJOR_VERSION)
 AC_SUBST(OCTAVE_MINOR_VERSION)
diff -r 00ab5e929111 -r 2ace5c035cd2 etc/NEWS.7.md
--- a/etc/NEWS.7.md	Wed Jan 05 19:30:43 2022 +0100
+++ b/etc/NEWS.7.md	Wed Jan 05 22:10:24 2022 -0500
@@ -1,5 +1,5 @@
-Summary of important user-visible changes for version 7 (yyyy-mm-dd):
-----------------------------------------------------------------------
+Summary of important user-visible changes for version 7 (2022-01-05)
+--------------------------------------------------------------------
 
 ### General improvements