Merge upstream Org (from commit 488eea)

1 files changed, 18 insertions, 0 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ae9f099de50..b96345ba135 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,21 @@
+2012-12-12  Bastien Guerry  <bzg@gnu.org>
+
+        * org.texi (Summary, Code block specific header arguments)
+        (Code block specific header arguments)
+        (Header arguments in function calls, var, noweb)
+        (Results of evaluation, Code evaluation security): Small
+        reformatting: add a blank line before some example.
+
+        * org.texi (System-wide header arguments)
+        (Header arguments in Org mode properties, Conflicts)
+        (Dynamic blocks, Using the mapping API): Fix indendation of
+        Elisp code examples.
+
+        * org.texi (Comment lines): Fix description of the comment syntax.
+
+        * org.texi (Installation): Mention "make test" in the correct
+        section.
+
 2012-12-02  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Top, Obtaining Tramp): Replace CVS by Git.