# HG changeset patch
# User Rik <rik@octave.org>
# Date 1669748900 28800
# Node ID 01143c6ab610e67992377ac119840a43005d2bb3
# Parent  87a8c7e2f20fd15462d03d9c8e68c16360338319# Parent  7c020b18e299e2c3abfdf15b03ee16dffb53b271
maint: merge stable to default

diff -r 87a8c7e2f20f -r 01143c6ab610 Makefile.am
--- a/Makefile.am	Tue Nov 29 14:06:07 2022 +0100
+++ b/Makefile.am	Tue Nov 29 11:08:20 2022 -0800
@@ -391,8 +391,8 @@
 	$(AM_V_GEN)$(gdbinit-install-rule)
 
 NEWS: etc/NEWS.$(OCTAVE_MAJOR_VERSION).md
-	$(AM_V_GEN)cp $< $@
-.PHONY: NEWS
+	$(AM_V_GEN)rm -f $@ && \
+	cp $< $@
 
 define changelog-from-hg-log
   rm -f $@-t && \
diff -r 87a8c7e2f20f -r 01143c6ab610 doc/interpreter/octave.texi
--- a/doc/interpreter/octave.texi	Tue Nov 29 14:06:07 2022 +0100
+++ b/doc/interpreter/octave.texi	Tue Nov 29 11:08:20 2022 -0800
@@ -115,8 +115,7 @@
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1996-2022 The Octave Project Developers
 
-@c FIXME The next sentence needs manual updating with each major release.
-This is the eighth edition of the Octave documentation, and is consistent
+This is edition @value{EDITION} of the Octave documentation, and is consistent
 with version @value{VERSION} of Octave.
 
 Permission is granted to make and distribute verbatim copies of
diff -r 87a8c7e2f20f -r 01143c6ab610 test/Makefile.am
--- a/test/Makefile.am	Tue Nov 29 14:06:07 2022 +0100
+++ b/test/Makefile.am	Tue Nov 29 11:08:20 2022 -0800
@@ -239,7 +239,8 @@
   $(GENERATED_TEST_FILES)
 
 DISTCLEANFILES += \
-  fntests.log
+  fntests.log \
+  $(DIRSTAMP_FILES)
 
 clean-local: test-clean