Revision: emacs@sv.gnu.org/emacs--devo--0--patch-184

Merge from gnus--rel--5.10

Patches applied:

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

   - Update from CVS

diff --git a/man/ChangeLog b/man/ChangeLog
index fe8ffcc7ce0fb98e38f1e226d4d014f3de76bc00..55a15f70c51d674f57f9ba91bc62a3f6d3d24f58 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Posting Styles): Add x-face-file to example.
+       (X-Face): Refer to posting styles.
+
+       * gnus-faq.texi ([5.8]): Add x-face-file.
+       ([8.4]): Add links to gmane.emacs.gnus.user and
+       gmane.emacs.gnus.general.
+
 2006-03-28  Eli Zaretskii  <eliz@gnu.org>
 
        * files.texi (File Name Cache): Make it clear that the cache is

diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 4a00004ad66aaafd174c7d5fa4a60afa7f3a9850..7fa00c37403f6213c13e93f7c20f12c3070190d1 100644 (file)
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -52,7 +52,7 @@ a subscriber, your submissions will automatically pass.  You can
 also subscribe to the list by sending a blank email to
 @email{faq-discuss-subscribe@@my.gnus.org, faq-discuss-subscribe@@my.gnus.org}
 and @uref{http://mail1.kens.com/cgi-bin/ezmlm-browse?command=monthbythread%26list=faq-discuss, browse
-the archive}.
+the archive (BROKEN)}.
 
 @node FAQ - Changes
 @subheading Changes
@@ -1551,12 +1551,19 @@ Now you only have to tell Gnus to include the X-face in your postings by saying
 (setq message-default-headers
         (with-temp-buffer
           (insert "X-Face: ")
-          (insert-file-contents "~/.xemacs/xface")
+          (insert-file-contents "~/.xface")
           (buffer-string)))
 @end example
 @noindent
 
-in ~/.gnus.el.
+in ~/.gnus.el.  If you use Gnus 5.10, you can simply add an entry
+
+@example
+(x-face-file "~/.xface")
+@end example
+@noindent
+
+to gnus-posting-styles.
 
 @node [5.9]
 @subsubheading Question 5.9
@@ -2121,11 +2128,15 @@ Which mailing lists and newsgroups are there?
 
 @subsubheading Answer
 
-There's the newsgroup gnu.emacs.gnus (pull it from
-e.g. news.gnus.org) which deals with general questions and the
-ding mailing list (ding@@gnus.org) dealing with development of
+There's the newsgroup gnu.emacs.gnus
+(also available as
+@uref{http://dir.gmane.org/gmane.emacs.gnus.user, 
+gmane.emacs.gnus.user})
+which deals with general Gnus questions.
+The ding mailing list (ding@@gnus.org) deals with development of
 Gnus. You can read the ding list via NNTP, too under the name
-gmane.emacs.gnus.general from news.gmane.org.
+@uref{http://dir.gmane.org/gmane.emacs.gnus.general, 
+gmane.emacs.gnus.general} from news.gmane.org.
 
 If you want to stay in the big8,
 news.software.newssreaders is also read by some Gnus

diff --git a/man/gnus.texi b/man/gnus.texi
index 7b9338124a067a4dadb8221cd3fcd54f76dc4654..f2c306cbe2316ffe93e92782284bea2e0963afd7 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -11913,7 +11913,8 @@ So here's a new example:
       '((".*"
          (signature-file "~/.signature")
          (name "User Name")
-         ("X-Home-Page" (getenv "WWW_HOME"))
+         (x-face-file "~/.xface")
+         (x-url (getenv "WWW_HOME"))
          (organization "People's Front Against MWM"))
         ("^rec.humor"
          (signature my-funny-signature-randomizer))
@@ -22098,8 +22099,10 @@ foreground and background colors of the displayed X-Faces.  The
 default colors are black and white.
 @end table
 
-Gnus provides a few convenience functions and variables to allow
-easier insertion of X-Face headers in outgoing messages.
+If you use posting styles, you can use an @code{x-face-file} entry in
+@code{gnus-posting-styles}, @xref{Posting Styles}.  If you don't, Gnus
+provides a few convenience functions and variables to allow easier
+insertion of X-Face headers in outgoing messages.
 
 @findex gnus-random-x-face
 @vindex gnus-convert-pbm-to-x-face-command