doc: clean up terminology for mysterious conflicts.

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 670853a5058bde8683d36a48ca502a5069a89fe2..361d2252bdb9f26d23863a15d0b4f29d14e160fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-06  Joel E. Denny  <joeldenny@joeldenny.org>
+
+       doc: clean up terminology for mysterious conflicts.
+       * doc/bison.texinfo (Mystery Conflicts): Rename node to...
+       (Mysterious Conflicts): ... this, which is already the section
+       title and the name used in the index.  Update all cross-references
+       to this node.  Also, don't imply that R/R conflicts are the only
+       kind of mysterious conflict.
+
 2011-03-06  Joel E. Denny  <joeldenny@joeldenny.org>
 
        lr.default-reductions: rename "all" value to "full".