2 files changed, 7 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f584383ec23..9d22cf958a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
         * facemenu.el (facemenu-add-face): Pass frame to facemenu-active-faces.
         (facemenu-set-face): Doc fix.
+        (facemenu-listed-faces): Doc fix.
 
 2006-08-09  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/man/ChangeLog b/man/ChangeLog
index df2d8536e0b..8d252755de6 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-10  Richard Stallman  <rms@gnu.org>
+
+        * text.texi (Format Faces): Substantial rewrites to deal
+        with face merging.  Empty regions don't count.  Clarify
+        face property inheritance.
+
 2006-08-08  Romain Francoise  <romain@orebokech.com>
 
         * dired.texi (Marks vs Flags): Fix typo reported by Ari Roponen