merge from trunk

1 files changed, 35 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 2fe1914f926..da2491cb94a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,37 @@
+2013-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add ido.
+        (ido, $(buildinfodir)/ido$(INFO_EXT), ido.dvi, ido.pdf): New rules.
+
+        * erc.texi (Special Features): Update contact information.
+        (History): Avoid using @email.
+
+        * eshell.texi (Bugs and ideas): Minor updates.
+
+        * faq.texi (Reporting bugs, Origin of the term Emacs)
+        (Setting up a customization file)
+        (Using an already running Emacs process, Turning off beeping)
+        (Packages that do not come with Emacs)
+        (Replying to the sender of a message): Avoid using @email.
+
+        * pcl-cvs.texi (Contributors, Bugs): Avoid using @email.
+
+        * reftex.texi (Imprint): Avoid using @email.
+
+        * ses.texi (Top): Update bug reporting instructions.
+        (Acknowledgments): Avoid using @email.
+
+        * woman.texi (Introduction, Background): Remove outdated information.
+        (Bugs, Acknowledgments): Avoid using @email.
+
+2013-07-24  Xue Fuqiao  <xfq.free@gmail.com>
+
+        * ido.texi: New file.
+
+2013-07-19  Geoff Kuenning  <geoff@cs.hmc.edu>  (tiny change)
+
+        * gnus.texi (Customizing Articles): Document function predicates.
+
 2013-07-08  Tassilo Horn  <tsdh@gnu.org>
 
         * gnus.texi (lines): Correct description of
@@ -1088,7 +1122,7 @@
         corresponding function names, according to
         `org-agenda-view-mode-dispatch'.
 
-2012-09-30  Jan Bäcker  <jan.boecker@jboecker.de>
+2012-09-30  Jan Böcker  <jan.boecker@jboecker.de>
 
         * org.texi (The spreadsheet): Fix typo.