Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d756f4fd0f01a640d36175a92b64c4325390f716..79214acc102b9e11385cfb3a5ab4861497b6490b 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,13 @@
+2013-01-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * autotype.texi: Remove undefined command @subtitlefont.
+       * cc-mode.texi: Likewise.
+
+       * org.texi (Advanced features): Use `@w{ }' instead of `@ ' in
+       @item argument.
+       (Property searches): Use \\ instead of @backslashchar{}.
+       * pgg.texi (VERSION): Move @set below @setfilename.
+
 2013-01-05  Andreas Schwab  <schwab@linux-m68k.org>
 
        * ada-mode.texi: Remove braces from @title argument.