From dc7407bb002b20c781e1d40b6678d1df7f2818fc Mon Sep 17 00:00:00 2001
From: Mats Wichmann <mats@linux.com>
Date: Fri, 19 May 2023 08:24:11 -0600
Subject: Fix doc typo referencing YACC_GRAPH_FILE_SUFFIX  [skip appveyor]

Signed-off-by: Mats Wichmann <mats@linux.com>
---
 CHANGES.txt         |  6 ++++--
 SCons/Tool/yacc.xml | 15 +++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index dfdba44..f99e8ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,10 @@ NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer suppo
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
+  From William Deegan:
+    - Obsoleted YACCVCGFILESUFFIX, being replaced by YACC_GRAPH_FILE_SUFFIX.
+      If YACC_GRAPH_FILE_SUFFIX is not set, it will respect YACCVCGFILESUFFIX.
+
   From Mats Wichmann
     - C scanner's dictifyCPPDEFINES routine did not understand the possible
       combinations of CPPDEFINES - not aware of a "name=value" string either
@@ -32,8 +36,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       not to the source file name, to match actual current behavior (only
       affects if target explicitly requested with a different base name
       than source).  Docs updated.  Fixes #4326 and #4327.
-      Obsoleted YACCVCGFILESUFFIX, being replaced by YACC_GRAPH_FILE_SUFFIX.
-      If YACC_GRAPH_FILE_SUFFIX is not set, it will respect YACCVCGFILESUFFIX.
     - SCons test runner now uses pathlib to normalize and compare paths
       to test files.
     - Minor doc fixes: signature of Alias() now matches implementation
diff --git a/SCons/Tool/yacc.xml b/SCons/Tool/yacc.xml
index 3d4fa33..82725db 100644
--- a/SCons/Tool/yacc.xml
+++ b/SCons/Tool/yacc.xml
@@ -231,10 +231,14 @@ The default value is <filename>.hpp</filename>.
 <cvar name="YACCVCGFILESUFFIX">
 <summary>
 <para>
-Obsoleted. Use &cv-link-ACC_GRAPH_FILE_SUFFIX;.
+Obsoleted. Use &cv-link-YACC_GRAPH_FILE_SUFFIX; instead.
+The value is used only if &cv-YACC_GRAPH_FILE_SUFFIX; is not set.
+The default value is <filename>.gv</filename>.
 </para>
 <para>
-<emphasis>Changed in version 4.X.Y</emphasis>
+<emphasis>Changed in version 4.X.Y</emphasis>: deprecated. The default value
+changed from <filename>.vcg</filename> (&bison; stopped generating
+<filename>.vcg</filename> output with version 2.4, in 2006).
 </para>
 </summary>
 </cvar>
@@ -256,13 +260,8 @@ it does not affect the actual generated filename.
 Various yacc tools have emitted various formats
 at different times.
 Set this to match what your parser generator produces.
-The default value is <filename>.gv</filename>.
-</para>
-<para>
-<emphasis>Changed in version 4.X.Y</emphasis>: the default value
-changed from <filename>.vcg</filename> (&bison; stopped generating
-<filename>.vcg</filename> output with version 2.4, in 2006).
 </para>
+<para><emphasis>New in version 4.X.Y</emphasis>. </para>
 </summary>
 </cvar>
 
-- 
cgit v0.12