regen.

[bison.git] / NEWS

diff --git a/NEWS b/NEWS
index c0414a2148bc5c0e01519495fd9756d2c0726d4f..8db03d609b02b7fb9d610c871be11ed4aa1419f4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ GNU Bison NEWS
 
 ** Warnings
 
-*** Warning categories are now diplayed in warnings
+*** Warning categories are now displayed in warnings
 
   For instance:
 
@@ -117,11 +117,14 @@ GNU Bison NEWS
   YYERROR) if the expression evaluates to 0, and are evaluated immediately
   in GLR parsers, rather than being deferred.  The result is that they
   allow the programmer to prune possible parses based on the values of
-  runtime expressions.
+  run-time expressions.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
-** Future changes
+
+* Noteworthy changes in release 2.6 (2012-07-19) [stable]
+
+** Future changes:
 
   The next major release of Bison will drop support for the following
   deprecated features.  Please report disagreements to bug-bison@gnu.org.
@@ -151,7 +154,7 @@ GNU Bison NEWS
   because existing versions of ylwrap (e.g., Automake 1.12.1) do not support
   it.
 
-** Headers
+** Generated Parser Headers
 
 *** Guards (yacc.c, glr.c, glr.cc)
 
@@ -213,10 +216,19 @@ GNU Bison NEWS
     # define BAR_FOO_H                  # define BAR_FOO_H
 
     /* Enabling traces.  */             /* Enabling traces.  */
-    # ifndef YYDEBUG                    # ifndef YYDEBUG
-    #  define YYDEBUG 0                 #  define YYDEBUG 0
-    # endif                             # endif
-    # if YYDEBUG                        # if YYDEBUG
+    # ifndef YYDEBUG                  | # ifndef BAR_DEBUG
+                                      > #  if defined YYDEBUG
+                                      > #   if YYDEBUG
+                                      > #    define BAR_DEBUG 1
+                                      > #   else
+                                      > #    define BAR_DEBUG 0
+                                      > #   endif
+                                      > #  else
+    #  define YYDEBUG 0               | #   define BAR_DEBUG 0
+                                      > #  endif
+    # endif                           | # endif
+
+    # if YYDEBUG                      | # if BAR_DEBUG
     extern int bar_debug;               extern int bar_debug;
     # endif                             # endif
 
@@ -1913,7 +1925,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  LocalWords:  namespaces strerror const autoconfiguration Dconst Autoconf's FDL
  LocalWords:  Automake TMPDIR LESSEQ ylwrap endif yydebug YYTOKEN YYLSP ival hh
  LocalWords:  extern YYTOKENTYPE TOKENTYPE yytokentype tokentype STYPE lval pdf
- LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp
+ LocalWords:  lang yyoutput dvi html ps POSIX lvalp llocp Wother nterm arg init
+ LocalWords:  TOK
 
 Local Variables:
 mode: outline