Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

1 files changed, 29 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index fb54cd30b12..4f336cdbce4 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,31 @@
+2014-04-22  Bastien Guerry  <bzg@gnu.org>
+
+        * org.texi (Installation): Be more clear on why installing Org
+        through ELPA should be done without loading any Org file.
+
+        * org.texi (Emphasis and monospace): Document the use of
+        =verbatim= and ~code~ to be consistent with
+        `org-element-text-markup-successor'.
+
+        * org.texi (In-buffer settings, Radio tables): Tiny fixes.
+
+        * org.texi (Initial visibility):
+        * org.texi (Literal examples): Fix typos.
+
+2014-04-22  Michael Brand  <michael.ch.brand@gmail.com>
+
+        * org.texi (Column attributes): Add a sentence to point out
+        the dependency on the format specifier.
+
+2014-04-22  Nicolas Goaziou  <n.goaziou@gmail.com>
+
+        * org.texi (The Export Dispatcher): Reformulation.
+
+        * org.texi (@LaTeX{} specific attributes): Update manual.
+
+        * org.texi (Top, Exporting): Org has its own documentation and
+        should therefore be removed from "Other build-in back-ends".
+
 2014-04-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * cl.texi (Structures): Remove cl-struct-set-slot-value.
@@ -1614,7 +1642,7 @@
         * ede.texi (Top): Rename from top, all uses changed.
         * eshell.texi: Add missing argument to @sp.
         * forms.texi (Top): Reorder menu to match structure.
-        * htmlfontify.texi (Customisation): Add missing @item in
+        * htmlfontify.texi (Customization): Add missing @item in
         @enumerate.
         * org.texi (Advanced features): Add missing argument for @item.
         (Property searches): Use @backslashchar{} in macro argument.