diff --git a/ChangeLog b/ChangeLog
index d9b0b990..65cc914d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-17  Akim Demaille  <akim@epita.fr>
+
+	* doc/bison.texinfo (Calc++ Parser): Don't try to alias
+	nonterminals.
+	Use per-type %printer.
+
 2007-01-17  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	* NEWS, data/c++-skel.m4, data/c++.m4, data/c-skel.m4, data/c.m4,
diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 0a9b83d4..542b1215 100644
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -7969,7 +7969,7 @@ avoid name clashes.
 %token        ASSIGN     ":="
 %token <sval> IDENTIFIER "identifier"
 %token <ival> NUMBER     "number"
-%type  <ival> exp        "expression"
+%type  <ival> exp
 @end example
 
 @noindent
@@ -7982,7 +7982,7 @@ To enable memory deallocation during error recovery, use
 %printer    @{ debug_stream () << *$$; @} "identifier"
 %destructor @{ delete $$; @} "identifier"
 
-%printer    @{ debug_stream () << $$; @} "number" "expression"
+%printer    @{ debug_stream () << $$; @} <ival>
 @end example
 
 @noindent