3 files changed, 29 insertions, 8 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 9c7f15425ee..3785491abb3 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Image Enhancements): Update for Emacs 22.
+
+        * gnus-faq.texi ([1.3]): Update.
+
 2006-10-06  Richard Stallman  <rms@gnu.org>
 
         * faq.texi (Displaying the current line or column): Delete "As of Emacs
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index e94036dc503..861bab438d6 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -172,13 +172,14 @@ Where and how to get Gnus?
 
 @subsubheading Answer
 
-The latest released version of Gnus isn't included in
-Emacs 21, therefor you should get the Gnus tarball from
-@uref{http://www.gnus.org/dist/gnus.tar.gz}
-or via anonymous FTP from 
+Gnus is released independent from releases of Emacs and XEmacs.
+Therefore, the version bundled with Emacs or the version in XEmacs'
+package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs
+20 is outdated).
+@c
+You can get the latest released version of Gnus from
+@uref{http://www.gnus.org/dist/gnus.tar.gz} or via anonymous FTP from
 @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}.
-If you use XEmacs instead of Emacs you can use XEmacs'
-package system instead.
 
 @node [1.4]
 @subsubheading Question 1.4
diff --git a/man/gnus.texi b/man/gnus.texi
index 973ba121f6f..84bee0efa26 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -9508,6 +9508,20 @@ to your @file{~/.gnus.el} file.
 @section Charsets
 @cindex charsets
 
+@c ;; v9d5mxqhga.fsf@marauder.physik.uni-ulm.de
+@c (add-to-list 'gnus-newsgroup-variables 'mm-coding-system-priorities)
+@c (setq gnus-parameters
+@c       '(("^de\\." ;; German language
+@c       (mm-coding-system-priorities '(iso-8859-1 iso-8859-15 utf-8)))
+@c      ("^fr\\." ;; French
+@c       (mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8)))
+@c      ("^fj\\." ;; Japanese
+@c       (mm-coding-system-priorities
+@c        '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))
+@c      ("^cz\\." ;; Czech
+@c       (mm-coding-system-priorities '(iso-8859-2 utf-8)))))
+
+
 People use different charsets, and we have @acronym{MIME} to let us know what
 charsets they use.  Or rather, we wish we had.  Many people use
 newsreaders and mailers that do not understand or use @acronym{MIME}, and
@@ -22137,8 +22151,8 @@ It takes the group name as a parameter.
 @section Image Enhancements
 
 XEmacs, as well as Emacs 21@footnote{Emacs 21 on MS Windows doesn't
-support images yet.}, is able to display pictures and stuff, so Gnus has
-taken advantage of that.
+support images, Emacs 22 does.} and up, are able to display pictures and
+stuff, so Gnus has taken advantage of that.
 
 @menu
 * X-Face::                      Display a funky, teensy black-and-white image.