* doc/bison.texinfo (Mystery Conflicts): Hint '-v' use.

From Golubev I. N.

diff --git a/ChangeLog b/ChangeLog
index c9937f641ed6161df985f51cba4b16e5667c51dc..8421bf2b179284a985694e7fb1f3143114d902cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-25  Marc Autret  <autret_m@epita.fr>
+
+       * doc/bison.texinfo (Mystery Conflicts): Hint '-v' use.
+       From Golubev I. N.
+
 2001-11-23  Akim Demaille  <akim@epita.fr>
 
        * lib/alloca.c: Update, from fileutils.

diff --git a/THANKS b/THANKS
index 346d5977bd0e52abb2d8272b4cb50055ad5b32b4..abb0d8ab54204fe3224c32a0e15402e19d66d7b3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -9,6 +9,7 @@ Daniel Hagerty          hag@gnu.org
 David J. MacKenzie      djm@gnu.org
 Dick Streefland                dick.streefland@altium.nl
 Fabrice Bauzac          noon@cote-dazur.com
+Golubev I. N           gin@mo.msk.ru
 Hans Aberg              haberg@matematik.su.se
 Jesse Thilo             jthilo@gnu.org
 Jim Meyering            meyering@gnu.org

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 5449086f92049179bc0b5af522b969eacc8e1760..1abf856e7c226994aae281a31dee15ba0d194921 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -4506,8 +4506,9 @@ produce parsers that are very large.  In practice, Bison is more useful
 as it is now.
 
 When the problem arises, you can often fix it by identifying the two
-parser states that are being confused, and adding something to make them
-look distinct.  In the above example, adding one rule to
+parser states that are being confused (using @samp{-v}
+(@pxref{Invocation, ,Invoking Bison}) can help), and adding something to
+make them look distinct.  In the above example, adding one rule to
 @code{return_spec} as follows makes the problem go away:
 
 @example