Synch with Ma Gnus (201202151750).

diff --git a/gnus-ja.texi b/gnus-ja.texi
index fdf30c6..f175766 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -667,7 +667,6 @@ Getting News
 * Direct Functions::            \e$B%5!<%P!<$KD>@\@\B3$9$k\e(B
 * Indirect Functions::          \e$B%5!<%P!<$K4V@\E*$K@\B3$9$k\e(B
 * Common Variables::            \e$B$$$/$D$+$N@\B3MQ$N4X?t$,;2>H$9$kJQ?t\e(B
-* NNTP marks::                  @acronym{NNTP} \e$B%5!<%P!<MQ$N0u$NJ]B8\e(B
 
 Getting Mail
 
@@ -1080,11 +1079,6 @@ Gnus \e$B$O\e(B @code{gnus-nntpserver-file} (\e$B@_Dj$5$l$F$$$J$$>l9g\e(B
 @noindent
 \e$B$H@_Dj$7$^$9!#\e(B
 
-\e$BCm\e(B: @acronym{NNTP} \e$B%P%C%/%(%s%I$O0u%U%!%$%k\e(B (@pxref{NNTP marks}) \e$B$K0u$r\e(B
-\e$BJ]B8$7$^$9!#$3$N5!G=$O\e(B Gnus \e$B$,%$%s%9%H!<%k$5$l$F$$$kJ#?t$N%[%9%H4V$G0u$r\e(B
-\e$B6&M-$9$k$3$H$rMF0W$K$7$^$9$,!"?7Ce5-;v$N<hF@$r$A$g$C$HCY$/$9$k$+$b$7$l$^\e(B
-\e$B$;$s!#>\:Y$K$D$$$F$O\e(B @ref{NNTP marks} \e$B$r;2>H$7$F$/$@$5$$!#\e(B
-
 @node The Server is Down
 @section \e$B%5!<%P!<$,Mn$A$F$$$k\e(B
 @cindex server errors
@@ -4223,11 +4217,10 @@ Gnus
 \e$B$O\e(B @code{file-name} \e$B$H$$$&\e(B coding system \e$B$N\e(B aliasee (@code{file-name} \e$B$r\e(B
 \e$BJLL>$K;}$D!"$"$k\e(B coding system) \e$B$G$9!#\e(B
 
-@code{nnml} \e$B%P%C%/%(%s%I!"\e(B@code{nnrss} \e$B%P%C%/%(%s%I!"\e(B
-@acronym{NNTP} \e$B0u\e(B (@pxref{NNTP marks})\e$B!"%(!<%8%'%s%H!"$*$h$S%-%c%C%7%e$O!"\e(B
-\e$B$=$l$i$N%U%!%$%k$H%G%#%l%/%H%j!<$GHs\e(B-@acronym{ASCII} \e$B%0%k!<%WL>$r;H$$$^\e(B
-\e$B$9!#$3$NJQ?t$O!"$=$l$i$N%U%!%$%kL>$H%G%#%l%/%H%j!<L>$r%(%s%3!<%I$*$h$S%G\e(B
-\e$B%3!<%I$9$k$H$-$KMQ$$$i$l$k\e(B coding system \e$B$r;XDj$9\e(B
+@code{nnml} \e$B%P%C%/%(%s%I!"\e(B@code{nnrss} \e$B%P%C%/%(%s%I!"%(!<%8%'%s%H!"$*$h\e(B
+\e$B$S%-%c%C%7%e$O!"$=$l$i$N%U%!%$%k$H%G%#%l%/%H%j!<$GHs\e(B-@acronym{ASCII} \e$B%0\e(B
+\e$B%k!<%WL>$r;H$$$^$9!#$3$NJQ?t$O!"$=$l$i$N%U%!%$%kL>$H%G%#%l%/%H%j!<L>$r%(\e(B
+\e$B%s%3!<%I$*$h$S%G%3!<%I$9$k$H$-$KMQ$$$i$l$k\e(B coding system \e$B$r;XDj$9\e(B
 \e$B$k\e(B @code{file-name-coding-system} \e$B$NCM$r>e=q$-$7$^$9!#\e(B
 
 XEmacs (@code{mule} \e$B5!G=IU$-\e(B) \e$B$G$O!"\e(B@code{file-name-coding-system} \e$B$O%U%!\e(B
@@ -10607,8 +10600,7 @@ Gnus \e$B$O\e(B @code{Message-ID} \e$B$rIU$1BX$($F\e(B (\e$BI=<($N$?$a$@$1$K\e(B) \e$B$
 @vindex gnus-propagate-marks
 @item gnus-propagate-marks
 @code{nil} \e$B0J30$NCM$@$C$?$i!"0u$r%P%C%/%(%s%I$KEA$($^$9!#$=$l$i$r5-O?$9\e(B
-\e$B$k$?$a$G$9!#$b$C$H$-$a:Y$+$/$U$k$$$K$+$1$k$K$O\e(B @ref{NNTP marks} \e$B$*$h$S$=\e(B
-\e$B$NCg4V$r;2>H$7$F$/$@$5$$!#\e(B
+\e$B$k$?$a$G$9!#\e(B
 @end table
 
 @node Summary Group Information
@@ -13522,7 +13514,6 @@ default force yes
 * Direct Functions::            \e$B%5!<%P!<$KD>@\@\B3$9$k\e(B
 * Indirect Functions::          \e$B%5!<%P!<$K4V@\E*$K@\B3$9$k\e(B
 * Common Variables::            \e$B$$$/$D$+$N@\B3MQ$N4X?t$,;2>H$9$kJQ?t\e(B
-* NNTP marks::                  @acronym{NNTP} \e$B%5!<%P!<MQ$N0u$NJ]B8\e(B
 @end menu
 
 @node Direct Functions
@@ -13780,52 +13771,6 @@ default force yes
 \e$B$O\e(B @samp{()} \e$B$G$9!#\e(B
 @end table
 
-@node NNTP marks
-@subsubsection NNTP marks
-@cindex storing NNTP marks
-
-Gnus \e$B$O\e(B @acronym{NNTP} \e$B%5!<%P!<$N$?$a$N5-;v$N0u\e(B (marks) (@pxref{Marking
-Articles}) \e$B$r0u%U%!%$%k$KJ]B8$7$^$9!#0u%U%!%$%k$O$"$k%0%k!<%W$G@_Dj$7$?\e(B
-\e$B0u$r5-O?$7!"$=$l$>$l$N%U%!%$%k$O!"BP1~$9$k%5!<%P!<$KBP$7$F@lMQ$G$9!#0u%U%!\e(B
-\e$B%$%k$O!"%K%e!<%9%5!<%P!<$K;w$F$$$k8EE5E*$J3,AX\e(B
-\e$B$G\e(B @file{~/News/marks} (@code{nntp-marks-directory}) \e$B$KJ]B8$5$l$^$9!#Nc\e(B
-\e$B$($P\e(B news.gmane.org \e$B%5!<%P!<$K$*$1$k\e(B @samp{gmane.discuss} \e$B%0%k!<%W$N$?$a\e(B
-\e$B$N0u%U%!%$%k\e(B
-\e$B$O\e(B @file{~/News/marks/news.gmane.org/gmane/discuss/.marks} \e$B$KJ]B8$5$l$^\e(B
-\e$B$9!#\e(B
-
-\e$B0u%U%!%$%k$OLr$KN)$A$^$9!#\e(B@file{~/News/marks} \e$B%G%#%l%/%H%j!<$O\e(B (rsync\e$B!"\e(B
-scp \e$B$^$?$OB>$N2?$+$r;H$C$F\e(B) Gnus \e$B$rAv$i$;$kJL$N%[%9%H$K%3%T!<$9$k$3$H$,\e(B
-\e$B$G$-!"$I$N5-;v$rFI$s$G0u$rIU$1$?$+$r$=$A$i$G:F8=$7$^$9!#\e(B
-@file{~/News/marks} \e$B$N%G!<%?$O!"\e(B@file{~/.newsrc.eld} \e$B$K$"$kF1$8$b$N$h$j\e(B
-\e$B$bM%@h$5$l$^$9!#\e(B
-
-\e$B0u%U%!%$%k$O!"$=$l$>$l$N%5!<%P!<$G$=$l@lMQ$KHs>o$KFC2=$5$l$k$3$H$KCm0U$7\e(B
-\e$B$F$/$@$5$$!#\e(BGnus \e$B$O5-;vHV9f$r5-21$9$k$N$G!"N>J}$N%[%9%H$GF1$8%5!<%P!<$r\e(B
-\e$B;H$C$F$$$J$$$H!"$b$N$4$H$O2u$l$F$7$^$&$G$7$g$&\e(B (\e$BBgDq$N\e(B @acronym{NNTP} \e$B%5!<\e(B
-\e$B%P!<$OB>$N$I$s$J%5!<%P!<$H$bF1$85-;vHV9f$r;H$$$^$;$s\e(B)\e$B!#$7$+$7!"$"$k%[%9\e(B
-\e$B%H$G%5!<%P!<\e(B A\e$B!"\e(BB\e$B!"\e(BC \e$B$r;H$$!"JL$N%[%9%H$G%5!<%P!<\e(B A\e$B!"\e(BD\e$B!"\e(BE \e$B$r;H$&>l9g$K$O!"\e(B
-A \e$B$N$?$a$N0u%U%!%$%k$rF1$8$K$9$k$3$H$,$G$-$k$N$G!"Fs$D$N%[%9%H4V$G$=$N%5!<\e(B
-\e$B%P!<$OF14|$9$k$G$7$g$&!#\e(B
-
-@acronym{NNTP} \e$B0u$N;HMQ$O@-G=$NNt2=$r>7$-!"\e(BGnus \e$B$r$N$m$/46$8$5$;$k2DG=@-\e(B
-\e$B$,$"$j$^$9!#$=$&$$$&>l9g$O\e(B @code{nntp-marks-is-evil} \e$BJQ?t$r\e(B @code{t} \e$B$K\e(B
-\e$B@_Dj$7$F$_$F$/$@$5$$!#$9$k$H!"0u$O\e(B @file{~/.newsrc.eld} (\e$B$@$1\e(B) \e$B$K3JG<$5\e(B
-\e$B$l$k$h$&$K$J$k$G$7$g$&!#\e(B
-
-\e$B4XO"$9$kJQ?t\e(B:
-
-@table @code
-@item nntp-marks-is-evil
-@vindex nntp-marks-is-evil
-\e$BHs\e(B-@code{nil} \e$B$@$C$?$i!"$3$N%P%C%/%(%s%I$O0u%U%!%$%k$rL5;k$7$^$9!#%G%#%U%)\e(B
-\e$B%k%H$O\e(B @code{nil} \e$B$G$9!#\e(B
-
-@item nntp-marks-directory
-@vindex nntp-marks-directory
-@acronym{NNTP} \e$B%0%k!<%W$N0u$,3JG<$5$l$k%G%#%l%/%H%j!<$G$9!#\e(B
-@end table
-
 @node News Spool
 @subsection \e$B%K%e!<%9%9%W!<%k\e(B
 @cindex nnspool
@@ -15962,22 +15907,6 @@ Babyl \e$B%U%!%$%k$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#%G%#%U%)%k%H\e(B
 \e$B$N\e(B @acronym{NOV} \e$B%G!<%?%Y!<%9$b:n@.$7$J$1$l$P$J$j$^$;$s!#$3$l$N$?$a$K!"\e(B
 \e$B%a!<%k$rFI$`$3$H$K4X$7$F$O$?$V$s:GB.$N%P%C%/%(%s%I$K$J$k$N$G$9!#\e(B
 
-@cindex self contained nnml servers
-@cindex marks
-\e$B0u%U%!%$%k\e(B (\e$BLuCm\e(B: marks file) \e$B$,;H$o$l$k$H\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9$,\e(B)\e$B!"\e(B
-@code{nnml} \e$B%5!<%P!<$O\e(B @code{tar} \e$B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e$G$"\e(B
-\e$B$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G\e(B Gnus \e$B$KLa$9\e(B (\e$BK\Mh$N\e(B @code{nnml} \e$B%5!<\e(B
-\e$B%P!<$K$h$C$FDI2C$9$k\e(B) \e$B$3$H$,$G$-$kFC<A$r;}$D$h$&$K$J$j$^$9!#%0%k!<%W$N0u\e(B
-\e$B$O$=$l$>$l$N\e(B @code{nnml} \e$B%0%k!<%W$N%G%#%l%/%H%j!<Fb$N!"DL\e(B
-\e$B>o\e(B @file{.marks} \e$B%U%!%$%k\e(B (@code{nnml-marks-file-name} \e$B$r;2>H\e(B) \e$B$K3JG<$5\e(B
-\e$B$l$^$9!#$^$?!"8D!9$N\e(B @code{nnml} \e$B%0%k!<%W$K$D$$$F$b%P%C%/%"%C%W$9$k$3$H\e(B
-\e$B$,2DG=$G!"$=$&$9$k$K$O\e(B (\e$B%P%C%/%"%C%W$r\e(B nnml \e$B%G%#%l%/%H%j!<$KLa$7$?8e\e(B
-\e$B$G\e(B) @kbd{G m} \e$B%-!<$r;H$C$F$=$N%0%k!<%W$r85$KLa$7$F$/$@$5$$!#\e(B
-
-\e$B2?$i$+$NM}M3$K$h$C$F\e(B @file{.marks} \e$B%U%!%$%k$,$*$+$7$/$J$C$F$$$k$H;W$C$?\e(B
-\e$B$H$-$O!"C1$K$=$l$iA4It$r>C$7$F$7$^$($PNI$$$G$7$g$&!#\e(BGnus \e$B$O<!2s5/F0$9$k\e(B
-\e$B$H$-$K!"$=$l$i$r@5$7$/:F:n@.$7$F$/$l$^$9!#\e(B
-
 \e$B2>A[%5!<%P!<$N@_Dj\e(B:
 
 @table @code
@@ -16015,15 +15944,6 @@ Babyl \e$B%U%!%$%k$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#%G%#%U%)%k%H\e(B
 @vindex nnml-prepare-save-mail-hook
 \e$BJ]B8$9$kA0$K0l$D$N5-;v$KHO0O$r69$a$F<B9T$9$k%U%C%/$G$9!#\e(B
 
-@item nnml-marks-is-evil
-@vindex nnml-marks-is-evil
-\e$BHs\e(B-@code{nil} \e$B$G$"$k$H!"$3$N%P%C%/%(%s%I$O$$$+$J$k\e(B @sc{\e$B0u\e(B} \e$B%U%!%$%k$bL5\e(B
-\e$B;k$7$^$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9!#\e(B
-
-@item nnml-marks-file-name
-@vindex nnml-marks-file-name
-\e$B!V0u!W%U%!%$%k$NL>A0$G$9!#%G%#%U%)%k%H$O\e(B @file{.marks} \e$B$G$9!#\e(B
-
 @item nnml-use-compressed-files
 @vindex nnml-use-compressed-files
 \e$BHs\e(B-@code{nil} \e$B$@$C$?$i!"\e(B@code{nnml} \e$B$O05=L$5$l$?%a%C%;!<%8%U%!%$%k$r07$&\e(B
@@ -16362,18 +16282,6 @@ Gnus \e$B$,\e(B @code{nnmaildir} \e$B$K0u$N%;%C%H$r3JG<$9$k$3$H$rMW5a$9$k$H!"\e(B
 @code{nnfolder} \e$B$O5-;vHV9f$HE~Ce;~9o$r8+<:$o$J$$$h$&$K$9$k$?$a$NDI2C$N%X%C\e(B
 \e$B%@!<$r2C$($^$9!#\e(B
 
-@cindex self contained nnfolder servers
-@cindex marks
-\e$B0u%U%!%$%k\e(B (\e$BLuCm\e(B: marks file) \e$B$,;H$o$l$k$H\e(B (\e$B$=$l$,%G%#%U%)%k%H$G$9$,\e(B)\e$B!"\e(B
-@code{nnfolder} \e$B%5!<%P!<$O\e(B @code{tar} \e$B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e\e(B
-\e$B$G$"$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G\e(B Gnus \e$B$KLa$9\e(B (\e$BK\Mh\e(B
-\e$B$N\e(B @code{nnfolder} \e$B%5!<%P!<$K$h$C$FDI2C$9$k\e(B) \e$B$3$H$,$G$-$kFC<A$r;}$D$h$&\e(B
-\e$B$K$J$j$^$9!#%0%k!<%W$N0u$O\e(B @code{nnfolder} \e$B%G%#%l%/%H%j!<Fb$N!"\e(Bmbox \e$B%U%!\e(B
-\e$B%$%k$KDL>o\e(B @file{.mrk} (@code{nnfolder-marks-file-name} \e$B$r;2>H\e(B) \e$B$,IU2C$5\e(B
-\e$B$l$?L>A0$N%U%!%$%k$K3JG<$5$l$^$9!#$^$?!"8D!9$N\e(B @code{nnfolder} \e$B%0%k!<%W\e(B
-\e$B$K$D$$$F$b%P%C%/%"%C%W$9$k$3$H$,2DG=$G!"\e(B(\e$B%P%C%/%"%C%W$r\e(B nnfolder \e$B%G%#%l\e(B
-\e$B%/%H%j!<$KLa$7$?8e$G\e(B) @kbd{G m} \e$B%-!<$r;H$($P!"$=$N%0%k!<%W$O85$KLa$j$^$9!#\e(B
-
 \e$B2>A[%5!<%P!<$N@_Dj\e(B:
 
 @table @code
@@ -16431,20 +16339,6 @@ Gnus \e$B$,\e(B @code{nnmaildir} \e$B$K0u$N%;%C%H$r3JG<$9$k$3$H$rMW5a$9$k$H!"\e(B
 @vindex nnfolder-nov-directory
 @acronym{NOV} \e$B%U%!%$%k$,3JG<$5$l$k%G%#%l%/%H%j!<$G$9!#\e(B@code{nil} \e$B$@$C$?\e(B
 \e$B$i\e(B @code{nnfolder-directory} \e$B$,;H$o$l$^$9!#\e(B
-
-@item nnfolder-marks-is-evil
-@vindex nnfolder-marks-is-evil
-\e$BHs\e(B-@code{nil} \e$B$G$"$k$H!"$3$N%P%C%/%(%s%I$O$$$+$J$k\e(B @sc{\e$B0u\e(B} \e$B%U%!%$%k$r$b\e(B
-\e$BL5;k$7$^$9!#%G%#%U%)%k%H$O\e(B @code{nil} \e$B$G$9!#\e(B
-
-@item nnfolder-marks-file-suffix
-@vindex nnfolder-marks-file-suffix
-@sc{\e$B0u\e(B} \e$B%U%!%$%k$N3HD%;R$G$9!#%G%#%U%)%k%H$O\e(B @file{.mrk} \e$B$G$9!#\e(B
-
-@item nnfolder-marks-directory
-@vindex nnfolder-marks-directory
-@sc{\e$B0u\e(B} \e$B%U%!%$%k$,3JG<$5$l$k%G%#%l%/%H%j!<$G$9!#\e(B@code{nil} \e$B$@$C$?\e(B
-\e$B$i\e(B @code{nnfolder-directory} \e$B$,;H$o$l$^$9!#\e(B
 @end table
 
 @findex nnfolder-generate-active-file
@@ -16601,8 +16495,7 @@ maildir \e$B$O<u?.G[Aw$N$?$a$N%m%C%/$rI,MW$H$7$J$$$N$G!"$"$J$?$,%0%k!<%W$H$7\e(B
 @code{nnmaildir} \e$B$O%0%k!<%W$N5-;v$N0u$r!"$=$l$KBP1~$9$k\e(B maildir \e$B$K3JG<$7\e(B
 \e$B$^$9!#\e(BGnus \e$B$N30$+$i$=$l$i$r4JC1$KA`:n$G$-$k$h$&$K$9$k$?$a$K!"$=$N$h$&$K\e(B
 \e$B:n$i$l$F$$$k$N$G$9!#\e(Bmaildir \e$B$r\e(B tar \e$B$G$^$H$a$F$+$iJL$N$I$3$+$GE83+$7$F$b!"\e(B
-\e$B0u$O$=$N$^$^$G$9!#\e(B@code{nnml} \e$B$b0u$r3JG<$7$^$9$,!"\e(B
-@code{nnmaildir} \e$B$G\e(B Gnus \e$B$N30$+$i$=$l$i$r;H$&$h$&$K4JC1$G$O$"$j$^$;$s!#\e(B
+\e$B0u$O$=$N$^$^$G$9!#\e(B
 
 @code{nnmaildir} \e$B$OB.EY$r>e$2$k$?$a$K$+$J$j$NNL$N%a%b%j$r;H$$$^$9!#\e(B
 (@code{nnml} \e$B$N>l9g$O%U%!%$%k$K3JG<$7!"\e(B@code{nnmh} \e$B$G$O2?EY$b%a%C%;!<%8\e(B
@@ -16688,16 +16581,6 @@ Gnus \e$B$r=*N;$9$kI,MW$OL5$$$N$G!"J]B8$O\e(B @code{cron} \e$B$d$=$l$KN`$9$k$b$N$,9
 \e$B$9$k$+$b$7$l$J$$$N$G!"%G!<%?$rI|5"$5$;$kA0$K\e(B Gnus \e$B$r=*N;$9$kI,MW$,$"$k$+\e(B
 \e$B$b$7$l$^$;$s!#\e(B
 
-\e$B$5$i$K!"8D!9$N\e(B @code{nnml}, @code{nnfolder} \e$B$^$?$O\e(B @code{nnmaildir} \e$B$N%0\e(B
-\e$B%k!<%W$r!"0u$rJ];}$7$D$DJ]B8$9$k$3$H$b$G$-$^$9!#\e(B@code{nnml} \e$B$^$?\e(B
-\e$B$O\e(B @code{nnmaildir} \e$B$G$O!"$=$N%0%k!<%W$N%G%#%l%/%H%j!<$K$"$k$9$Y$F$N%U%!\e(B
-\e$B%$%k$r%3%T!<$7$F$/$@$5$$!#\e(B@code{nnfolder} \e$B$G$O!"4pK\$N%U%)%k%@!<%U%!%$%k\e(B
-\e$B$=$N$b$N\e(B (\e$BNc$($P\e(B @file{FOO}) \e$B$H0u%U%!%$%k\e(B (@file{FOO.mrk}) \e$B$NN>J}$r%3%T!<\e(B
-\e$B$9$kI,MW$,$"$j$^$9!#%0%k!<%W$r85$KLa$9$K$O!"%0%k!<%W%P%C%U%!!<\e(B
-\e$B$G\e(B @kbd{G m} \e$B%-!<$r;H$$$^$7$g$&!#$=$N:G8e$N<j=g$,!"\e(BGnus \e$B$K?7$7$$%G%#%l%/\e(B
-\e$B%H%j!<$,$G$-$?$3$H$rCN$i$;$^$9!#\e(B@code{nnmaildir} \e$B$O<+F0E*$K?7$7$$%G%#%l\e(B
-\e$B%/%H%j!<$rCN$k$N$G!"$=$N>l9g\e(B @kbd{G m} \e$B$OITMW$G$9!#\e(B
-
 @node Web Searches
 @subsection \e$B%&%'%V8!:w\e(B
 @cindex nnweb