* doc/bison.texinfo (Introduction): Don't say "GLR grammar".

diff --git a/ChangeLog b/ChangeLog
index f95ad56c7005fdbe0ff35d53adbd036534c7ad92..b8aa2e8538a6def95b19f3e0fab169e113bad3cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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-29  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * src/getargs.c (usage): Mention GLR not just LALR(1) in --help output.

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 5021e2e3eaa0c34f4efa08dbadd9c82e2c366375..40d08b875fdc0d378b27dae7064452e7290e4573 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -331,9 +331,9 @@ Copying This Manual
 @unnumbered Introduction
 @cindex introduction
 
 @unnumbered Introduction
 @cindex introduction
 

-@dfn{Bison} is a general-purpose parser generator that converts a grammar
-description for an @acronym{LALR}(1) or @acronym{GLR} context-free grammar
-into a C or C++ program to parse that grammar.  Once you are proficient with
+@dfn{Bison} is a general-purpose parser generator that converts an
+annotated context-free grammar into an @acronym{LALR}(1) or
+@acronym{GLR} parser for that grammar.  Once you are proficient with

 Bison, you can use it to develop a wide range of language parsers, from those
 used in simple desk calculators to complex programming languages.
 
 Bison, you can use it to develop a wide range of language parsers, from those
 used in simple desk calculators to complex programming languages.