Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

1 files changed, 21 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index be79a9d864d..46fea77107b 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,24 @@
+2012-04-14  Alan Mackenzie  <acm@muc.de>
+
+        * cc-mode.texi (c-offsets-alist): Correct a typo.
+
+2012-04-14  Jérémie Courrèges-Anglas  <jca@wxcvbn.org>  (tiny change)
+
+        * org.texi (Deadlines and scheduling): Fix the example: the
+        DEADLINE item should come right after the headline.  We enforce
+        this convention, so it is a bug not to illustrate it correctly in
+        the manual.
+
+2012-04-14  Ippei FURUHASHI  <top.tuna+orgmode@gmail.com>  (tiny change)
+
+        * org.texi (Agenda commands): Fix documentation bug by swapping
+        the equivalent keybindings to `org-agenda-next-line' with the ones
+        to `org-agenda-previous-line'.
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in: Replace non-portable use of $< in ordinary rules.
+
 2012-04-09  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add