From: yamaoka <yamaoka>
Date: Mon, 7 Nov 2005 08:29:18 +0000 (+0000)
Subject: Synch to No Gnus 200511070828.
X-Git-Tag: t-gnus-6_17_4-quimby-~259
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7275e76cba92af21b340f6d23a4e526c07a567a2;p=elisp%2Fgnus.git-

Synch to No Gnus 200511070828.
---

diff --git a/texi/ChangeLog b/texi/ChangeLog
index b5a07f4..e5620c4 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (X-Face): Fix description.
+
 2005-11-02  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus.texi (Conformity): Fix typo.
diff --git a/texi/gnus.texi b/texi/gnus.texi
index fddd940..8718b8d 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -22462,11 +22462,11 @@ function, this function will be called with the face as the argument.
 If the @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
 the @code{From} header, the face will not be shown.
 
-The default action under Emacs 20 is to fork off the @code{display}
-program@footnote{@code{display} is from the ImageMagick package.  For
-the @code{uncompface} and @code{icontopbm} programs look for a package
-like @code{compface} or @code{faces-xface} on a GNU/Linux system.}  to
-view the face.
+The default action under Emacs without image support is to fork off the
+@code{display} program@footnote{@code{display} is from the ImageMagick
+package.  For the @code{uncompface} and @code{icontopbm} programs look
+for a package like @code{compface} or @code{faces-xface} on a GNU/Linux
+system.} to view the face.
 
 Under XEmacs or Emacs 21+ with suitable image support, the default
 action is to display the face before the @code{From} header.  (It's