Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 852-856)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 93-96)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 245)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-32

1 files changed, 3 insertions, 1 deletions

diff --git a/man/basic.texi b/man/basic.texi
index 6d19281b089..333985e4a4a 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -596,6 +596,7 @@ point=36169 of 36168 (EOB) column=0
 @cindex character set of character at point
 @cindex font of character at point
 @cindex text properties at point
+@cindex face at point
   @w{@kbd{C-u C-x =}} displays the following additional information about a
 character.
 
@@ -623,7 +624,8 @@ terminal, the code(s) sent to the terminal.
 
 @item
 The character's text properties (@pxref{Text Properties,,,
-elisp, the Emacs Lisp Reference Manual}), and any overlays containing it
+elisp, the Emacs Lisp Reference Manual}), including any non-default
+faces used to display the character, and any overlays containing it
 (@pxref{Overlays,,, elisp, the same manual}).
 @end itemize