Synch to No Gnus 200603281813.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 252fa13..d55e779 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-03-28  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * message.el (message-tool-bar-gnome): Move "spell".
+
 2006-03-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Don't use

diff --git a/lisp/message.el b/lisp/message.el
index a7e31a0..1b443a4 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7461,14 +7461,14 @@ Pre-defined symbols include `message-tool-bar-gnome' and
   :group 'message)
 
 (defcustom message-tool-bar-gnome
-  '((gmm-ignore "separator")
+  '((ispell-message "spell" nil :visible (not flyspell-mode))
+    (flyspell-buffer "spell" t :visible flyspell-mode
+                    :help "Flyspell whole buffer")
+    (gmm-ignore "separator")
     (message-send-and-exit "mail/send")
     (message-dont-send "mail/save-draft")
     (message-kill-buffer "close") ;; stock_cancel
     (mime-edit-insert-file "attach" mime-edit-mode-map)
-    (ispell-message "spell" nil :visible (not flyspell-mode))
-    (flyspell-buffer "spell" t :visible flyspell-mode
-                    :help "Flyspell whole buffer")
     (mime-edit-preview-message "mail/preview" mime-edit-mode-map)
     ;;(mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil)
     (message-insert-importance-high "important" nil :visible nil)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index ddfa0b4..b9ac7f9 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/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-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * sasl.texi: Use @copyright{} instead of (C).  Update copyright.

diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi
index 2315375..6900d87 100644 (file)
--- a/texi/gnus-faq.texi
+++ b/texi/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/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 2dc53d4..0904b0d 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -11407,7 +11407,8 @@ subject from date id references chars lines xref extra \e$B$N3F%X%C%@!<$+$i\e(B
       '((".*"
          (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))
@@ -22062,8 +22063,11 @@ Lisp Reference Manual}, \e$B$r;2>H$7$F2<$5$$!#:#$N$H$3$m\e(B Emacs \e$B$G\e(B
 \e$B5Z$\$7$^$9!#\e(B
 @end table
 
-gnus \e$B$O30$K=P$9%a%C%;!<%8$K\e(B X-Face \e$B%X%C%@!<$r4JC1$KA^F~$G$-$k$h$&$K$9$k\e(B
-\e$B$?$a$N!"JXMx$J4X?t$HJQ?t$r>/$7$P$+$jDs6!$7$^$9!#\e(B
+\e$BEj9FMM<0\e(B (posting style) \e$B$r;H$&$N$G$"$l$P!"\e(B
+@code{gnus-posting-styles} \e$B$K\e(B @code{x-face-file} \e$B$N9`$r2C$($l$PNI$$$G$7$g\e(B
+\e$B$&\e(B (@pxref{Posting Styles})\e$B!#$5$b$J$1$P!"30$K=P$9%a%C%;!<%8$K\e(B X-Face \e$B%X%C\e(B
+\e$B%@!<$r4JC1$KA^F~$G$-$k$h$&$K$9$k$?$a$K\e(B gnus \e$B$,Ds6!$9$k!"$$$/$D$+$NJXMx$J\e(B
+\e$B4X?t$HJQ?t$rMxMQ$9$k$3$H$,$G$-$^$9!#\e(B
 
 @findex gnus-random-x-face
 @vindex gnus-convert-pbm-to-x-face-command

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 5198dd1..fff2f83 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -11971,7 +11971,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))
@@ -22629,8 +22630,10 @@ on the @code{xface} image type in XEmacs if it is built with the
 @samp{libcompface} library.
 @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