Synch with No Gnus (200812032322).

diff --git a/gnus-ja.texi b/gnus-ja.texi
index 276eb2f..0d4f4b4 100644 (file)
--- a/gnus-ja.texi
+++ b/gnus-ja.texi
@@ -4375,7 +4375,9 @@ Mairix \e$B$O%m!<%+%k$J%a!<%k$r8!:w$7$^$9\e(B---\e$B$D$^$j\e(B mairix \e$B$O%a!<%k!&%
 \e$B$b\e(B @code{nnmairix} \e$B$r;H$$$?$$$N$J$i$P!"%m!<%+%k$J\e(B @acronym{IMAP} \e$B%5!<%P!<\e(B
 \e$B$rN)$A>e$2$k$3$H$K$h$C$F\e(B @code{nnimap} \e$B$r2p$7$F%"%/%;%9$9$k$3$H$,$G$-$^\e(B
 \e$B$9!#$3$l$O$$$/$D$+$N\e(B mbox \e$B%U%!%$%k$K%"%/%;%9$9$k$?$a$K$7$F$O$+$J$jBg$,$+\e(B
-\e$B$j$J:n6H$K$J$k$N$G!"$b$&\e(B MH \e$B$+\e(B Maildir \e$B$KJQ$($F$7$^$$$^$7$g$&!#\e(B
+\e$B$j$J:n6H$K$J$k$N$G!"$b$&\e(B MH \e$B$+\e(B Maildir \e$B$KJQ$($F$7$^$$$^$7$g$&!#$=$l$G\e(B
+\e$B$b\e(B mbox \e$B$r;H$&$3$H$KK\Ev$KK\Ev$K>pG.$r;}$C$F$$$k$N$J$i!"\e(BEmacs 23 \e$B$KIUB0\e(B
+\e$B$7$F$$$k\e(B @file{mairix.el} \e$B%Q%C%1!<%8$r8&5f$9$kI,MW$,$"$k$G$7$g$&!#\e(B
 
 @node What nnmairix does
 @subsubsection nnmairix \e$B$O<B:]$K2?$r$9$k$N$+\e(B?
@@ -4419,11 +4421,13 @@ Mairix \e$B%U%)%k%@!<$N$?$a$K;0$D$N0[$J$k%a!<%k%P%C%/%(%s%I\e(B @code{nnml}\e$B!"\e(
 \e$B%I$K$OL>A0$,\e(B @code{<NAME>} \e$B$@$1$K$J$C$FEO$5$l$^$9!#$9$G$K%a!<%k$r3JG<$7\e(B
 \e$B$F$$$k4{B8$N%a!<%k%P%C%/%(%s%I$r;H$&$3$H$,$G$-$^$9$,!"$"$J$?$NB>$N%a!<%k\e(B
 \e$B$HJB$Y$F?7$7$$%a!<%k%0%k!<%W$r:n$k\e(B @code{nnmairix} \e$B$,5$;}$A0-$$$N$G$"$l\e(B
-\e$B$P!"Nc$($P?7$7$$\e(B @code{nnmaildir} \e$B%5!<%P!<$r\e(B mairix \e$B@lMQ$K:n$k$3$H$b$G$-\e(B
-\e$B$^$9!#$7$+$7!"$b$7\e(B @code{nnimap} \e$B$H$H$b$K\e(B @acronym{IMAP} \e$B%5!<%P!<\e(B
-\e$B$G\e(B mairix \e$B$r%j%b!<%H$K;H$$$?$$$N$G$"$l$P!"FCJL$J;v>p$,@8$8$^$9\e(B---\e$B$3$3$G\e(B
-\e$B$O\e(B mairix \e$B%U%)%k%@!<$HB>$N%a!<%k$,F1$8\e(B @code{nnimap} \e$B%P%C%/%(%s%I>e$K$J\e(B
-\e$B$1$l$P$J$j$^$;$s!#\e(B
+\e$B$P!"Nc$($P?7$7$$\e(B @code{nnmaildir} \e$B$^$?$O\e(B @code{nnml} \e$B%5!<%P!<\e(B
+\e$B$r\e(B mairix \e$B@lMQ$K:n$k$3$H$b$G$-$^$9!#$?$@$7!"$=$l$i$N%5!<%P!<$,4V0c$C$F?7\e(B
+\e$BCe%a!<%k$r<h$j9~$s$G$7$^$o$J$$$h$&$K$7$F$/$@$5\e(B
+\e$B$$\e(B (@pxref{nnmairix caveats})\e$B!#$b$7\e(B @code{nnimap} \e$B$H$H$b\e(B
+\e$B$K\e(B @acronym{IMAP} \e$B%5!<%P!<$G\e(B mairix \e$B$r%j%b!<%H$K;H$$$?$$$N$G$"$l$P!"FCJL\e(B
+\e$B$J;v>p$,@8$8$^$9\e(B---\e$B$3$3$G$O\e(B mairix \e$B%U%)%k%@!<$HB>$N%a!<%k$,F1\e(B
+\e$B$8\e(B @code{nnimap} \e$B%P%C%/%(%s%I>e$K$J$1$l$P$J$j$^$;$s!#\e(B
 
 @node Setting up mairix
 @subsubsection mairix \e$B$N@_Dj\e(B
@@ -4532,10 +4536,10 @@ Mairix \e$B$,$=$N8!:w7k2L$r3JG<$9$k\e(B @strong{\e$B%P%C%/%(%s%I!&%5!<%P!<\e(B} \e$B$
 \e$B%;%9$9$k%5!<%P!<$,%5%]!<%H$5$l$F$$$^$9!#>e$G@bL@$7$?$h$&$K!"%m!<%+%k$K3J\e(B
 \e$BG<$5$l$k%a!<%k$N$?$a$K$O!"$"$J$?$,%a!<%k$r3JG<$7$F$$$k4{B8$N%5!<%P!<$K$9\e(B
 \e$B$l$PNI$$$G$7$g$&!#$7$+$7\e(B @code{nnmairix} \e$B@lMQ$K!"Nc$($P?7$7\e(B
-\e$B$$\e(B @code{nnmaildir} \e$B%5!<%P!<$rBhFs$N\e(B (secondary) \e$BA*BrJ}K!$K2C$($k$3$H$b\e(B
-\e$B$G$-$^$9\e(B (@pxref{Finding the News})\e$B!#\e(BMairix \e$B$r\e(B @acronym{IMAP} \e$B%5!<%P!<>e\e(B
-\e$B$G1s3VF0:n$5$;$?$$$N$J$i$P!"$=$3$G$=$l$KBP1~$9$k\e(B @code{nnimap} \e$B%5!<%P!<\e(B
-\e$B$rA*$P$J$1$l$P$J$j$^$;$s!#\e(B
+\e$B$$\e(B @code{nnmaildir} \e$B$^$?$O\e(B @code{nnml} \e$B%5!<%P!<$rBhFs$N\e(B (secondary) \e$BA*Br\e(B
+\e$BJ}K!$K2C$($k$3$H$b$G$-$^$9\e(B (@pxref{Finding the News})\e$B!#\e(B
+Mairix \e$B$r\e(B @acronym{IMAP} \e$B%5!<%P!<>e$G1s3VF0:n$5$;$?$$$N$J$i$P!"$=$3$G$=\e(B
+\e$B$l$KBP1~$9$k\e(B @code{nnimap} \e$B%5!<%P!<$rA*$P$J$1$l$P$J$j$^$;$s!#\e(B
 
 @item
 @vindex nnmairix-mairix-search-options
@@ -4724,7 +4728,7 @@ tips and tricks})\e$B!#\e(B
 \e$B$?\e(B mairix \e$B$N%P%$%J%j!<$,I,MW$G$9!#$=$&$7$J$$$H$$$D$b\e(B mairix \e$B%G!<%?%Y!<%9\e(B
 \e$B$r99?7$7$J$1$l$P$J$i$J$$$G$7$g$&!#%Q%C%A$O$3$3$G<j$KF~$j$^$9\e(B:
 
-@uref{http://m61s02.vlinux.de/mairix-maildir-patch.tar}
+@uref{http://www.randomsample.de/mairix-maildir-patch.tar}
 
 \e$B$3$N%Q%C%A$K$O\e(B mairix v0.21 \e$B$N%=!<%9%3!<%I$,I,MW$G$9!#$=$l$KIU$$$F$$\e(B
 \e$B$k\e(B readme \e$B%U%!%$%k$G$I$s$J$3$H$b@bL@$5$l$F$$$^$9!#0u$NEAHB$r;H$o$J$/$F$b\e(B
@@ -4903,9 +4907,19 @@ b d} \e$B$r;H$C$F!"$=$N\e(B @code{nnmairix} \e$B%0%k!<%W$r:n$jD>$7$F$/$@$5$$!#\e(B
 
 @itemize
 @item
-\e$B$b$7\e(B Gnus \e$B%(!<%8%'%s%H\e(B (@pxref{Gnus Unplugged}) \e$B$r;H$C$F$$$k$J$i\e(B:
-@code{nnmairix} \e$B%0%k!<%W$r%(!<%8%'%s%H2=$7$J$$$G$/$@$5$$\e(B (\e$B$b$C$H$b!"$=$l\e(B
-\e$B$r$d$C$?$i2?$,5/$-$k$+;d$OCN$j$^$;$s$,\e(B)\e$B!#\e(B
+\e$BBhFs$N\e(B @code{nnml} \e$B%5!<%P!<$r!"$^$5$K\e(B nnmairix \e$B$N$?$a$K:n$k$3$H$,$G$-$^\e(B
+\e$B$9!#$7$+$7$=$N>l9g!"BP1~$9$k%5!<%P!<JQ?t\e(B @code{nnml-get-new-mail} \e$B$rL@<(\e(B
+\e$BE*$K\e(B @code{nil} \e$B$K@_Dj$9$kI,MW$,$"$j$^$9!#$=$&$7$F$*$+$J$$$H?7Ce%a!<%k$,\e(B
+\e$B$3$NBhFs$N%5!<%P!<$K<h$j9~$^$l$F$7$^$&$+$b$7$l$^$;$s\e(B (\e$B$=$7$F!"$=$l$i$rFs\e(B
+\e$BEY$H8+$k$3$H$O$J$$$G$7$g$&\e(B)\e$B!#%5!<%P!<Dj5A$NNc$G$9\e(B:
+
+@lisp
+(nnml "mairix" (nnml-directory "mairix") (nnml-get-new-mail nil))
+@end lisp
+
+(@code{nnmaildir} \e$B$K$b%5!<%P!<JQ?t\e(B @code{get-new-mail} \e$B$,$"$k$N$G$9$,!"\e(B
+\e$B$=$l$O%G%#%U%)%k%H$G\e(B @code{nil} \e$B$J$N$G!"\e(B@code{nnmaildir} \e$B%5!<%P!<$r$^$5\e(B
+\e$B$K\e(B mairix \e$BMQ$K;H$&>l9g$G$b!"$=$l$rL@<(E*$K@_Dj$9$kI,MW$O$"$j$^$;$s!#\e(B)
 
 @item
 \e$B$b$7\e(B Gnus \e$B%l%8%9%H%j!<$r;H$C$F$$$k$J$i\e(B:
@@ -4922,6 +4936,11 @@ b d} \e$B$r;H$C$F!"$=$N\e(B @code{nnmairix} \e$B%0%k!<%W$r:n$jD>$7$F$/$@$5$$!#\e(B
 \e$B$O$$$1$^$;$s\e(B (\e$B$H$K$+$/$=$l$,$G$-$k$Y$-$G$O$"$j$^$;$s\e(B)\e$B!#\e(B
 
 @item
+\e$B$b$7\e(B Gnus \e$B%(!<%8%'%s%H\e(B (@pxref{Gnus Unplugged}) \e$B$r;H$C$F$$$k$J$i\e(B:
+@code{nnmairix} \e$B%0%k!<%W$r%(!<%8%'%s%H2=$7$J$$$G$/$@$5$$\e(B (\e$B$b$C$H$b!"$=$l\e(B
+\e$B$r$d$C$?$i2?$,5/$-$k$+;d$OCN$j$^$;$s$,\e(B)\e$B!#\e(B
+
+@item
 Mairix \e$B$O\e(B @acronym{US}-@acronym{ASCII} \e$BJ8;z$@$1$r%5%]!<%H$7$^$9!#\e(B
 
 @item