Merge from emacs-24; up to 2014-05-29T17:16:00Z!dmantipov@yandex.ru

[bpt/emacs.git] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index db310ea..2a46642 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-02  Glenn Morris  <rgm@gnu.org>
+
+       * macos.texi (Mac / GNUstep Customization): Mention ns custom group.
+       (Customization options specific to Mac OS / GNUstep): Remove section.
+
+       * abbrevs.texi (Expanding Abbrevs): Update re abbrev-expand-function.
+
 2014-05-26  Eli Zaretskii  <eliz@gnu.org>
 
        * frames.texi (Fonts): Clarify which frames are affected by