* src/getargs.c (usage): Back out yesterday's modification of the

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 85646aecfe5f5604402697b7175c6fe861e82a0b..8eb003f09f8ae7bcd4ef164368eed9d32c1d5802 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-05-30  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * src/getargs.c (usage): Back out yesterday's modification of the
+       --help output so that we don't have to wait for translation before
+       releasing 2.3.
+
+2006-05-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * doc/bison.texinfo (Introduction): Don't say "GLR grammar".
+       Problem reported by Akim Demaille.
+
+2006-05-29  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * src/getargs.c (usage): Mention GLR not just LALR(1) in --help output.
+
 2006-05-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/yacc.c (yy_reduce_print): Omit trailing white space in