Merge from mainline.

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index df3468ea087..8376dbaa7ca 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-17  Glenn Morris  <rgm@gnu.org>
+
+        * gnus.texi (Face): Fix typo.
+
 2011-05-14  Glenn Morris  <rgm@gnu.org>
 
         * dired-x.texi (Omitting Examples): Minor addition.
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a35a7e85794..931a9bedb39 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -23501,7 +23501,7 @@ specifications.
 The @code{gnus-face-properties-alist} variable affects the appearance of
 displayed Face images.  @xref{X-Face}.
 
-Viewing an @code{Face} header requires an Emacs that is able to display
+Viewing a @code{Face} header requires an Emacs that is able to display
 PNG images.
 @c Maybe add this:
 @c (if (featurep 'xemacs)