[both]: mystery-conflicts-doc.patch

[Marc Autret]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/bison/bison/ChangeLog,v
retrieving revision 1.173.2.153
diff -u -r1.173.2.153 ChangeLog
--- ChangeLog   2001/11/23 14:55:36     1.173.2.153
+++ ChangeLog   2001/11/25 12:53:56
@@ -1,3 +1,8 @@
+2001-11-25  Marc Autret  <address@hidden>
+
+       * doc/bison.texinfo (Mystery Conflicts): Hint '-v' use.
+       From Golubev I. N.
+
 2001-11-23  Akim Demaille  <address@hidden>
 
        * lib/alloca.c: Update, from fileutils.
Index: THANKS
===================================================================
RCS file: /cvsroot/bison/bison/THANKS,v
retrieving revision 1.10.2.11
diff -u -r1.10.2.11 THANKS
--- THANKS      2001/11/14 15:16:40     1.10.2.11
+++ THANKS      2001/11/25 12:53:56
@@ -9,6 +9,7 @@
 David J. MacKenzie      address@hidden
 Dick Streefland                address@hidden
 Fabrice Bauzac          address@hidden
+Golubev I. N           address@hidden
 Hans Aberg              address@hidden
 Jesse Thilo             address@hidden
 Jim Meyering            address@hidden
Index: doc/bison.texinfo
===================================================================
RCS file: /cvsroot/bison/bison/doc/bison.texinfo,v
retrieving revision 1.37.2.8
diff -u -r1.37.2.8 bison.texinfo
--- doc/bison.texinfo   2001/11/12 09:20:35     1.37.2.8
+++ doc/bison.texinfo   2001/11/25 12:54:13
@@ -4506,8 +4506,9 @@
 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


-- 
Marc Autret