Use *font for Xft font names for Lucid menus and dialogs.

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

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 961fa9f..ec57887 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,21 @@
+2011-02-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * xresources.texi (X Resources): Remove *faceName and replace it with
+       *font for Lucid.
+
+2011-02-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * rmail.texi (Rmail Display): Document Rmail MIME support more
+       accurately.
+
+       * maintaining.texi (VC Change Log): Document vc-log-incoming and
+       vc-log-outgoing.
+       (Merging): Document vc-find-conflicted-file.
+
+2011-02-05  Glenn Morris  <rgm@gnu.org>
+
+       * custom.texi (Variables): Fix typo.
+
 2011-01-31  Chong Yidong  <cyd@stupidchicken.com>
 
        * search.texi (Regexps): Copyedits.  Mention character classes