# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1155184287 0
# Node ID c8042d3743cb1b767b8108b03d531b0a9452547e
# Parent  1bac8eb0facf2d64cfd8e3f446246821ec23a69b
*** empty log message ***

diff -r 1bac8eb0facf -r c8042d3743cb lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 10 04:31:21 2006 +0000
+++ b/lisp/ChangeLog	Thu Aug 10 04:31:27 2006 +0000
@@ -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 -r 1bac8eb0facf -r c8042d3743cb man/ChangeLog
--- a/man/ChangeLog	Thu Aug 10 04:31:21 2006 +0000
+++ b/man/ChangeLog	Thu Aug 10 04:31:27 2006 +0000
@@ -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