X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d815ec4a6290e18fac9220438622f6dd27b3227f..121c498280f96b31a1f90e2012751509e6358a64:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 670853a5..69efad5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-03-06  Joel E. Denny  <joeldenny@joeldenny.org>
+
+	doc: cite publication for LAC.
+	* doc/bison.texinfo (LAC): Here.
+
+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".