Synch to Gnus 200308291544.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 33d2e89..015b500 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-29  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * gnus.texi (Gmane Spam Reporting): added explanation of
+       spam-report-gmane-use-article-number
+
 2003-08-25  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus.texi (Customizing Articles): xface -> x-face.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index f34ac48..caac4b7 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -21813,10 +21813,21 @@ SpamAssassin \e$B%X%C%@!<$K\e(B ding \e$B$N5,B'$rCV$-49$($5$;$k$3$H$O$G$-$^$9$,!"B>
 
 \e$B%0%k!<%W%Q%i%a!<%?$+JQ?t\e(B @code{gnus-spam-process-newsgroups} \e$B$r%+%9%?%^\e(B
 \e$B%$%:$7$F!"$3$N%7%s%\%k$r%0%k!<%W$N\e(B @code{spam-process} \e$B%Q%i%a!<%?$K2C$(\e(B
-\e$B$F2<$5$$!#$3$l$,2C$($i$l$k$H!"\e(Bspam \e$B0u$,IU$$$?5-;v$N%0%k!<%W$,\e(B Gmane \e$B$N4I\e(B
-\e$BM}<T$KJs9p$5$l$^$9!#\e(B(\e$BLuCm\e(B: gmane \e$B%K%e!<%9%0%k!<%W$rFI$s$G$$$k$H$-$K8+$D\e(B
-\e$B$+$C$?\e(B spam \e$B$N5-;vHV9f$H%0%k!<%WL>$r\e(B http \e$B7PM3$GEA$($^$9!#\e(B
-@file{spam-report.el} \e$B;2>H!#\e(B)
+\e$B$F2<$5$$!#$3$l$,2C$($i$l$k$H!"\e(Bspam \e$B0u$,IU$$$?5-;v$N%0%k!<%W$,\e(B HTTP \e$B7PM3\e(B
+\e$B$G\e(B Gmane \e$B$N4IM}<T$KJs9p$5$l$^$9!#\e(B
+
+Gmane \e$B$O\e(B @uref{http://gmane.org} \e$B$G8+$D$1$k$3$H$,$G$-$^$9!#\e(B
+
+@end defvar
+
+@defvar spam-report-gmane-use-article-number
+
+\e$B$3$NJQ?t$O%G%#%U%)%k%H$G\e(B @code{t} \e$B$G$9!#$"$J$?<+?H$,%K%e!<%9%5!<%P!<$r1?\e(B
+\e$B1D$7$F$$$k!"$9$J$o$A%m!<%+%k$J5-;vHV9f$,\e(B Gmane \e$B$N5-;vHV9f$H9g$o$J$$>l9g\e(B
+\e$B$O!"\e(B@code{nil} \e$B$K@_Dj$7$F2<$5$$!#\e(B
+@code{spam-report-gmane-use-article-number} \e$B$,\e(B @code{nil} \e$B$G$"$k$H!"\e(B
+@file{spam-report.el} \e$B$O\e(B Gmane \e$B$,Ds6!$9$k\e(B @code{X-Report-Spam} \e$B%X%C%@!<\e(B
+\e$B$r;H$$$^$9!#\e(B
 
 @end defvar
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index ff8b7a5..f1a5267 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -22688,7 +22688,21 @@ Add this symbol to a group's @code{spam-process} parameter by
 customizing the group parameters or the
 @code{gnus-spam-process-newsgroups} variable.  When this symbol is
 added to a group's @code{spam-process} parameter, the spam-marked
-articles groups will be reported to the Gmane administrators.
+articles groups will be reported to the Gmane administrators via a
+HTTP request.
+
+Gmane can be found at @uref{http://gmane.org}.
+
+@end defvar
+
+@defvar spam-report-gmane-use-article-number
+
+This variable is @code{t} by default.  Set it to @code{nil} if you are
+running your own news server, for instance, and the local article
+numbers don't correspond to the Gmane article numbers.  When
+@code{spam-report-gmane-use-article-number} is @code{nil},
+@code{spam-report.el} will use the @code{X-Report-Spam} header that
+Gmane provides.
 
 @end defvar