Synch to Oort Gnus 200303312021.
[elisp/gnus.git-] / texi / gnus-ja.texi
index 91d1f1f..374a830 100644 (file)
@@ -695,6 +695,7 @@ Article Treatment
 * Article Header::              \e$B%X%C%@!<$r$$$m$$$mJQ7A$5$;$k\e(B
 * Article Buttons::             URL \e$B$d\e(B Message-ID \e$B$d%"%I%l%9$J$I$r%/%j%C\e(B
                                 \e$B%/$9$k\e(B
+* Article Button Levels::       \e$B%\%?%s$N8+$(J}$r@)8f$9$k\e(B
 * Article Date::                \e$B$0$:$0$:8@$&$J!"@$3&;~$@\e(B!
 * Article Display::             X-Face, Picons, Smileys \e$B$rI=<($9$k\e(B
 * Article Signature::           \e$B=pL>$C$F2?\e(B?
@@ -2830,7 +2831,8 @@ kiboze \e$B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"\e(Bkiboze \e$B%0%k!<%W$K!V4^$
 \e$B%s%0%j%9%H$G$"$k$H2r<a$7$^$9!#$3$N>pJs$r\e(B gnus \e$B$KM?$($k$3$H$O!"$"$J$?$,$=\e(B
 \e$B$l$i$N%a!<%j%s%0%j%9%H$KEj9F$9$k$H$-$K@5$7$$\e(B Mail-Followup-To \e$B%X%C%@!<$r\e(B
 \e$B@8@.$9$k$?$a$N\e(B (\e$B$[$s$N\e(B) \e$BBh0lJb$G$9!#MxMQ$G$-$k\e(B MFT \e$BBP1~5!G=$r40A4$K07$&\e(B
-\e$B$K$O!"$3$3\e(B @pxref{(message)Mailing Lists} \e$B$r8+$F2<$5$$!#\e(B
+\e$B$K$O!"$3$3\e(B @pxref{Mailing Lists, , Mailing Lists, message, The Message
+Manual} \e$B$r8+$F2<$5$$!#\e(B
 
 @code{gnus-find-subscribed-addresses} \e$B$b;2>H$7$F2<$5$$!#$3$N4X?t$O$3$N%0\e(B
 \e$B%k!<%W%Q%i%a!<%?$rD>@\$K;H$$$^$9!#\e(B
@@ -3516,12 +3518,6 @@ Gnus\e$B$r=*N;$9$k$H$-$O\e(B @code{gnus-exit-gnus-hook} \e$B$,8F$S=P$5$l!"$5$i\e(B
 \e$B$K\e(B gnus \e$B$r=*N;$9$k$H$-$N:G8e$H$7\e(B
 \e$B$F\e(B @code{gnus-after-exiting-gnus-hook} \e$B$,8F$S=P$5$l$^$9!#\e(B
 
-@findex gnus-unload
-@cindex unloading
-\e$B$b$7\e(B gnus \e$B$H$=$l$K4XO"$9$k$b$N$r40A4$K=hJ,$7$?$$$N$G$"$l$P!"\e(B
-@code{gnus-unload} \e$B%3%^%s%I$,;H$($^$9!#$3$N%3%^%s%I$O!"%a%?JQ?t$r%+%9%?\e(B
-\e$B%^%$%:$7$h$&$H$7$F$$$k$H$-$K$bJXMx$G$9!#\e(B
-
 Note:
 
 @quotation
@@ -4216,7 +4212,8 @@ gnus \e$B$O\e(B @code{browse-url} \e$B$r;H$C$F%3%s%H%m!<%k%a%C%;!<%8$r3+$-$^$9!#$=$
 
 \e$B%3%s%H%m!<%k%a%C%;!<%8$O05=L$5$l$F$$$k$3$H$KCm0U$7$F2<$5$$!#$3$N%3%^%s%I\e(B
 \e$B$r;H$&$K$O\e(B @code{auto-compression-mode} \e$B$r\e(B on \e$B$K$7$F$*$/I,MW$,$"$j$^\e(B
-\e$B$9\e(B (@pxref{(emacs)Compressed Files})\e$B!#\e(B
+\e$B$9\e(B (@pxref{Compressed Files, ,Compressed Files, emacs, The Emacs
+Manual})\e$B!#\e(B
 
 @item H d
 @itemx C-c C-d
@@ -7765,6 +7762,7 @@ Gnus \e$B$O%U%!%$%k$r1\Mw$9$k$N$r7hDj$9$k$N$K\e(B@dfn{\e$B5,B'JQ?t\e(B}\e$B$rMQ$$$^$9
 * Article Header::              \e$B%X%C%@!<$r$$$m$$$mJQ7A$5$;$k\e(B
 * Article Buttons::             URL \e$B$d\e(B Message-ID \e$B$d%"%I%l%9$J$I$r%/%j%C\e(B
                                 \e$B%/$9$k\e(B
+* Article Button Levels::       \e$B%\%?%s$N8+$(J}$r@)8f$9$k\e(B
 * Article Date::                \e$B$0$:$0$:8@$&$J!"@$3&;~$@\e(B!
 * Article Display::             X-Face, Picons, Smileys \e$B$rI=<($9$k\e(B
 * Article Signature::           \e$B=pL>$C$F2?\e(B?
@@ -8295,9 +8293,10 @@ URL \e$B$K4^$^$l$k2~9T$r:o=|$7$^$9!#$$$/$D$+$N%a%$%i!<$O!"9T$rC;$/$9$k$?$a$K\e(B
 
 @vindex gnus-article-wash-function
 \e$B%G%#%U%)%k%H$G$O\e(B @sc{html} \e$B$NJQ49$K\e(B @code{mm-text-html-renderer}
-(@pxref{(emacs-mime)Display Customization}) \e$B$G@_Dj$5$l$?4X?t$r;H$$$^$9$,!"\e(B
-\e$B$3$l$OJQ?t\e(B @code{gnus-article-wash-function} \e$B$G@)8f$5$l$^$9!#;H$&$3$H$,\e(B
-\e$B$G$-$k!"$"$i$+$8$aMQ0U$5$l$?4X?t$O0J2<$NDL$j$G$9!#\e(B
+(@pxref{Display Customization, ,Display Customization, emacs-mime, The
+Emacs MIME Manual}) \e$B$G@_Dj$5$l$?4X?t$r;H$$$^$9$,!"$3$l$OJQ\e(B
+\e$B?t\e(B @code{gnus-article-wash-function} \e$B$G@)8f$5$l$^$9!#;H$&$3$H$,$G$-$k!"\e(B
+\e$B$"$i$+$8$aMQ0U$5$l$?4X?t$O0J2<$NDL$j$G$9!#\e(B
 
 @table @code
 @item w3
@@ -8440,9 +8439,10 @@ html2text (\e$B%7%s%W%k$J\e(B @sc{html} \e$B%3%s%P!<%?!<!"\e(Bgnus \e$B$K4^$^$l$F$$$k
 
 @vindex gnus-button-man-handler
 Gnus \e$B$O%G%#%U%)%k%H$GFCDj$NI8=`$N;2>H$K\e(B@dfn{\e$B%\%?%s\e(B}\e$B$rIU$1$^$9\e(B: \e$B$A$c$s$H\e(B
-\e$B$7$?\e(B URL\e$B!"%a!<%k%"%I%l%9!"\e(BMessage-ID\e$B!"\e(BInfo \e$B$X$N%j%s%/!"$=$l$K\e(B man \e$B%Z!<%8\e(B
-\e$B$G$9!#$3$l$OFs$D$NJQ?t$K$h$C$F@)8f$5$l$F$$$F!"$=$N0l$D$O5-;v$NK\BN$r07$$!"\e(B
-\e$B$b$&0l$D$O5-;v$N%X%C%@!<$r07$$$^$9!#\e(B
+\e$B$7$?\e(B URL\e$B!"%a!<%k%"%I%l%9!"\e(BMessage-ID\e$B!"\e(BInfo \e$B$X$N%j%s%/!"\e(Bman \e$B%Z!<%8!"$=$l\e(B
+\e$B$K4XO"$9$k\e(B Emacs \e$B$^$?$O\e(B Gnus \e$B$N;29MJ88%$G$9!#$3$l$OFs$D$NJQ?t$K$h$C$F@)\e(B
+\e$B8f$5$l$F$$$F!"$=$N0l$D$O5-;v$NK\BN$r07$$!"$b$&0l$D$O5-;v$N%X%C%@!<$r07$$\e(B
+\e$B$^$9!#\e(B
 
 @table @code
 @item gnus-button-alist
@@ -8458,7 +8458,8 @@ Gnus \e$B$O%G%#%U%)%k%H$GFCDj$NI8=`$N;2>H$K\e(B@dfn{\e$B%\%?%s\e(B}\e$B$rIU$1$^$9\e(B:
 \e$B$3$N@55,I=8=\e(B (\e$BBgJ8;z$H>.J8;z$O6hJL$5$l$J$$\e(B) \e$B$K9gCW$9$k$9$Y$F$NJ8$O30It;2\e(B
 \e$B>H$G$"$k$H$_$J$5$l$^$9!#$3$l$OKd$a9~$^$l$?\e(B URL \e$B$K9gCW$9$kE57?E*$J@55,I=\e(B
 \e$B8=$G$9\e(B @samp{<URL:\\([^\n\r>]*\\)>}\e$B!#$3$l$O$^$?@55,I=8=$NCM$r;}$DJQ?t$G\e(B
-\e$B$"$C$F$b$h$/!"M-MQ$JJQ?t$H$7$F\e(B @code{gnus-button-url-regexp} \e$B$,$"$j$^$9!#\e(B
+\e$B$"$C$F$b$h$/!"M-MQ$JJQ?t$H$7$F\e(B @code{gnus-button-url-regexp} \e$B$*$h\e(B
+\e$B$S\e(B @code{gnus-button-mid-or-mail-regexp} \e$B$,$"$j$^$9!#\e(B
 
 @item button-par
 Gnus \e$B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^\e(B
@@ -8468,7 +8469,10 @@ Gnus \e$B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^\e(B
 @item use-p
 \e$B$3$N<0$O\e(B @code{\e$BI>2A\e(B} \e$B$5$l!"7k2L$,\e(B @code{nil} \e$B$G$J$1$l$P!"$3$l$O9gCW$G$"\e(B
 \e$B$k$H$_$J$5$l$^$9!#$3$l$O4V0c$C$?9gCW$rHr$1$k$?$a$KFCJL$JA*JL$r$7$?$$$H$-\e(B
-\e$B$KLr$KN)$A$^$9!#\e(B
+\e$B$KLr$KN)$A$^$9!#$3$3$G$O$7$P$7$P\e(B @code{gnus-button-@var{*}-level} \e$B$N$h$&\e(B
+\e$B$JL>A0$NJQ?t$,;H$o$l$^$9$,!"B>$N$I$s$J7A<0$G$b;H$&$3$H$,$G$-$^$9!#\e(B
+
+@c @code{use-p} is @code{eval}ed only if @code{regexp} matches.
 
 @item function
 \e$B$3$N4X?t\e(B (function) \e$B$O$3$N%\%?%s$r%/%j%C%/$7$?$H$-$K8F$P$l$^$9!#\e(B
@@ -8496,11 +8500,71 @@ Gnus \e$B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^\e(B
 
 @var{header} \e$B$O@55,I=8=$G$9!#\e(B
 
+@subsubheading \e$B4XO"$9$kJQ?t$H4X?t\e(B
+
+@item gnus-button-@var{*}-level
+@xref{Article Button Levels}.
+
+@c Stuff related to gnus-button-browse-level
+
 @item gnus-button-url-regexp
 @vindex gnus-button-url-regexp
 \e$BKd$a9~$^$l$?\e(B URL \e$B$K9gCW$9$k@55,I=8=$G$9!#$=$l$O>e$NJQ?t$N%G%#%U%)%k%H$N\e(B
 \e$BCM$G;H$o$l$^$9!#\e(B
 
+@c TRANSLATEME
+@c Stuff related to gnus-button-man-level
+
+@item gnus-button-man-handler
+@vindex gnus-button-man-handler
+The function to use for displaying man pages.  It must take at least one
+argument with a string naming the man page.
+
+@c Stuff related to gnus-button-message-level
+
+@item gnus-button-mid-or-mail-regexp
+@vindex gnus-button-mid-or-mail-regexp
+Regular expression that matches a message ID or a mail address.
+
+@item gnus-button-prefer-mid-or-mail
+@vindex gnus-button-prefer-mid-or-mail
+This variable determines what to do when the button on a string as
+@samp{foo123@@bar.invalid} is pushed.  Strings like this can be either a
+message ID or a mail address.  If it is one of the symbols @code{mid} or
+@code{mail}, Gnus will always assume that the string is a message ID or
+a mail address, respectivly.  If this variable is set to the symbol
+@code{ask}, always query the user what do do.  If it is a function, this
+function will be called with the string as it's only argument.  The
+function must return @code{mid}, @code{mail}, @code{invalid} or
+@code{ask}.  The default value is the function
+@code{gnus-button-mid-or-mail-heuristic}.
+
+@item gnus-button-mid-or-mail-heuristic
+@findex gnus-button-mid-or-mail-heuristic
+Function that guesses whether it's argument is a message ID or a mail
+address.  Returns @code{mid} it's a message IDs, @code{mail} if it's a
+mail address, @code{ask} if unsure and @code{invalid} if the string is
+invalid.
+
+@item gnus-button-mid-or-mail-heuristic-alist
+@vindex gnus-button-mid-or-mail-heuristic-alist
+An alist of @code{(RATE . REGEXP)} pairs used by the function
+@code{gnus-button-mid-or-mail-heuristic}.
+
+@c Stuff related to gnus-button-tex-level
+
+@item gnus-button-ctan-handler
+@findex gnus-button-ctan-handler
+The function to use for displaying CTAN links.  It must take one
+argument, the string naming the URL.
+
+@item gnus-ctan-url
+@vindex gnus-ctan-url
+Top directory of a CTAN (Comprehensive TeX Archive Network) archive used
+by @code{gnus-button-ctan-handler}.
+
+@c Misc stuff
+
 @item gnus-article-button-face
 @vindex gnus-article-button-face
 \e$B%\%?%s$K;H$o$l$k%U%'%$%9$G$9!#\e(B
@@ -8513,6 +8577,73 @@ Gnus \e$B$O9gCW$7$?$b$N$N$I$NItJ,$,%O%$%i%$%H$5$l$k$N$+$rCN$i$J$1$l$P$J$j$^\e(B
 \e$B5-;v$r<+F0E*$K%\%?%s2=$9$kJ}K!$O\e(B @xref{Customizing Articles} \e$B$r;2>H$7$F\e(B
 \e$B2<$5$$!#\e(B
 
+@c TRANSLATEME
+@node Article Button Levels
+@subsection Article button levels
+@cindex button levels
+The higher the value of the variables @code{gnus-button-@var{*}-level},
+the more buttons will appear.  If the level is zero, no corresponding
+buttons are displayed.  With the default value (which is 5) you should
+already see quite a lot of buttons.  With higher levels, you will see
+more buttons, but you may also get more false positives.  To avoid them,
+you can set the variables @code{gnus-button-@var{*}-level} local to
+specific groups (@pxref{Group Parameters}).  Here's an example for the
+variable @code{gnus-parameters}:
+
+@lisp
+;; increase `gnus-button-*-level' in some groups:
+(setq gnus-parameters
+      '(("\\<\\(emacs\\|gnus\\)\\>" (gnus-button-emacs-level 10))
+        ("\\<unix\\>"               (gnus-button-man-level 10))
+        ("\\<tex\\>"                (gnus-button-tex-level 10))))
+@end lisp
+
+@table @code
+
+@item gnus-button-browse-level
+@vindex gnus-button-browse-level
+Controls the display of references to message IDs, mail addresses and
+news URLs.  Related variables and functions include
+@code{gnus-button-url-regexp}, @code{browse-url}, and
+@code{browse-url-browser-function}.
+
+@item gnus-button-emacs-level
+@vindex gnus-button-emacs-level
+Controls the display of Emacs or Gnus references.  Related functions are
+@code{gnus-button-handle-custom},
+@code{gnus-button-handle-describe-function},
+@code{gnus-button-handle-describe-variable},
+@code{gnus-button-handle-symbol},
+@code{gnus-button-handle-describe-key},
+@code{gnus-button-handle-apropos},
+@code{gnus-button-handle-apropos-command},
+@code{gnus-button-handle-apropos-variable},
+@code{gnus-button-handle-apropos-documentation}, and
+@code{gnus-button-handle-library}.
+
+@item gnus-button-man-level
+@vindex gnus-button-man-level
+Controls the display of references to (Unix) man pages.
+See @code{gnus-button-man-handler}.
+
+@item gnus-button-message-level
+@vindex gnus-button-message-level
+Controls the display of message IDs, mail addresses and news URLs.
+Related variables and functions include
+@code{gnus-button-mid-or-mail-regexp},
+@code{gnus-button-prefer-mid-or-mail},
+@code{gnus-button-mid-or-mail-heuristic}, and
+@code{gnus-button-mid-or-mail-heuristic-alist}.
+
+@item gnus-button-tex-level
+@vindex gnus-button-tex-level
+Controls the display of references to TeX or LaTeX stuff, e.g. for CTAN
+URLs.  See the variables @code{gnus-ctan-url},
+@code{gnus-button-ctan-handler} and
+@code{gnus-button-handle-ctan-bogus-regexp}.
+
+@end table
+
 @node Article Date
 @subsection \e$B5-;v$NF|IU\e(B
 
@@ -10388,6 +10519,15 @@ GNUS \e$B$d\e(B Gnus \e$B$G$O!"$3$N$?$A$N0-$$LdBj$G6C$+$5$l$J$$$h$&$K$9$k$K$O!"35N,
 @vindex gnus-page-delimiter
 \e$B$3$l$,>e$G?($l$?6h@Z$jJ8;z$G$9!#%G%#%U%)%k%H$G$O\e(B @samp{^L} (\e$B%U%)!<%`\e(B
 \e$B%U%#!<%I!"2~JG\e(B) \e$B$G$9!#\e(B
+
+@cindex IDNA
+@cindex \e$B9q:]2=%I%a%$%sL>\e(B
+@vindex gnus-use-idna
+@item gnus-use-idna
+\e$B$3$NJQ?t$O\e(B @sc{From:}\e$B!"\e(B@sc{To:} \e$B$*$h$S\e(B @sc{Cc:} \e$B%X%C%@!<$K$"$k9q:]2=%I%a\e(B
+\e$B%$%sL>$r!"\e(Bgnus \e$B$,\e(B IDNA \e$B%G%3!<%I$9$k$+$I$&$+$r@)8f$7$^$9!#$3$l$K$O\e(B GNU
+Libidn (@url{http://www.gnu.org/software/libidn/}) \e$B$,I,MW$G!"$3$NJQ?t$O\e(B
+\e$B$=$l$r%$%s%9%H!<%k$7$F$"$k>l9g$@$1M-8z$K$J$j$^$9!#\e(B
 @end table
 
 @node Composing Messages
@@ -10919,7 +11059,12 @@ from date id references chars lines xref extra \e$B$N3F%X%C%@!<$+$i@.$k%Y%/\e(B
 \e$B$J$$$+$i$G$9!=!=%0%k!<%W$NA4$F$N5-;v$O1J5W$KL$FI$G$9!#\e(B
 
 \e$B$b$7%0%k!<%W$,B8:_$7$J$$$J$i!"$=$l$O:n@.$5$l!"9XFI$5$l$^$9!#%0%k!<%W%P%C\e(B
-\e$B%U%!$+$i$=$l$r>C$75n$kM#0l$NJ}K!$O!"$=$l$rL$9XFI$K$9$k$3$H$G$9!#\e(B
+\e$B%U%!$+$i$=$l$r>C$75n$kM#0l$NJ}K!$O!"$=$l$rL$9XFI$K$9$k$3$H$G$9!#2<=q$-%0\e(B
+\e$B%k!<%W$NFCJL$NFC@-$O%0%k!<%WFC@-\e(B (@pxref{Group Parameters}) \e$B$K$h$C$F@8$8!"\e(B
+\e$B$=$l$,<:$o$l$F$7$^$&$HB>$N%0%k!<%W$N$h$&$K?6$kIq$&$h$&$K$J$j$^$9!#$3$l$O\e(B
+\e$B0J2<$N%3%^%s%I$,;H$($J$$$3$H$r0UL#$7$^$9!#$=$N%0%k!<%W$NFCJL$NFC@-$rI|3h\e(B
+\e$B$5$;$k4JC1$JJ}K!$O!"\e(B@kbd{C-k} \e$B$G$=$N%0%k!<%W$r:o=|$7$F$+$i\e(B gnus \e$B$r:F5/F0\e(B
+\e$B$9$k$3$H$G$9!#$=$N%0%k!<%W$NFbMFJ*$O<:$o$l$^$;$s!#\e(B
 
 @c @findex gnus-dissociate-buffer-from-draft
 @c @kindex C-c M-d (Mail)
@@ -11784,15 +11929,29 @@ LIST \e$B%3%^%s%I$N%*%W%7%g%s$K;H$C$F!"\e(B(\e$B%5!<%P!<$N\e(B) \e$B%j%9%H=PNO$r@_Dj$
 @item nntp-open-network-stream
 \e$B$3$l$O%G%#%U%)%k%H$G!"C1=c$K1s3V%7%9%F%`$N%]!<%H$J$I$K@\B3$7$^$9!#\e(B
 
+@findex nntp-open-tls-stream
+@item nntp-open-tls-stream
+@dfn{\e$B0BA4$J\e(B} \e$B%A%c%s%M%k$r;H$C$F%5!<%P!<$K@\B3$7$^$9!#$3$l$r;H$&$?$a$K$O!"\e(B
+GNUTLS (@uref{http://www.gnu.org/software/gnutls/} \e$B;2>H\e(B) \e$B$r%$%s%9%H!<%k\e(B
+\e$B$7$F$*$+$J$1$l$P$J$j$^$;$s!#$=$l$+$i%5!<%P!<$r<!$N$h$&$KDj5A$7$^$9\e(B:
+
+@lisp
+;; \e$B%]!<%H\e(B 563 \e$B$,\e(B "nntps" \e$B$H$7$F\e(B /etc/services \e$B$GDj5A:Q$_$G$"$C$F$b\e(B
+;; gnutls-cli -p \e$B$G$=$NL>A0$O;H$($^$;$s!#\e(B
+;;
+(nntp "snews.bar.com"
+      (nntp-open-connection-function nntp-open-tls-stream)
+      (nntp-port-number )
+      (nntp-address "snews.bar.com"))
+@end lisp
+
 @findex nntp-open-ssl-stream
 @item nntp-open-ssl-stream
 @dfn{\e$B0BA4$J\e(B} \e$B%A%c%s%M%k$r;H$C$F%5!<%P!<$K@\B3$7$^$9!#$3$l$r;H$&$?$a$K$O!"\e(B
-OpenSSL (@uref{http://www.openssl.org}) \e$B$+\e(B SSLeay \e$B$,%$%s%9%H!<%k$5$l$F$$\e(B
+OpenSSL (@uref{http://www.openssl.org}) \e$B$+\e(B SSLeay \e$B$r%$%s%9%H!<%k$7$F$*$+\e(B
 \e$B$J$1$l$P$J$j$^$;$s!#$=$l$+$i%5!<%P!<$r<!$N$h$&$KDj5A$7$^$9\e(B:
 
 @lisp
-;; \e$BJT=8$7=*$o$C$?$i\e(B `C-c C-c' \e$B$r%?%$%W$7$F2<$5$$!#\e(B
-;;
 ;; \e$B%]!<%H\e(B 563 \e$B$,\e(B "snews" \e$B$H$7$F\e(B /etc/services \e$B$GDj5A:Q$_$G$"$C$F$b\e(B
 ;; openssl s_client -port \e$B$G$=$NL>A0$O;H$($^$;$s!#\e(B
 ;;
@@ -11914,9 +12073,10 @@ Emacs \e$B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N\e(B
 @item nntp-pre-command
 @vindex nntp-pre-command
 \e$BAG$N@\B3MQ$N4X\e(B
-\e$B?t\e(B (@code{nntp-open-network-stream} \e$B$H\e(B @code{nntp-open-ssl-stream} \e$B$@$1\e(B
-\e$B$@$H;W$&\e(B) \e$B$G$O$J$$$b$N$rDL$7$F@\B3$9$k$H$-$K;H$&%3%^%s%I%i%C%Q!<$G$9!#Nc\e(B
-\e$B$($P$"$J$?$O\e(B @samp{SOCKS} \e$B%i%C%Q!<$r3d$jEv$F$k$G$7$g$&!#\e(B
+\e$B?t\e(B (@code{nntp-open-network-stream}\e$B!"\e(B@code{nntp-open-tls-stream} \e$B$*$h\e(B
+\e$B$S\e(B @code{nntp-open-ssl-stream} \e$B$@$1$@$H;W$&\e(B) \e$B$G$O$J$$$b$N$rDL$7$F@\B3$9\e(B
+\e$B$k$H$-$K;H$&%3%^%s%I%i%C%Q!<$G$9!#Nc$($P$"$J$?$O\e(B @samp{SOCKS} \e$B%i%C%Q!<$r\e(B
+\e$B3d$jEv$F$k$G$7$g$&!#\e(B
 
 @item nntp-address
 @vindex nntp-address
@@ -11925,9 +12085,10 @@ Emacs \e$B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N\e(B
 @item nntp-port-number
 @vindex nntp-port-number
 \e$B@\B3$9$k\e(B @sc{nntp} \e$B%5!<%P!<$N%]!<%HHV9f$G$9!#%G%#%U%)%k%H\e(B
-\e$B$O\e(B @samp{nntp} \e$B$G$9!#\e(B@sc{ssl} \e$B$r2p$7$?\e(B @sc{nntp} \e$B$r;H$&$K$O!"%]!<%H$NL>\e(B
-\e$BA0$G$O$J$/$F@0?t\e(B (\e$B$D$^$j\e(B @samp{snews} \e$B$G$O$J$/$F\e(B @samp{563}) \e$B$r;XDj$7$F\e(B
-\e$B2<$5$$!#30It$N\e(B SSL \e$B%D!<%k$O%]!<%H$NL>A0$G$OF0:n$7$J$$$+$i$G$9!#\e(B
+\e$B$O\e(B @samp{nntp} \e$B$G$9!#\e(B@sc{tls}/@sc{ssl} \e$B$r2p$7$?\e(B @sc{nntp} \e$B$r;H$&$K$O!"%]!<\e(B
+\e$B%H$NL>A0$G$O$J$/$F@0?t\e(B (\e$B$D$^$j\e(B @samp{snews} \e$B$d\e(B @samp{nntps} \e$B$G$O$J$/\e(B
+\e$B$F\e(B @samp{563}) \e$B$r;XDj$7$F2<$5$$!#30It$N\e(B TLS/SSL \e$B%D!<%k$O%]!<%H$NL>A0$G$O\e(B
+\e$BF0:n$7$J$$$+$i$G$9!#\e(B
 
 @item nntp-end-of-line
 @vindex nntp-end-of-line
@@ -12544,8 +12705,8 @@ Maildir \e$B%a!<%k%=!<%9$NNc$r$U$?$D\e(B:
 \e$B$?\e(B @sc{imap} \e$B%a!<%k%\%C%/%9$+$i5-;v$r<hF@$7$^$9!#>\$7$/$O\e(B @xref{IMAP} \e$B$r\e(B
 \e$B;2>H$7$F2<$5$$!#\e(B
 
-Kerberos, GSSAPI, SSL/TLS \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30It%W%m%0%i%`$H%i%$%V\e(B
-\e$B%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#\e(B@xref{IMAP}
+Kerberos, GSSAPI, TLS/SSL \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30It%W%m%0%i%`$H%i%$%V\e(B
+\e$B%i%j$,I,MW$G$"$k$3$H$KN10U$7$F2<$5$$!#\e(B@xref{IMAP}\e$B!#\e(B
 
 \e$B%-!<%o!<%I\e(B:
 
@@ -12554,7 +12715,7 @@ Kerberos, GSSAPI, SSL/TLS \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30It%W%m%0%i%`$H%i%$%
 @sc{imap} \e$B%5!<%P!<$NL>A0!#=i4|CM$O4D6-JQ?t\e(B @code{MAILHOST} \e$B$+$iF@$^$9!#\e(B
 
 @item :port
-@sc{imap} \e$B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O\e(B @samp{143} \e$B$G!"\e(BSSL/TLS \e$B@\\e(B
+@sc{imap} \e$B%5!<%P!<$N%]!<%HHV9f!#IaDL$O=i4|CM$O\e(B @samp{143} \e$B$G!"\e(BTLS/SSL \e$B@\\e(B
 \e$BB3$K$O\e(B @samp{993} \e$B$G$9!#\e(B
 
 @item :user
@@ -12567,8 +12728,8 @@ Kerberos, GSSAPI, SSL/TLS \e$B$*$h$S\e(B STARTTLS \e$B$N$?$a$N30It%W%m%0%i%`$H%i%$%
 @item :stream
 \e$B%5!<%P!<$K@\B3$9$k$H$-$K;H$&%9%H%j!<%`!#\e(B@code{imap-stream-alist} \e$B$K$"$k\e(B
 \e$B%7%s%\%k$NCf$N$R$H$D$r@_Dj$7$^$9!#8=>u$G$O\e(B @samp{gssapi},
-@samp{kerberos4}, @samp{starttls}, @samp{ssl}, @samp{shell} \e$B$^$?$O=i4|CM\e(B
-\e$B$N\e(B @samp{network} \e$B$K$J$j$^$9!#\e(B
+@samp{kerberos4}, @samp{starttls}, @samp{tls}, @samp{ssl},
+@samp{shell} \e$B$^$?$O=i4|CM$N\e(B @samp{network} \e$B$K$J$j$^$9!#\e(B
 
 @item :authentication
 \e$B%5!<%P!<$G$NG'>Z$K$I$NG'>ZK!$r;H$&$+!#$3$l\e(B
@@ -13987,6 +14148,9 @@ nnmaildir \e$B$O$$$/$D$+$N%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#$3$l$i$N$9$Y$F$rL5;k\e(B
 \e$B%/%H%k<0$r;H$&$H!":G=i$NMWAG$,0l2s!"$=$l$>$l$N5-;v$K$D$$$FI>2A$5$l$^$9!#\e(B
 \e$B$7$?$,$C$F!"5-;v$r$I$3$KCV$/$+$r7h$a$k$?$a$K!"$=$N<0\e(B
 \e$B$O\e(B @code{nnmaildir-article-file-name} \e$B$J$I$K>H2q$9$k$3$H$,$G$-$^$9!#\e(B
+@emph{\e$B$3$N%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"\e(B
+nnmaildir \e$B$O\e(B @code{expiry-target} \e$B%0%k!<%W%Q%i%a!<%?\e(B
+\e$B$d\e(B @code{nnmail-expiry-target} \e$BJQ?t$r8\$_$^$;$s!#\e(B}
 
 @item read-only
 \e$B$3$l$,\e(B @code{t} \e$B$K@_Dj$5$l$F$$$k$H!"\e(Bnnmaildir \e$B$O$=$N5-;v$r$3$N%0%k!<%W$G\e(B
@@ -14296,6 +14460,9 @@ Rand MH \e$B%a!<%k1\Mw%7%9%F%`$O\e(B UNIX \e$B%7%9%F%`$K$+$J$jD9$$4VB8:_$7$F$$$^$9!
 
 @item nnmaildir
 
+\e$B4|8B@Z$l>C5n$dB>$N$3$H$,$i$r@_Dj$9$k$N$K!"\e(B@code{nnmaildir} \e$B$OB>$N%a!<%k\e(B
+\e$B%P%C%/%(%s%I$H$O>/!90[$J$C$?!"8_49@-$NL5$$%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#\e(B
+
 @code{nnmaildir} \e$B$OBgJ}\e(B @code{nnml} \e$B$H;w$?$b$N$G$9$,!"$$$/$i$+82Cx$J0c$$\e(B
 \e$B$,$"$j$^$9!#$=$l$>$l$N%a%C%;!<%8$OJL!9$N%U%!%$%k$K3JG<$5$l$^$9$,!"%U%!%$\e(B
 \e$B%kL>$O\e(B gnus \e$B$N5-;vHV9f$H4X78$,$"$j$^$;$s!#$^\e(B
@@ -14325,9 +14492,6 @@ 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
 \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$B4|8B@Z$l>C5n$dB>$N$b$N$r@_Dj$9$k$?$a$K\e(B @code{nnmaildir} \e$B$O%0%k!<%W%Q%i%a!<\e(B
-\e$B%?$r;H$$$^$9$,!"B>$N%a!<%k%P%C%/%(%s%I$H$O>/$70c$$$^$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$b5-;v%U%!%$\e(B
 \e$B%k$r2r@O$7$FF@$k$b$N$4$H$r!"$=$l$O%a%b%j>e$KJ];}$7$^$9!#\e(B) \e$B$3$l$,$"$J$?$K\e(B
@@ -14336,8 +14500,8 @@ 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
 \e$B>/$J$$%a%b%j$r;H$&$h$&$K$9$k$3$H$,$G$-$^$9!#$3$N%-%c%C%7%e5!9=$O!"$*$=$i\e(B
 \e$B$/>-Mh$O:o=|$5$l$k$G$7$g$&!#\e(B
 
-\e$B5/F0$OB>$N%P%C%/%(%s%I$h$j$b\e(B @code{nnmaildir} \e$B$,CY$$$G$7$g$&!#$=$N4V$K$"\e(B
-\e$B$k$9$Y$F$N%U%!%$%k%7%9%F%`$K0MB8$7$F$$$kItJ,$OB.$$$G$7$g$&!#\e(B
+\e$B5/F0$OB>$N%P%C%/%(%s%I$h$j$b\e(B @code{nnmaildir} \e$B$,CY$$$G$7$g$&!#%U%!%$%k%7\e(B
+\e$B%9%F%`$K0MB8$7$F$$$kItJ,0J30$N$9$Y$F$OB.$$$G$7$g$&!#\e(B
 
 @code{nnmaildir} \e$B$O\e(B @code{nnoo} \e$B$r;H$o$J$$$N$G!"\e(B@code{nnmaildir} \e$B$+$iGI\e(B
 \e$B@8$7$?%P%C%/%(%s%I$r=q$/$N$K\e(B @code{nnoo} \e$B$O;H$($^$;$s!#\e(B
@@ -15011,7 +15175,7 @@ Gnus \e$B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K\e(B url \e$B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<
 \e$B$J$j$^$9!#$3$l$,$3$3$G@bL@$9$k;H$$J}$G$9!#\e(B
 
 \e$B$$$/$D$+$N\e(B @sc{imap} \e$B%5!<%P!<$r\e(B @file{~/.gnus} \e$B$G@_Dj$9$k$H!"$?$V$s0J2<\e(B
-\e$B$N$h$&$J$b$N$K$J$k$G$7$g$&!#\e(B(\e$BCm\e(B: SSL/TLS \e$B$G$O30It%W%m%0%i%`$H%i%$%V%i%j\e(B
+\e$B$N$h$&$J$b$N$K$J$k$G$7$g$&!#\e(B(\e$BCm\e(B: TLS/SSL \e$B$G$O30It%W%m%0%i%`$H%i%$%V%i%j\e(B
 \e$B$,I,MW$G$9!#0J2<$r;2>H$7$F2<$5$$!#\e(B)
 
 @lisp
@@ -15055,8 +15219,8 @@ Gnus \e$B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K\e(B url \e$B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<
 
 @item nnimap-server-port
 @vindex nnimap-server-port
-\e$B@\B3$r;n$_$k%5!<%P!<$N%]!<%H$G$9!#=i4|CM$G$O!"%]!<%H\e(B 143 \e$B$+!"\e(BSSL \e$B$G\e(B
-\e$B$O\e(B 993 \e$B$G$9!#\e(B
+\e$B@\B3$r;n$_$k%5!<%P!<$N%]!<%H$G$9!#%G%#%U%)%k%H$O%]!<%H\e(B 143\e$B!"$^$?\e(B
+\e$B$O\e(B TLS/SSL \e$B$G$O\e(B 993 \e$B$G$9!#\e(B
 
 \e$B$3$l$O@0?t$G$J$1$l$P$J$j$^$;$s!#0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
 
@@ -15088,8 +15252,8 @@ Gnus \e$B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K\e(B url \e$B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<
 @item nnimap-stream
 @vindex nnimap-stream
 \e$B%5!<%P!<$K@\B3$9$k$H$-$K;H$o$l$k%9%H%j!<%`$N7?$G$9!#=i4|@_Dj$G\e(B
-\e$B$O\e(B nnimap \e$B$O\e(B SSL/TLS \e$B$r=|$/0J2<$N$9$Y$F$r<+F0E*$K8!CN$7$F$=$l$r;H$$$^$9!#\e(B
-(SSL/TLS \e$B$r;H$&\e(B @sc{imap} \e$B$O\e(B STARTTLS \e$B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F0\e(B
+\e$B$O\e(B nnimap \e$B$O\e(B TLS/SSL \e$B$r=|$/0J2<$N$9$Y$F$r<+F0E*$K8!CN$7$F$=$l$r;H$$$^$9!#\e(B
+(TLS/SSL \e$B$r;H$&\e(B @sc{imap} \e$B$O\e(B STARTTLS \e$B$GCV$-49$($i$l$F$$$^$9!#$3$l$O<+F0\e(B
 \e$B8!=P$G$-$^$9$,!"$^$@9-HO0O$KG[Hw$5$l$F$$$^$;$s!#\e(B)
 
 \e$B0J2<$O%5!<%P!<;XDj$NNc$G$9!#\e(B
@@ -15104,15 +15268,18 @@ Gnus \e$B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K\e(B url \e$B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<
 
 @itemize @bullet
 @item
-@dfn{gssapi:} GSSAPI (\e$BIaDL$O\e(B Kerberos 5) \e$B$r;H$$$^$9!#\e(B@samp{imtest} \e$B%W%m\e(B
-\e$B%0%i%`$,I,MW$G$9!#\e(B
+@dfn{gssapi:} GSSAPI (\e$BIaDL$O\e(B Kerberos 5) \e$B$r;H$$$^$9!#\e(B@samp{gsasl} \e$B$^$?\e(B
+\e$B$O\e(B @samp{imtest} \e$B%W%m%0%i%`$,I,MW$G$9!#\e(B
 @item
 @dfn{kerberos4:} Kerberos 4 \e$B$r;H$$$^$9!#\e(B@samp{imtest} \e$B%W%m%0%i%`$,I,MW$G\e(B
 \e$B$9!#\e(B
 @item
-@dfn{starttls:} STARTTLS (SSL \e$B$KN`;w\e(B) \e$B$r;H$$$^$9!#30It%i%$%V%i\e(B
+@dfn{starttls:} STARTTLS (TLS/SSL \e$B$KN`;w\e(B) \e$B$r;H$$$^$9!#30It%i%$%V%i\e(B
 \e$B%j\e(B @samp{starttls.el} \e$B$H\e(B @samp{starttls} \e$B%W%m%0%i%`$,I,MW$G$9!#\e(B
 @item
+@dfn{tls:} TLS \e$B$r;H$$$^$9!#\e(BGNUTLS (@samp{gnutls-cli} \e$B%W%m%0%i%`\e(B) \e$B$,I,MW\e(B
+\e$B$G$9!#\e(B
+@item
 @dfn{ssl:} SSL \e$B$r;H$$$^$9!#\e(BOpenSSL (@samp{openssl} \e$B%W%m%0%i%`\e(B) \e$B$+\e(B SSLeay
 (@samp{s_client}) \e$B$,I,MW$G$9!#\e(B
 @item
@@ -15133,6 +15300,18 @@ Gnus \e$B$O%&%'%V%Z!<%8$r<hF@$9$k$?$a$K\e(B url \e$B%i%$%V%i%j$r!"%&%'%V%Z!<%8$rI=<
 \e$B?t\e(B @code{imap-kerberos4-program} \e$B$O\e(B imtest \e$B%W%m%0%i%`$KEO$9%Q%?%a!<%?$r\e(B
 \e$B4^$_$^$9!#\e(B
 
+TLS \e$B@\B3$G$O\e(B GNUTLS \e$BM3Mh$N\e(B @code{gnutls-cli} \e$B%W%m%0%i%`$,I,MW$G$9!#$3$l\e(B
+\e$B$O\e(B @uref{http://www.gnu.org/software/gnutls/} \e$B$+$i<j$KF~$l$k$3$H$,$G$-$^\e(B
+\e$B$9!#\e(B
+
+@vindex imap-gssapi-program
+\e$B$3$N%Q%i%a!<%?$O!"I{%7%'%k$G\e(B GSSAPI \e$BG'>Z$K$h$k\e(B IMAP \e$B@\B3$r5/F0$9$k$?$a$N\e(B
+\e$B%3%^%s%I9T$N%j%9%H$r;XDj$7$^$9!#$3$l$i$O@\B3$,3NN)$9$k$^$G!"$^$?$O%j%9%H\e(B
+\e$B$,;H$$?T$/$5$l$k$^$G!"=g$0$j$K;n$5$l$^$9!#%G%#%U%)%k%H$G$O!"\e(B
+@uref{http://www.gnu.org/software/gsasl/} \e$B$K$"$k\e(B GNU SASL \e$B$K$h\e(B
+\e$B$k\e(B @samp{gsasl} \e$B$H!"\e(BCyrus IMAPD \e$B$K$h$k\e(B @samp{imtest} \e$B%W%m%0%i\e(B
+\e$B%`\e(B (@code{imap-kerberos4-program} \e$B;2>H\e(B) \e$B$,;n$5$l$^$9!#\e(B
+
 @vindex imap-ssl-program
 SSL \e$B@\B3$N$?$a$N\e(B OpenSSL \e$B%W%m%0%i%`$O\e(B @uref{http://www.openssl.org/} \e$B$+\e(B
 \e$B$iF~<j$G$-$^$9!#\e(BOpenSSL \e$B$O0JA0$O\e(B SSLeay \e$B$H$7$FCN$i$l$F$$$?$b$N$G!"\e(B
@@ -15165,7 +15344,7 @@ nnimap \e$B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"\e(BSSLeay \e$B$N:G?7HG$G$"$k\e(B 0.9.x \e
 @itemize @bullet
 @item
 @dfn{gssapi:} GSSAPI (\e$BIaDL$O\e(B Kerberos 5) \e$BG'>Z$G$9!#30It%W%m%0%i\e(B
-\e$B%`\e(B @code{imtest} \e$B$,I,MW$G$9!#\e(B
+\e$B%`\e(B @code{gsasl} \e$B$^$?$O\e(B @code{imtest} \e$B$,I,MW$G$9!#\e(B
 @item
 @dfn{kerberos4:} Kerberos 4 \e$B$K$h$kG'>Z$G$9!#30It%W%m%0%i\e(B
 \e$B%`\e(B @code{imtest} \e$B$,I,MW$G$9!#\e(B
@@ -16612,18 +16791,18 @@ PPP \e$B4X78\e(B(\e$B$J$I\e(B)\e$B$rJD$8$^$9!#$=$&$7$F%K%e!<%9$r%*%U%i%$%s$GFI$`$3$H$
 \e$B$9!#\e(B
 
 @item
-@c TRANSLATEME
-\e$B%@%&%s%m!<%IJ}?K$r7hDj$7$^$9!#\e(BIt's fairly simple once you decide whether
-you are going to use agent categories, topic parameters, and/or group
-parameters to implement your policy.  If you're new to gnus, it
-is probably best to start with a category @xref{Agent Categories}.
+\e$B%@%&%s%m!<%IJ}?K$r7hDj$7$^$9!#$"$J$?$NJ}?K$r<BAu$9$k$?$a$K%(!<%8%'%s%HJ,\e(B
+\e$BN`!"%H%T%C%/%Q%i%a!<%?!"%0%k!<%W%Q%i%a!<%?$N$I$l$r;H$&$+$r$$$C$?$s7h$a$F\e(B
+\e$B$7$^$($P!"$3$l$O$+$J$j4JC1$G$9!#$"$J$?$,\e(B gnus \e$B$N=i?4<T$J$i$P!"$?$V$sJ,N`\e(B
+\e$B$G;O$a$k$N$,:GNI$G$7$g$&\e(B @xref{Agent Categories}\e$B!#\e(B
 
-Both topic parameters (@xref{Topic Parameters}) and agent 
-categories (@xref{Agent Categories}) provide for setting a policy that 
-applies to multiple groups.  Which you use is entirely up to you.  Topic
-parameters do override categories so, if you mix the two, you'll have to
-take that into account.  If you have a few groups that deviate from your
-policy, you can use @xref{Group Parameters} to configure them.
+\e$B%H%T%C%/%Q%i%a!<%?\e(B (@pxref{Topic Parameters}) \e$B$H%(!<%8%'%s%HJ,\e(B
+\e$BN`\e(B (@pxref{Agent Categories}) \e$B$NN>J}$O!"B??t$N%0%k!<%W$KE,MQ$9$kJ}?K$N@_\e(B
+\e$BDj$rMQ0U$7$F$$$^$9!#$I$l$r;H$&$+$O40A4$K$"$J$?$N@UG$$G$9!#N>J}$r:.$<$F;H\e(B
+\e$B$&>l9g$O!"%H%T%C%/%Q%i%a!<%?$OJ,N`$rL58z$K$9$k$3$H$r9MN8$KF~$l$J$1$l$P$J\e(B
+\e$B$i$J$$$G$7$g$&!#$"$J$?$NJ}?K$K$=$0$o$J$$>/?t$N%0%k!<%W$,$"$k$N$J$i$P!"$=\e(B
+\e$B$l$i$N@_Dj$rJQ99$9$k$?$a$K%0%k!<%W%Q%i%a!<\e(B
+\e$B%?\e(B (@pxref{Group Parameters}) \e$B$r;H$&$3$H$,$G$-$^$9!#\e(B
 
 @item
 \e$B$($($H\e(B@dots{}\e$B!"0J>e$G$9!#\e(B
@@ -16645,21 +16824,19 @@ policy, you can use @xref{Group Parameters} to configure them.
 \e$B$O\e(B @code{\e$B=i4|\e(B} \e$BJ,N`$KB0$7$^$9!#\e(BGnus \e$B$OJ,N`$N:n@.$H4IM}$N$?$a$NFH<+$N%P%C\e(B
 \e$B%U%!!<$r;}$C$F$$$^$9!#\e(B
 
-@c TRANSLATEME
-If you prefer, you can also use group parameters (@pxref{Group
-Parameters}) and topic parameters (@pxref{Topic Parameters}) for an
-alternative approach to controlling the agent.  The only real
-difference is that categories are specific to the agent (so there is
-less to learn) while group and topic parameters include the kitchen
-sink.
-
-Since you can set agent parameters in several different places we have
-a rule to decide which source to believe.  This rule specifies that
-the parameter sources are checked in the following order: group
-parameters, topic parameters, agent category, and finally customizable
-variables. So you can mix all of these sources to produce a wide range
-of behavior, just don't blame me if you don't remember where you put
-your settings.
+\e$B$b$7$=$&$7$?$1$l$P!"%0%k!<%W%Q%i%a!<%?\e(B (@pxref{Group Parameters}) \e$B$H%H%T%C\e(B
+\e$B%/%Q%i%a!<%?\e(B (@pxref{Topic Parameters}) \e$B$r!"%(!<%8%'%s%H$r@)8f$9$kBeBX<j\e(B
+\e$BCJ$K;H$&$3$H$,$G$-$^$9!#<B:]$K0c$&$N$O!"%0%k!<%W$H%H%T%C%/%Q%i%a!<%?$,2?\e(B
+\e$B$G$b$+$s$G$b\e(B (kitchen sink) \e$B4^$`$N$KBP$7$F!"J,N`$O%(!<%8%'%s%H$KFC2=$7$F\e(B
+\e$B$$$k\e(B (\e$B$7$?$,$C$F$"$^$j3X$P$J$/$F$bNI$$\e(B) \e$B$H$$$&$3$H$@$1$G$9!#\e(B
+
+\e$B%(!<%8%'%s%H%Q%i%a!<%?$OJ#?t$N0c$&>l=j$G@_Dj$9$k$3$H$,$G$-$k$N$G!"$I$N%=!<\e(B
+\e$B%9$,?.MQ$G$-$k$+$r7h$a$k$?$a$N5,B'$r@_$1$^$7$?!#$3$N5,B'$O!"%Q%i%a!<%?$N\e(B
+\e$B%=!<%9$,<!$N=g=x$GD4$Y$i$l$k$3$H$rDj$a$^$9\e(B: \e$B%0%k!<%W%Q%i%a!<%?!"%H%T%C%/\e(B
+\e$B%Q%i%a!<%?!"%(!<%8%'%s%HJ,N`!"$=$7$F:G8e$O%+%9%?%^%$%:$G$-$kJQ?t72$G$9!#\e(B
+\e$B$7$?$,$C$F!"9-$$HO0O$GF0:n$r5/$3$5$;$k$?$a$K$3$l$i$N%=!<%9$r$9$Y$F:.9g$9\e(B
+\e$B$k$3$H$,$G$-$^$9!#$I$3$K@_Dj$rCV$$$?$N$+$rK:$l$F$7$^$C$?$+$i$H$$$C$F!";d\e(B
+\e$B$r@U$a$J$$$G2<$5$$$h!#\e(B
 
 @menu
 * Category Syntax::             \e$BJ,N`$H$O$I$s$J$b$N$+\e(B
@@ -16670,12 +16847,9 @@ your settings.
 @node Category Syntax
 @subsubsection \e$BJ,N`$NJ8K!\e(B
 
-@c TRANSLATEME
-\e$BJ,N`$O\e(B ** \e$B$N$b$N$+$i$J$j$^$9!#\e(B
-A category consists of a name, the list of groups belonging to the
-category, and a number of optional parameters that override the
-customizable variables.  The complete list of agent parameters are
-listed below.
+\e$BJ,N`$O!"L>A0!"$=$NJ,N`$KB0$9$k%0%k!<%W$N%j%9%H!"$*$h$S%+%9%?%^%$%:2DG=$J\e(B
+\e$BJQ?t$r>e=q$-$9$kB?$/$NG$0U$J%Q%i%a!<%?$+$i@.$j$^$9!#%(!<%8%'%s%H%Q%i%a!<\e(B
+\e$B%?$N40A4$J%j%9%H$r0J2<$K<($7$^$9!#\e(B
 
 @table @code
 @item gnus-agent-cat-name
@@ -16693,38 +16867,34 @@ The list of groups that are in this category.
 \e$B5,B'!#\e(B(\e$B$3$N%@%&%s%m!<%I%9%3%"\e(B (@dfn{download score}) \e$B$ODL>o$N%9%3%"$H$O\e(B
 \e$BI,$:$7$b4X78$,L5$$$3$H$KCm0U$7$F$/$@$5$$!#\e(B)
 
-@c TRANSLATEME
 @item gnus-agent-cat-enable-expiration
-a boolean indicating whether the agent should expire old articles in
-this group.  Most groups should be expired to conserve disk space.  In
-fact, its probably safe to say that the gnus.* hierarchy contains the
-only groups that should not be expired.
+\e$B$3$N%0%k!<%W$N8E$$5-;v$r%(!<%8%'%s%H$,4|8B@Z$l>C5n$9$Y$-$+$I$&$+$r<($9\e(B
+\e$B%V!<%kJQ?t!#BgDq$N%0%k!<%W$O%G%#%9%/6u4V$rO2Hq$7$J$$$?$a$K4|8B@Z$l>C5n$5\e(B
+\e$B$l$k$Y$-$G$9!#$$$d!"<B:]$K$O\e(B gnus.* \e$B3,AX$O4|8B@Z$l>C5n$5$l$k$Y$-$G$O$J\e(B
+\e$B$$%0%k!<%W$@$1$r4^$s$G$$$k$H8@$C$F$b!"$?$V$s:9$7;Y$($"$j$^$;$s!#\e(B
 
 @item gnus-agent-cat-days-until-old
-an integer indicating the number of days that the agent should wait
-before deciding that a read article is safe to expire.
+\e$B4{FI$N5-;v$r4|8B@Z$l>C5n$7$F$b:9$7;Y$($J$$$3$H$rH=CG$9$kA0$K!"%(!<%8%'%s\e(B
+\e$B%H$,BT$C$F$$$k$Y$-F|?t$r<($9@0?t!#\e(B
 
 @item gnus-agent-cat-low-score
-an integer that overrides the value of @code{gnus-agent-low-score}.
+@code{gnus-agent-low-score} \e$B$r>e=q$-$9$k@0?t!#\e(B
 
 @item gnus-agent-cat-high-score
-an integer that overrides the value of @code{gnus-agent-high-score}.
+@code{gnus-agent-high-score} \e$B$r>e=q$-$9$k@0?t!#\e(B
 
 @item gnus-agent-cat-length-when-short
-an integer that overrides the value of
-@code{gnus-agent-short-article}.
+@code{gnus-agent-short-article} \e$B$r>e=q$-$9$k@0?t!#\e(B
 
 @item gnus-agent-cat-length-when-long
-an integer that overrides the value of @code{gnus-agent-long-article}.
+@code{gnus-agent-long-article} \e$B$r>e=q$-$9$k@0?t!#\e(B
 @end table
 
-The name of a category can not be changed once the category has been
-created.
+\e$B$$$C$?$sJ,N`$,:n$i$l$?$i!"J,N`$NL>A0$rJQ$($k$3$H$O$G$-$^$;$s!#\e(B
 
-Each category maintains a list of groups that are exclusive members of
-that category.  The exclusivity rule is automatically enforced, add a
-group to a new category and it is automatically removed from its old
-category.
+\e$B$=$l$>$l$NJ,N`$O!"$=$NJ,N`$N8B$i$l$?%a%s%P!<$G$"$k%0%k!<%W$N%j%9%H$r0];}\e(B
+\e$B$7$^$9!#8B$i$l$?5,B'$O<+F0E*$K<99T$5$l$^$9!#?7$7$$J,N`$K%0%k!<%W$rDI2C$9\e(B
+\e$B$k$H!"$=$l$O8E$$J,N`$+$i<+F0E*$K<h$j=|$+$l$^$9!#\e(B
 
 \e$B=R8l$N0lHVC1=c$J7A<0$O\e(B @code{true} \e$B$d\e(B @code{false} \e$B$N$h$&$JC1FH$N=R8l$+\e(B
 \e$B$i$J$j$^$9!#$3$l$i$NFs$D$O$=$l$>$l!"A4$F$N2DG=$J5-;v$r%@%&%s%m!<%I$9$k$+!"\e(B
@@ -16769,14 +16939,13 @@ short
 \e$B0J2<$N=R8l$O$"$i$+$8$aDj5A$5$l$F$$$^$9$,!"$3$l$i$N$I$l$b$"$J$?$N$d$j$?$$\e(B
 \e$B$3$H$K0lCW$7$J$1$l$P!"<+J,$GFH<+$N$b$N$r=q$/$3$H$b$G$-$^$9!#\e(B
 
-@c TRANSLATEME
-When evaluating each of these predicates, the named constant will be
-bound to the value determined by calling
-@code{gnus-agent-find-parameter} on the appropriate parameter.  For
-example, gnus-agent-short-article will be bound to
-@code{(gnus-agent-find-parameter group 'agent-short-article)}.  This
-means that you can specify a predicate in your category then tune that
-predicate to individual groups.
+\e$B$=$l$>$l$N$3$l$i$N=R8l$rI>2A$9$k$H$-!"L>A0$,IU$1$i$l$?Dj?t$O!"E,@Z$J%Q%i\e(B
+\e$B%a!<%?$N85$K\e(B @code{gnus-agent-find-parameter} \e$B$r8F$V$3$H$K$h$C$F7hDj$5$l\e(B
+\e$B$?CM$GB+G{$5$l$^$9!#Nc$(\e(B
+\e$B$P\e(B gnus-agent-short-article \e$B$O\e(B @code{(gnus-agent-find-parameter group
+'agent-short-article)} \e$B$KB+G{$5$l$^$9!#$3$l$O!"$"$J$?$,$"$J$?$NJ,N`$G=R\e(B
+\e$B8l$r;XDj$7$F$+$i!"$=$N=R8l$r8D!9$N%0%k!<%W$K$D$$$FD4@0$G$-$k$3$H$r0UL#$7\e(B
+\e$B$^$9!#\e(B
 
 @table @code
 @item short
@@ -16995,10 +17164,12 @@ file
 @findex gnus-category-exit
 \e$B%0%k!<%W%P%C%U%!!<$KLa$k\e(B (@code{gnus-category-exit})\e$B!#\e(B
 
-@c TRANSLATEME
 @item e
-@kindex e (Category)
+@kindex e (\e$BJ,N`\e(B)
 @findex gnus-category-customize-category
+\e$BA*Br$5$l$?J,N`$N%Q%i%a!<%?$r0l3g$7$F@_Dj$9$k$?$a$K!"%+%9%?%^%$%:%P%C%U%!\e(B
+\e$B$r;H$$$^$9\e(B (@code{gnus-category-customize-category})\e$B!#\e(B
+
 Use a customization buffer to set all of the selected category's
 parameters at one time (@code{gnus-category-customize-category}).
 
@@ -17080,25 +17251,21 @@ parameters at one time (@code{gnus-category-customize-category}).
 @vindex gnus-agent-high-score
 \e$B$3$NCM$h$jBg$-$$%9%3%"$r;}$D5-;v$O9b%9%3%"$G$"$k!#=i4|@_DjCM$O\e(B 0\e$B!#\e(B
 
-@c TRANSLATEME
 @item gnus-agent-expire-days
 @vindex gnus-agent-expire-days
-The number of days that a @samp{read} article must stay in the agent's
-local disk before becoming eligible for expiration (While the name is
-the same, this doesn't mean expiring the article on the server.  It
-just means deleting the local copy of the article).  What is also
-important to understand is that the counter starts with the time the
-article was written to the local disk and not the time the article was
-read.
-Default 7.
+\e$B4|8B@Z$l>C5n$K$U$5$o$7$/$J$k$^$G4{FI5-;v$r%(!<%8%'%s%H$N%m!<%+%k%G%#%9%/\e(B
+\e$B$KN1$a$F$*$/F|?t\e(B (\e$B$G$bL>A0$,F1$8$@$C$?$i!"$3$l$O$=$N%5!<%P!<$K$*$1$k4|8B\e(B
+\e$B@Z$l>C5n$r0UL#$7$^$;$s!#$=$l$OC1$K5-;v$N%m!<%+%k$JJ#@=$r>C$9$3$H$r0UL#$7\e(B
+\e$B$^$9\e(B)\e$B!#$5$i$KM}2r$9$Y$-Bg;v$J$3$H$O!"5-;v$,FI$^$l$?;~$G$O$J$/%m!<%+%k%G%#\e(B
+\e$B%9%/$K5-;v$,=q$+$l$?;~$+$i7W?t$,;O$^$k$H$$$&$3$H$G$9!#%G%#%U%)%k%H$O\e(B 7\e$BF|!#\e(B
 
 @item gnus-agent-enable-expiration
 @vindex gnus-agent-enable-expiration
-Determines whether articles in a group are, by default, expired or
-retained indefinitely.  The default is @code{ENABLE} which means that
-you'll have to disable expiration when desired.  On the other hand,
-you could set this to @code{DISABLE}.  In that case, you would then
-have to enable expiration in selected groups.
+\e$B%0%k!<%W$N5-;v$,!"%G%#%U%)%k%H$G4|8B@Z$l>C5n$5$l$k$+!"L54|8B$KJ];}$5$l$k\e(B
+\e$B$+$r7hDj$7$^$9!#%G%#%U%)%k%H$O\e(B @code{ENABLE} \e$B$G!"K>$`$J$i$P4|8B@Z$l>C5n\e(B
+\e$B$r$5$;$J$$$h$&$K$7$J$1$l$P$J$i$J$$$3$H$r0UL#$7$^$9!#0lJ}!"$3$l\e(B
+\e$B$r\e(B @code{DISABLE} \e$B$K@_Dj$9$k$3$H$,$G$-$^$9!#$=$N>l9g!"A*Br$5$l$?%0%k!<%W\e(B
+\e$B$G$N4|8B@Z$l>C5n$rM-8z$K$7$J$1$l$P$J$j$^$;$s!#\e(B
 @end table
 
 @node Agent Commands
@@ -17238,12 +17405,12 @@ gnus \e$B$,\e(B @dfn{plugged} \e$B$G$"$k$H$-$K!"$9$G$K%(!<%8%'%s%H$K3JG<$5$l$F$$$k%
 \e$B$s$,!"$9$G$K%(!<%8%'%s%H$K%@%&%s%m!<%I$7$?5-;v$,$"$k$J$i$P!"\e(Bgnus \e$B$O%5!<\e(B
 \e$B%P!<$+$i:F$S5-;v$r%@%&%s%m!<%I$;$:$K!"<j85$K3JG<$5$l$?%3%T!<$r;H$$$^$9!#\e(B
 
-@c TRANSLATEME
-If you so desire, you can configure the agent (see @code{gnus-agent-cache}
-@pxref{Agent Variables}) to always download headers and articles while
-plugged.  Gnus will almost certainly be slower, but it will be kept
-synchronized with the server.  That last point probably won't make any
-sense if you are using a nntp or nnimap backend.
+\e$B$"$J$?$,$=$&K>$`$N$G$"$l$P!"\e(B@dfn{plugged} \e$B$J4|4V$O>o$K%X%C%@!<$H5-;v$r%@\e(B
+\e$B%&%s%m!<%I$9$k$h$&$K!"%(!<%8%'%s%H\e(B (@code{gnus-agent-cache} \e$B;2\e(B
+\e$B>H\e(B @pxref{Agent Variables}) \e$B$r@_Dj$9$k$3$H$,$G$-$^$9!#\e(Bgnus \e$B$O$[$H$s$I3N\e(B
+\e$B$+$K$b$C$HCY$/$J$j$^$9$,!"%5!<%P!<$H$NF14|$OJ]$?$l$^$9!#\e(B
+nntp \e$B$+\e(B nnimap \e$B%P%C%/%(%s%I$r;H$C$F$$$k>l9g$O!"$?$V$s$3$N:G8e$NE@$O0UL#\e(B
+\e$B$r$J$5$J$$$G$7$g$&!#\e(B
 
 @node Agent Expiry
 @subsection \e$B%(!<%8%'%s%H4|8B@Z$l>C5n\e(B
@@ -17462,19 +17629,19 @@ gnus \e$B$,%5!<%P!<$K@\B3$G$-$J$H$-$K2?$,5/$-$?$+$rJ*8l$j$^$9!#%(!<%8%'%s%H\e(B
 \e$B$NJQ?t$NB>$NA*Br;h$K$O\e(B @code{denied} \e$B$H\e(B @code{offline} \e$B$,$"$j!"%(!<%8%'\e(B
 \e$B%s%H$,;H$o$l$k>l9g$O8e<T$@$1$,M-8z$G$9!#\e(B
 
-@c TRANSLATEME
 @item gnus-auto-goto-ignores
 @vindex gnus-auto-goto-ignores
-Another variable that isn't a Agent variable, yet so closely related
-that most will look for it here, this variable tells the summary
-buffer how to maneuver around undownloaded (only headers stored in the
-agent) and unfetched (neither article nor headers stored) articles.
-
-The legal values are @code{nil} (maneuver to any article),
-@code{undownloaded} (maneuvering while unplugged ignores articles that
-have not been fetched), @code{always-undownloaded} (maneuvering always
-ignores articles that have not been fetched), @code{unfetched}
-(maneuvering ignores articles whose headers have not been fetched).
+\e$BBgDq$N?M$O!"%(!<%8%'%s%HJQ?t$G$O$J$$$,L)@\$K4XO"$9$k$b$&0l$D$NJQ?t$r$3$3\e(B
+\e$B$GC5$9$G$7$g$&!#$3$NJQ?t$O!"%@%&%s%m!<%I$5$l$F$$$J$$\e(B (\e$B%X%C%@!<$@$1$,%(!<\e(B
+\e$B%8%'%s%H$K3JG<$5$l$?\e(B)\e$B!"$=$7$F<h$j9~$^$l$F$$$J$$\e(B (\e$B5-;v$b%X%C%@!<$b3JG<$5\e(B
+\e$B$l$F$$$J$$\e(B) \e$B5-;v$r$I$&A`:n$9$k$+$r35N,%P%C%U%!$KEA$($^$9!#\e(B
+
+\e$B@5Ev$JCM$O\e(B @code{nil} (\e$B$I$N5-;v$bA`:n$9$k\e(B)\e$B!"\e(B
+@code{undownloaded} (@dfn{unplugged} \e$B$J4|4V$NA`:n$O<h$j9~$^$l$F$$$J$$5-\e(B
+\e$B;v$rL5;k$9$k$3$H\e(B)\e$B!"\e(B@code{always-undownloaded} (\e$BA`:n$O<h$j9~$^$l$F$$$J$$\e(B
+\e$B5-;v$r>o$KL5;k$9$k$3$H\e(B)\e$B!"\e(B@code{unfetched} (\e$BA`:n$O%X%C%@!<$,<h$j9~$^$l$F\e(B
+\e$B$$$J$$5-;v$rL5;k$9$k$3$H\e(B) \e$B$G$9!#\e(B(\e$BLuCm\e(B: \e$B$&!<$`\e(B Kevin \e$B$5$s$O2?$r8@$C$F$k$s\e(B
+\e$B$@\e(B?)
 @end table
 
 @node Example Setup
@@ -18498,7 +18665,7 @@ gnus \e$B$K$O$3$l$i$rA4$F<+F0E*$K\e(B --- \e$B$^$k$GKbK!$G$b;H$C$?$h$&$K:n@.\e(B
 \e$B$&$A$?$@0l$D$7$+E,MQ$5$l$^$;$s!#\e(B
 
 @code{gnus-del-mark} \e$B$rNc$K<h$j$^$7$g$&\e(B --- \e$B$3$NO"A[%j%9%H$G$N0UL#$O!"$3\e(B
-\e$B$N0u\e(B (\e$B$9$J$o$A\e(B @samp{D} \e$B$N0u\e(B)\e$B$,$D$$$F$$$k5-;v$OA4$F!"\e(B@code{From} \e$B%X%C%@!<\e(B
+\e$B$N0u\e(B (\e$B$9$J$o$A\e(B @samp{e} \e$B$N0u\e(B)\e$B$,$D$$$F$$$k5-;v$OA4$F!"\e(B@code{From} \e$B%X%C%@!<\e(B
 \e$B$r$b$H$K\e(B -4 \e$B2<$2$i$l\e(B @code{Subject} \e$B$G\e(B -1 \e$B2<$2$i$l$k%9%3%"EPO?$,DI2C$5$l\e(B
 \e$B$^$9!#$3$l$r$"$J$?$NJP8+$K9g$o$;$FJQ99$7$F$/$@$5$$!#\e(B
 
@@ -19778,13 +19945,13 @@ gnus \e$B$O4X?t\e(B @code{gnus-user-format-function-}@samp{foo} \e$B$r8F$S=P$7$^$9!
 \e$BMM$G$9!#\e(B@code{gnus-balloon-face-*} \e$BJQ?t$OJ8;zNs$+J8;zNs$rJV$94X?t$r;X$9\e(B
 \e$B%7%s%\%k$N$I$A$i$+$G$"$kI,MW$,$"$j$^$9!#%^%&%9$,%W%m%Q%F%#$N@_Dj$5$l$F$$\e(B
 \e$B$k%F%-%9%H$N>e$rDL2a$9$k$H!"%P%k!<%s%&%#%s%I%&$,8=$l$F!"J8;zNs$rI=<($7$^\e(B
-\e$B$9!#$3$l$N>\$7$$>pJs$O\e(B @ref{(emacs)Help Echo} (GNU Emacs) \e$B$^$?\e(B
-\e$B$O\e(B @code{balloon-help-mode} (XEmacs) \e$B$N@bL@J8;zNs$r;2>H$7$F$/$@$5$$!#\e(B(\e$B5;\e(B
-\e$B=QE*$JM}M3$N$?$a$K!"%.%#%a\e(B (guillemets: @footnote{guillemets (\e$BJ)8l\e(B) \e$B$O%.%e\e(B
-\e$B%a$H$bI=5-$5$l$^$9!#F|K\8l$N!V!W$KEv$?$k$b$N$G!"8}F,I=8=$rI=5-$7$?$j!"6/\e(B
-\e$BD4$7$?$$C18l$r0O$`!"2?$+$+$i$N0zMQItJ,$r0O$`!"=qJ*Ey$N%?%$%H%k$r5-$9EyMM!9\e(B
-\e$B$K;H$o$l$^$9!#\e(B}) \e$B$O$3$N@a$G$O\e(B @samp{<<} \e$B$*$h$S\e(B @samp{>>} \e$B$H$7$F6a;w$5$l\e(B
-\e$B$^$7$?!#\e(B)
+\e$B$9!#$3$l$N>\$7$$>pJs$O\e(B @ref{Tooltips, ,Tooltips, emacs, The Emacs
+Manual} (GNU Emacs) \e$B$^$?$O\e(B @code{balloon-help-mode} (XEmacs) \e$B$N@bL@J8;z\e(B
+\e$BNs$r;2>H$7$F$/$@$5$$!#\e(B(\e$B5;=QE*$JM}M3$N$?$a$K!"%.%#%a\e(B (guillemets:
+@footnote{guillemets (\e$BJ)8l\e(B) \e$B$O%.%e%a$H$bI=5-$5$l$^$9!#F|K\8l$N!V!W$KEv$?\e(B
+\e$B$k$b$N$G!"8}F,I=8=$rI=5-$7$?$j!"6/D4$7$?$$C18l$r0O$`!"2?$+$+$i$N0zMQItJ,\e(B
+\e$B$r0O$`!"=qJ*Ey$N%?%$%H%k$r5-$9EyMM!9$K;H$o$l$^$9!#\e(B}) \e$B$O$3$N@a$G\e(B
+\e$B$O\e(B @samp{<<} \e$B$*$h$S\e(B @samp{>>} \e$B$H$7$F6a;w$5$l$^$7$?!#\e(B)
 
 \e$B$3$l$O%0%k!<%W%P%C%U%!$NBeBX<jK!$G$9\e(B: