From 75cdcfd558736973ac9e4fa46639a40e5e4c37cf Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 30 Oct 2003 02:09:31 +0000 Subject: [PATCH] Synch to Gnus 200310300026. --- texi/ChangeLog | 6 ++++ texi/gnus-ja.texi | 80 +++++++++++++++++++++++++++-------------------------- texi/gnus.texi | 29 ++++++++++--------- 3 files changed, 63 insertions(+), 52 deletions(-) diff --git a/texi/ChangeLog b/texi/ChangeLog index 58591ff..cc4fccb 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2003-10-30 Jesper Harder + + * gnus.texi (Slashdot, SpamAssassin, Score File Format): Fix + overfull hbox. + (Topic Parameters): @group. + 2003-10-27 Teodor Zlatanov * gnus.texi (Filtering Spam Using The Spam ELisp Package): added diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index b88cae4..046a439 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -3952,6 +3952,7 @@ Gnus $B$k$+$bCN$l$J$$$1$I!"$=$l$O$4<+M3$K(B)$B!#(B @example +@group Gnus Emacs 3: comp.emacs @@ -3964,6 +3965,7 @@ Gnus 8: comp.binaries.fractals 13: comp.sources.unix 452: alt.sex.emacs +@end group @end example @samp{Emacs} $B%H%T%C%/$O%H%T%C%/%Q%i%a!<(B @@ -14760,8 +14762,8 @@ Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B @code{nnslashdot} $B%3%a%s%H$K%U%)%m!<%"%C%W(B ($B$^$?$O?7$7$$%3%a%s%H$NEj9F(B) $B$r$9$k$H$-$O!">/$7(B @acronym{HTML} $B$KJQ49$5$l$^$9!#FC$K!"(B@samp{> } $B$G0zMQ(B -$B$5$l$?%F%-%9%H$O$=$NBe$o$j$K(B @code{blockquote} $B$G0zMQ$5$l!"=pL>$K$O$=$l(B -$B$>$l$N9T$N:G8e$K(B @code{br} $B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C%;!<%8%P%C%U%!(B +$B$5$l$?%F%-%9%H$O$=$NBe$o$j$K(B @samp{blockquote} $B$G0zMQ$5$l!"=pL>$K$O$=$l(B +$B$>$l$N9T$N:G8e$K(B @samp{br} $B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C%;!<%8%P%C%U%!(B $B$KD>@\(B @acronym{HTML} $B$r=q$/$3$H$,$G$-$^$9!#(BSlashdot $B$O$$$/$D(B $B$+(B @acronym{HTML} $B$rA*JL$9$k$3$H$K5$$r$D$1$F$/$@$5$$!#(B @@ -14797,7 +14799,7 @@ Gnus $B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j(B @item nnslashdot-comments-url @vindex nnslashdot-comments-url $B%3%a%s%H$rl9g%9(B $B%3%"EPO?$N(B 5 $BHVL\$NMWAG$,%9%3%"$rIU$1$k%X%C%@!<$NL>A0$K$J$j$^$9!#(B -@acronym{NNTP} $B%5!<%P!<$,(B overview $B$K(B NNTP-Posting-Host $B$r5-O?$7$F$$$k$J(B -$B$i$P!"(B@file{all.SCORE} $B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+$i(B spam $B$N(B -$B967b$,$"$k>l9g$KM-8z$G$9!#(B +@acronym{NNTP} $B%5!<%P!<$,(B overview $B$K(B @samp{NNTP-Posting-Host} $B$r5-O?$7(B +$B$F$$$k$J$i$P!"(B@file{all.SCORE} $B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+(B +$B$i(B spam $B$N967b$,$"$k>l9g$KM-8z$G$9!#(B @lisp -("111.222.333.444" -1000 nil s "NNTP-Posting-Host") +("111.222.333.444" -1000 nil s + "NNTP-Posting-Host") @end lisp @item Lines, Chars @@ -21254,14 +21257,12 @@ Spam $B$KBP=h$9$k0l$D$NJ}K!$O!"(Bgnus $B$KA4$F$N(B spam $B$r(B @samp{spam} $B$9(B (@pxref{Fancy Mail Splitting})$B!#(B @lisp -( - ... +(... (to "larsi@@trym.ifi.uio.no" - (| ("subject" "re:.*" "misc") - ("references" ".*@@.*" "misc") - "spam")) - ... -) + (| ("subject" "re:.*" "misc") + ("references" ".*@@.*" "misc") + "spam")) + ...) @end lisp $B$3$N0UL#$O!"$3$N%"%I%l%9$KFO$$$?A4$F$N%a!<%k$r$^$:5?$$$^$9$,!"(B @@ -21318,7 +21319,8 @@ Spam $B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O(B '((file :prescript "formail -bs spamassassin < /var/mail/%u") (pop :user "jrl" :server "pophost" - :postscript "mv %t /tmp/foo; formail -bs spamc < /tmp/foo > %t"))) + :postscript + "mv %t /tmp/foo; formail -bs spamc < /tmp/foo > %t"))) @end lisp $B$$$C$?$s!"%a!<%k$rl9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#$,%@%&%s%m!<(B @@ -21639,10 +21641,10 @@ Spam $B%0%k!<%W$G$O!"%G%#%U%)%k%H$G$9$Y$F$N%a%C%;!<%8$,(B spam $B$G$"$k$H2r @example nnimap-split-fancy '(| ;;; spam-use-regex-headers $B$G8!=P$5$l$?$9$Y$F$N(B spam $B$O(B "regex-spam" $B$X!#(B - (: spam-split "regex-spam" 'spam-use-regex-headers) - (any "ding" "ding") + (: spam-split "regex-spam" 'spam-use-regex-headers) + (any "ding" "ding") ;;; spam-split $B$G8!=P$5$l$?B>$N$9$Y$F$N(B spam $B$O(B spam-split-group $B$X!#(B - (: spam-split) - ;; default mailbox - "mail") + (: spam-split) + ;; default mailbox + "mail") @end example $B4pK\E*$K!"$3$l$OFC$K$"$J$?$NI,MW$K0MB8$7$?FCDj$N(B @code{spam-split} $B8!(B @@ -22296,7 +22298,7 @@ Spam $B$G$O$J$$(B ($BL$J,N`$^$?$O(B ham) $B%0%k!<%W$@$1$KE,MQ$5$l$k!#(B") (lambda (article) (let ((from (spam-fetch-field-from-fast article))) (when (stringp from) - (blackbox-do-something-with-this-spammer from)))) + (blackbox-do-something-with-this-spammer from)))) ;; @r{ham $BMQ$N4X?t(B} nil)) @@ -22308,7 +22310,7 @@ Spam $B$G$O$J$$(B ($BL$J,N`$^$?$O(B ham) $B%0%k!<%W$@$1$KE,MQ$5$l$k!#(B") (lambda (article) (let ((from (spam-fetch-field-from-fast article))) (when (stringp from) - (blackbox-do-something-with-this-ham-sender from)))))) + (blackbox-do-something-with-this-ham-sender from)))))) @end lisp $B4X?t(B @code{blackbox-do-something-with-this-ham-sender} $B$*$h(B @@ -22456,7 +22458,7 @@ nnml $B%P%C%/%(%s%I$O0lDL$N%a!<%k$K$D$-0l$D$N%U%!%$%k$G!"$9$Y$F$N%a!<%k$r(B @lisp (setq nnmail-split-fancy `(| (: spam-stat-split-fancy) - "mail.misc")) + "mail.misc")) @end lisp @defvar spam-stat-split-fancy-spam-group @@ -22470,8 +22472,8 @@ Spam $BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O(B @samp{mail.spam} $B$G$9!#(B @lisp (setq nnmail-split-fancy `(| ("Subject" "\\bspam-stat\\b" "mail.emacs") - (: spam-stat-split-fancy) - "mail.misc")) + (: spam-stat-split-fancy) + "mail.misc")) @end lisp $B:G=i$K(B spam $B$N_I2a$r$7$?$$>l9g!"<-=q$r:n$k$H$-$K==J,$KCm0U$7$J$1$l$P$J$j(B @@ -22485,7 +22487,7 @@ Spam $BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O(B @samp{mail.spam} $B$G$9!#(B (setq nnmail-split-fancy `(| (: spam-stat-split-fancy) ("Subject" "\\bspam-stat\\b" "mail.emacs") - "mail.misc")) + "mail.misc")) @end lisp $B$3$l$rEAE}E*$J_I2a$HAH$_9g$o$;$k$3$H$b$G$-$^$9!#$3$3$G$O2f!9$O$9$Y$F(B @@ -22497,9 +22499,9 @@ Spam $BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O(B @samp{mail.spam} $B$G$9!#(B @lisp (setq nnmail-split-fancy `(| ("Content-Type" "text/html" "mail.spam.filtered") - (: spam-stat-split-fancy) + (: spam-stat-split-fancy) ("Subject" "\\bspam-stat\\b" "mail.emacs") - "mail.misc")) + "mail.misc")) @end lisp @node Low-level interface to the spam-stat dictionary @@ -24380,10 +24382,10 @@ Message $B$O(B From:, To: $B$*$h$S(B Cc: $B$K$"$kHs(B-@acronym{ASCII} $B% @lisp (setq gnus-parameters '(("mail\\..*" - (gnus-show-threads nil) - (gnus-use-scoring nil)) - ("^nnimap:\\(foo.bar\\)$" - (to-group . "\\1")))) + (gnus-show-threads nil) + (gnus-use-scoring nil)) + ("^nnimap:\\(foo.bar\\)$" + (to-group . "\\1")))) @end lisp @item @@ -24580,7 +24582,7 @@ Gnus $B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#(B $B2<5-$N$h$&$J8E$$MM<0$O;~BeCY$l$K$J$j$^$7$?$,!"$^$@ } will be quoted with -@code{blockquote} instead, and signatures will have @code{br} added to +@samp{blockquote} instead, and signatures will have @samp{br} added to the end of each line. Other than that, you can just write @acronym{HTML} directly into the message buffer. Note that Slashdot filters out some @acronym{HTML} forms. @@ -15620,7 +15622,7 @@ news articles and comments. The default is@* @vindex nnslashdot-comments-url The @sc{url} format string that will be used to fetch comments. The default is -@samp{http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=%d&mode=flat&startat=%d}. +@samp{http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=@/%d&mode=flat&startat=%d}. @item nnslashdot-article-url @vindex nnslashdot-article-url @@ -19065,11 +19067,13 @@ Just as for the standard string overview headers, if you are using gnus-extra-headers, you can score on these headers' values. In this case, there is a 5th element in the score entry, being the name of the header to be scored. The following entry is useful in your -@file{all.SCORE} file in case of spam attacks from a single origin host, -if your @acronym{NNTP} server tracks NNTP-Posting-Host in overviews: +@file{all.SCORE} file in case of spam attacks from a single origin +host, if your @acronym{NNTP} server tracks @samp{NNTP-Posting-Host} in +overviews: @lisp -("111.222.333.444" -1000 nil s "NNTP-Posting-Host") +("111.222.333.444" -1000 nil s + "NNTP-Posting-Host") @end lisp @item Lines, Chars @@ -22116,14 +22120,12 @@ Then put the following split rule in @code{nnmail-split-fancy} (@pxref{Fancy Mail Splitting}): @lisp -( - ... +(... (to "larsi@@trym.ifi.uio.no" - (| ("subject" "re:.*" "misc") - ("references" ".*@@.*" "misc") - "spam")) - ... -) + (| ("subject" "re:.*" "misc") + ("references" ".*@@.*" "misc") + "spam")) + ...) @end lisp This says that all mail to this address is suspect, but if it has a @@ -22182,7 +22184,8 @@ Specifiers}) follow. '((file :prescript "formail -bs spamassassin < /var/mail/%u") (pop :user "jrl" :server "pophost" - :postscript "mv %t /tmp/foo; formail -bs spamc < /tmp/foo > %t"))) + :postscript + "mv %t /tmp/foo; formail -bs spamc < /tmp/foo > %t"))) @end lisp Once you manage to process your incoming spool somehow, thus making -- 1.7.10.4