Merge from emacs-24

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 46124c323ebc8f6ea7490c4af2db775af135c09c..c384eeb842542f994401a016b53fc56c8eb0888f 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,16 @@
+2014-10-02  Glenn Morris  <rgm@gnu.org>
+
+       * package.texi (Package Installation): Mention etc/package-keyring.gpg.
+
+2014-09-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacsver.texi (EMACSVER): Bump to 20.0.50.
+
+2014-09-15  Daniel Colascione  <dancol@dancol.org>
+
+       * regs.texi (Text Registers): Update end-user documentation
+       to reflect `insert-register' interface change.
+
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
        * programs.texi (Program Modes): Don't advertise VMS DCL support