Merge from emacs-24

[gnu-emacs] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index a1d2688470d7666d71c2bf555f33153095ddadd2..c384eeb842542f994401a016b53fc56c8eb0888f 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,33 @@
+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
+       any more.
+
+2014-08-07  Reuben Thomas  <rrt@sc3d.org>
+
+       Refer to MS-DOS using the same name everywhere.
+
+       * Makefile.in (EMACSSOURCES): ``MS-DOG'', ``MSDOG'' and ``msdog''
+       become ``MS-DOS''; ``msdog'' in filenames becomes ``msdos''.
+       * emacs-xtra.texi: ditto.
+       * emacs.texi: ditto.
+       * makefile.w32-in: ditto.
+       * msdog-xtra.texi: ditto, and rename file.
+       * msdog.texi: ditto, and rename file.
+
 2014-07-21  Glenn Morris  <rgm@gnu.org>
 
        * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug.  (Bug#18040)
@@ -10101,7 +10131,7 @@
 
        * frames.texi (Dialog Boxes): Add use-file-dialog.
 
-2003-11-22  Martin Stjernholm  <bug-cc-mode@gnu.org>
+2003-11-22  Martin Stjernholm  <mast@lysator.liu.se>
 
        * ack.texi: Note that Alan Mackenzie contributed the AWK support
        in CC Mode.