From: Marc Autret Date: Mon, 26 Nov 2001 19:19:21 +0000 (+0000) Subject: Revert doc patch. X-Git-Tag: BISON-1_30f~68 X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/c18cf8cb264f2751fa34ba05491d3c20e30516d8?ds=inline Revert doc patch. --- diff --git a/ChangeLog b/ChangeLog index 9ded689b..5008e1d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,11 +39,6 @@ conflicts as expected. * tests/regression.at (%expect right): Adjust. -2001-11-25 Marc Autret - - * doc/bison.texinfo (Mystery Conflicts): Hint '-v' use. - From Golubev I. N. - 2001-11-23 Akim Demaille * lib/alloca.c: Update, from fileutils. diff --git a/THANKS b/THANKS index abb0d8ab..346d5977 100644 --- a/THANKS +++ b/THANKS @@ -9,7 +9,6 @@ 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 1abf856e..5449086f 100644 --- a/doc/bison.texinfo +++ b/doc/bison.texinfo @@ -4506,9 +4506,8 @@ 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 (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 +parser states that are being confused, 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