document and support usage of git-merge-changelog

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5f31ec68e03bfd8b705b672a310fadd6c49639e9..5727a03c42fd68b2a10ab0e21841b7686fcb9717 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2008-07-31  Paolo Bonzini  <bonzini@gnu.org>
+
+       Support usage of git-merge-changelog.
+       * .gitattributes: New.
+       * HACKING: Document usage of git-merge-changelog.
+       * bootstrap: Install git-merge-changelog entries in .git/config
+       if appropriate.
+
+2008-07-27  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Remove remaining dependence on CVS Id keyword.
+       * ChangeLog: For the sake of people still using CVS, don't use dollars
+       when mentioning Id.
+       * data/xslt/bison.xsl: Remove Id from header comments, where it was
+       unusual anyway.
+       * data/xslt/xml2dot.xsl: Likewise.
+       * data/xslt/xml2text.xsl: Likewise.
+       * data/xslt/xml2xhtml.xsl: Likewise.
+       * doc/Doxyfile.in (PROJECT_NUMBER): Don't use ID.
+       * doc/Makefile.am (neutralize): Remove, no longer needed.
+       (.x.1): Don't use neutralize.
+       (edit): Don't substitute for ID.
+       (Doxyfile): Don't define Id, and thus don't depend on ChangeLog.
+
 2008-07-27  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Fix dependence on computed configure variables.
@@ -21,7 +45,7 @@
        * .gitignore (/.tarball-version, /GNUmakefile, /*~): Add.
        * .prev-version: New.
        * .version.in: Remove.
-       * ChangeLog: Remove the $Id$ previously used for capturing the CVS
+       * ChangeLog: Remove the Id previously used for capturing the CVS
        revision.
        * GNUmakefile: Remove, now copied from Gnulib.
        * Makefile.am: Add code suggested by comments in