Revert doc patch.

diff --git a/ChangeLog b/ChangeLog
index b7c5a449df5592b97c924d41fd1b32f68af04071..d227611fc47c488b09ab7738e19f0387f52ef315 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,11 +34,6 @@
        conflicts as expected.
        * tests/regression.at (%expect right): Adjust.
 
        conflicts as expected.
        * tests/regression.at (%expect right): Adjust.
 

-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.
 2001-11-23  Akim Demaille  <akim@epita.fr>
 
        * lib/alloca.c: Update, from fileutils.

diff --git a/THANKS b/THANKS
index abb0d8ab54204fe3224c32a0e15402e19d66d7b3..346d5977bd0e52abb2d8272b4cb50055ad5b32b4 100644 (file)
--- 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
 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
 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 7b665633791586e9e824291431ac931c500e788c..bf0f790b371cd38698d5802c67e3904ecfa1c8bb 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -4507,9 +4507,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
 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
 @code{return_spec} as follows makes the problem go away:
 
 @example