Synch to Gnus 200310300026.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 58591ff..cc4fccb 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-30  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (Slashdot, SpamAssassin, Score File Format): Fix
+       overfull hbox.
+       (Topic Parameters): @group.
+
 2003-10-27  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * 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 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -3952,6 +3952,7 @@ Gnus
 \e$B$k$+$bCN$l$J$$$1$I!"$=$l$O$4<+M3$K\e(B)\e$B!#\e(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} \e$B%H%T%C%/$O%H%T%C%/%Q%i%a!<\e(B
@@ -14760,8 +14762,8 @@ Gnus \e$B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j\e(B
 
 @code{nnslashdot} \e$B%3%a%s%H$K%U%)%m!<%"%C%W\e(B (\e$B$^$?$O?7$7$$%3%a%s%H$NEj9F\e(B)
 \e$B$r$9$k$H$-$O!">/$7\e(B @acronym{HTML} \e$B$KJQ49$5$l$^$9!#FC$K!"\e(B@samp{> } \e$B$G0zMQ\e(B
-\e$B$5$l$?%F%-%9%H$O$=$NBe$o$j$K\e(B @code{blockquote} \e$B$G0zMQ$5$l!"=pL>$K$O$=$l\e(B
-\e$B$>$l$N9T$N:G8e$K\e(B @code{br} \e$B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C%;!<%8%P%C%U%!\e(B
+\e$B$5$l$?%F%-%9%H$O$=$NBe$o$j$K\e(B @samp{blockquote} \e$B$G0zMQ$5$l!"=pL>$K$O$=$l\e(B
+\e$B$>$l$N9T$N:G8e$K\e(B @samp{br} \e$B$,DI2C$5$l$^$9!#$=$l0J30$O!"%a%C%;!<%8%P%C%U%!\e(B
 \e$B$KD>@\\e(B @acronym{HTML} \e$B$r=q$/$3$H$,$G$-$^$9!#\e(BSlashdot \e$B$O$$$/$D\e(B
 \e$B$+\e(B @acronym{HTML} \e$B$rA*JL$9$k$3$H$K5$$r$D$1$F$/$@$5$$!#\e(B
 
@@ -14797,7 +14799,7 @@ Gnus \e$B$O$3$l$i$N%=!<%9$X$N3&LL$rDs6!$9$k%P%C%/%(%s%I72$r>/$7Hw$($D$D$"$j\e(B
 @item nnslashdot-comments-url
 @vindex nnslashdot-comments-url
 \e$B%3%a%s%H$r<hF@$9$k$?$a$K;HMQ$5$l$k\e(B @sc{url} \e$BJ8;zNs$G$9!#=i4|CM\e(B
-\e$B$O\e(B @samp{http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=%d&mode=flat&startat=%d} \e$B$G\e(B
+\e$B$O\e(B @samp{http://slashdot.org/comments.pl?sid=%s&threshold=%d&commentsort=@/%d&mode=flat&startat=%d} \e$B$G\e(B
 \e$B$9!#\e(B
 
 @item nnslashdot-article-url
@@ -18343,12 +18345,13 @@ gnus \e$B$K5-;vA4BN$r<hF@$7$F\e(B,\e$B5-;v$N$h$jBg$-$JItJ,$G9gCW$r9T$&$h$&$K$9$k;0$
 \e$BI8=`$N\e(B overview \e$B%X%C%@!<$NJ8;zNs$HF1MM!"\e(B@code{gnus-extra-headers} \e$B$r;H$C\e(B
 \e$B$F$$$k$H!"$=$l$i$N%X%C%@!<$NCM$K%9%3%"$rIU$1$k$3$H$,$G$-$^$9!#$3$N>l9g%9\e(B
 \e$B%3%"EPO?$N\e(B 5 \e$BHVL\$NMWAG$,%9%3%"$rIU$1$k%X%C%@!<$NL>A0$K$J$j$^$9!#\e(B
-@acronym{NNTP} \e$B%5!<%P!<$,\e(B overview \e$B$K\e(B NNTP-Posting-Host \e$B$r5-O?$7$F$$$k$J\e(B
-\e$B$i$P!"\e(B@file{all.SCORE} \e$B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+$i\e(B spam \e$B$N\e(B
-\e$B967b$,$"$k>l9g$KM-8z$G$9!#\e(B
+@acronym{NNTP} \e$B%5!<%P!<$,\e(B overview \e$B$K\e(B @samp{NNTP-Posting-Host} \e$B$r5-O?$7\e(B
+\e$B$F$$$k$J$i$P!"\e(B@file{all.SCORE} \e$B%U%!%$%k$N0J2<$NEPO?$O!"C10l$N%[%9%H$+\e(B
+\e$B$i\e(B spam \e$B$N967b$,$"$k>l9g$KM-8z$G$9!#\e(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 \e$B$KBP=h$9$k0l$D$NJ}K!$O!"\e(Bgnus \e$B$KA4$F$N\e(B spam \e$B$r\e(B @samp{spam}
 \e$B$9\e(B (@pxref{Fancy Mail Splitting})\e$B!#\e(B
 
 @lisp
-(
- ...
+(...
  (to "larsi@@trym.ifi.uio.no"
-      (| ("subject" "re:.*" "misc")
-         ("references" ".*@@.*" "misc")
-         "spam"))
- ...
-)
+     (| ("subject" "re:.*" "misc")
+        ("references" ".*@@.*" "misc")
+        "spam"))
+ ...)
 @end lisp
 
 \e$B$3$N0UL#$O!"$3$N%"%I%l%9$KFO$$$?A4$F$N%a!<%k$r$^$:5?$$$^$9$,!"\e(B
@@ -21318,7 +21319,8 @@ Spam \e$B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O\e(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
 
 \e$B$$$C$?$s!"%a!<%k$r<u$1$k%9%W!<%k$r$I$&$K$+$7$F=hM}$9$k!"Nc$($P\e(B@: \e$B%a!<%k\e(B
@@ -21352,8 +21354,8 @@ Spam \e$B$rHr$1$k$?$a$NA09`$N%R%s%H$,==J,$@$C$?F|!9$O2a$.5n$j$^$7$?!#:#$G$O\e(B
   (save-excursion
     (widen)
     (if (eq 1 (call-process-region (point-min) (point-max)
-                                  "spamc" nil nil nil "-c"))
-       "spam")))
+                                   "spamc" nil nil nil "-c"))
+        "spam")))
 @end lisp
 
 \e$B$5$i$K\e(B nnimap \e$B%P%C%/%(%s%I$N>l9g!"%G%#%U%)%k%H$G$O5-;v$N%\%G%#$,%@%&%s%m!<\e(B
@@ -21639,10 +21641,10 @@ Spam \e$B%0%k!<%W$G$O!"%G%#%U%)%k%H$G$9$Y$F$N%a%C%;!<%8$,\e(B spam \e$B$G$"$k$H2r<a
 
 @example
  nnimap-split-fancy '(|
-                     (any "ding" "ding")
-                     (: spam-split)
-                     ;; default mailbox
-                     "mail")
+                      (any "ding" "ding")
+                      (: spam-split)
+                      ;; default mailbox
+                      "mail")
 @end example
 
 \e$B$5$F!"LdBj$O\e(B ding \e$B08$F$N%a%C%;!<%8$r$9$Y$F\e(B ding \e$B%U%)%k%@!<$KF~$l$h$&$H$7\e(B
@@ -21659,12 +21661,12 @@ SpamAssassin \e$B%X%C%@!<$K\e(B ding \e$B$N5,B'$rCV$-49$($5$;$k$3$H$O$G$-$^$9$,!"B>
 @example
  nnimap-split-fancy '(|
 ;;; spam-use-regex-headers \e$B$G8!=P$5$l$?$9$Y$F$N\e(B spam \e$B$O\e(B "regex-spam" \e$B$X!#\e(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 \e$B$G8!=P$5$l$?B>$N$9$Y$F$N\e(B spam \e$B$O\e(B spam-split-group \e$B$X!#\e(B
-                     (: spam-split)
-                     ;; default mailbox
-                     "mail")
+                      (: spam-split)
+                      ;; default mailbox
+                      "mail")
 @end example
 
 \e$B4pK\E*$K!"$3$l$OFC$K$"$J$?$NI,MW$K0MB8$7$?FCDj$N\e(B @code{spam-split} \e$B8!\e(B
@@ -22296,7 +22298,7 @@ Spam \e$B$G$O$J$$\e(B (\e$BL$J,N`$^$?$O\e(B ham) \e$B%0%k!<%W$@$1$KE,MQ$5$l$k!#\e(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 \e$BMQ$N4X?t\e(B}
    nil))
 
@@ -22308,7 +22310,7 @@ Spam \e$B$G$O$J$$\e(B (\e$BL$J,N`$^$?$O\e(B ham) \e$B%0%k!<%W$@$1$KE,MQ$5$l$k!#\e(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
 
 \e$B4X?t\e(B @code{blackbox-do-something-with-this-ham-sender} \e$B$*$h\e(B
@@ -22456,7 +22458,7 @@ nnml \e$B%P%C%/%(%s%I$O0lDL$N%a!<%k$K$D$-0l$D$N%U%!%$%k$G!"$9$Y$F$N%a!<%k$r\e(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 \e$BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O\e(B @samp{mail.spam} \e$B$G$9!#\e(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
 
 \e$B:G=i$K\e(B spam \e$B$N_I2a$r$7$?$$>l9g!"<-=q$r:n$k$H$-$K==J,$KCm0U$7$J$1$l$P$J$j\e(B
@@ -22485,7 +22487,7 @@ Spam \e$BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O\e(B @samp{mail.spam} \e$B$G$9!#\e(B
 (setq nnmail-split-fancy
       `(| (: spam-stat-split-fancy)
           ("Subject" "\\bspam-stat\\b" "mail.emacs")
-         "mail.misc"))
+          "mail.misc"))
 @end lisp
 
 \e$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\e(B
@@ -22497,9 +22499,9 @@ Spam \e$BMQ$N%0%k!<%W$G$9!#%G%#%U%)%k%H$O\e(B @samp{mail.spam} \e$B$G$9!#\e(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 \e$B$O\e(B From:, To: \e$B$*$h$S\e(B Cc: \e$B$K$"$kHs\e(B-@acronym{ASCII} \e$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 \e$B%(!<%8%'%s%H$OBg5,LO$J99?7$r7P$F!":#$d%G%#%U%)%k%H$G3h@-2=$5$l$^$9!#\e(B
 \e$B2<5-$N$h$&$J8E$$MM<0$O;~BeCY$l$K$J$j$^$7$?$,!"$^$@<u$1F~$l$i$l$^$9!#\e(B
 @lisp
 (header "to" "larsi.*org"
-       (Organization "Somewhere, Inc."))
+        (Organization "Somewhere, Inc."))
 @end lisp
 
 @item

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 1cd2826..c4d4433 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -3980,6 +3980,7 @@ know.  Normal inheritance rules.  (@dfn{Rules} is here a noun, not a
 verb, although you may feel free to disagree with me here.)
 
 @example
+@group
 Gnus
   Emacs
      3: comp.emacs
@@ -3992,6 +3993,7 @@ Gnus
      8: comp.binaries.fractals
     13: comp.sources.unix
    452: alt.sex.emacs
+@end group   
 @end example
 
 The @samp{Emacs} topic has the topic parameter @code{(score-file
@@ -15581,7 +15583,7 @@ command is the most handy tool (@pxref{Foreign Groups}).
 When following up to @code{nnslashdot} comments (or posting new
 comments), some light @acronym{HTML}izations will be performed.  In
 particular, text quoted with @samp{> } 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