Synch to No Gnus 200601241028.

[elisp/gnus.git-] / texi / gnus.texi

diff --git a/texi/gnus.texi b/texi/gnus.texi
index fe5130f..6776cb9 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -10,7 +10,7 @@
 
 @copying
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -8688,7 +8688,9 @@ Treat @acronym{HTML} (@code{gnus-article-wash-html}).  Note that this is
 usually done automatically by Gnus if the message in question has a
 @code{Content-Type} header that says that the message is @acronym{HTML}.
 
-If a prefix is given, a charset will be asked for.
+If a prefix is given, a charset will be asked for.  If it is a number,
+the charset defined in @code{gnus-summary-show-article-charset-alist}
+(@pxref{Paging the Article}) will be used.
 
 @vindex gnus-article-wash-function
 The default is to use the function specified by
@@ -8699,12 +8701,15 @@ Customization, emacs-mime, The Emacs MIME Manual}) to convert the
 can use include:
 
 @table @code
-@item W3
+@item w3
 Use Emacs/W3.
 
 @item w3m
 Use @uref{http://emacs-w3m.namazu.org/, emacs-w3m}.
 
+@item w3m-standalone
+Use @uref{http://w3m.sourceforge.net/, w3m}.
+
 @item links
 Use @uref{http://links.sf.net/, Links}.
 
@@ -16184,7 +16189,7 @@ parts as @acronym{HTML}.  The function specified by the
 @code{mm-text-html-renderer} variable (@pxref{Display Customization,
 ,Display Customization, emacs-mime, The Emacs MIME Manual}) will be used
 to render text.  If it is @code{nil}, which is the default, text will
-simply be folded.  Leave it @code{nil}, if you prefer to see
+simply be folded.  Leave it @code{nil} if you prefer to see
 @samp{text/html} parts.
 @end table