From bbfeb5c8ce3cc86fc4cb3857f8fa0535f4a47735 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 10 Mar 2006 02:02:30 +0000 Subject: [PATCH] Synch to No Gnus 200603100202. --- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 18 ++++++++++-------- texi/gnus.texi | 42 ++++++++++++++++++++++-------------------- 3 files changed, 37 insertions(+), 28 deletions(-) diff --git a/texi/ChangeLog b/texi/ChangeLog index 5ad83f3..4d00d1d 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2006-03-10 Reiner Steib + + * gnus.texi (Fancy Mail Splitting): Improve sentences so as to be + easy to understand. + 2006-03-09 Katsumi Yamaoka * gnus.texi: Markup fix. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 503f454..78dd702 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -13665,18 +13665,20 @@ UNDELETED} はおそらくたいていの人には最良の選択でしょうが、ときど @samp{\\1}〜@samp{\\9}) を見て下さい。 @c この行を折り返さないで下さい。 -@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-match-partial-words}]) -もし分割がリストで、最初の要素が文字列であり、@var{field} (正規表現) に -合致するヘッダーが @var{value} (これも正規表現) に合致する文字列を含んで -いたならば、@var{split} で指定されたグループにメッセージを格納します。 +@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-partial}]) +この分割は少なくとも三つの要素を含んでいる必要があります。最初の要 +素 @var{field} (正規表現) に合致するヘッダーが @var{value} (これも正規表 +現) に合致する文字列を含んでいたならば、@var{split} で指定されたグループ +にメッセージを格納します。 + @var{field} の後にあって、しかも合致した @var{value} の最後尾より前にあ る何かの文字列に @var{restrict} (これもまた正規表現) が合致したら、 @var{split} は無視されます。いくつかの @var{restrict} のどれもが合致しな ければ @var{split} が実行されます。 -最後の要素 @var{invert-match-partial-words} は任意です。これが省略されて -いなくて、しかも値が @code{nil} でなければ、語 (word) の境界をまたいで正 -規表現の合致を行なうかどうかの振る舞 +最後の要素 @var{invert-partial} は任意です。これが省略されていなくて、し +かも値が @code{nil} でなければ、語 (word) の境界をまたいで正規表現の合致 +を行なうかどうかの振る舞 い (@code{nnmail-split-fancy-match-partial-words} 変数によって制御されま す; 下記参照) が反転します。(Gnus 5.10.7 の新機能) @@ -13766,7 +13768,7 @@ mode) 構文テーブル (syntax table) に従って、完全に @emph{語} ( @code{".*@@example\\.com"} ならば合致します。 @item -この章の最初の方で述べた @var{invert-match-partial-words} フラグを、 +この章の最初の方で述べた @var{invert-partial} フラグを、 @samp{(@var{field} @var{value} @dots{})} 型の分割規則で使うことができま す。このフラグが設定されていると、 @code{nnmail-split-fancy-match-partial-words} が @code{nil} であっても、 diff --git a/texi/gnus.texi b/texi/gnus.texi index d588cba..1532a40 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -14249,18 +14249,21 @@ If the split is a string, that will be taken as a group name. Normal regexp match expansion will be done. See below for examples. @c Don't fold this line. -@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-match-partial-words}]) -If the split is a list, the first element of which is a string, then -store the message as specified by @var{split}, if header @var{field} -(a regexp) contains @var{value} (also a regexp). If @var{restrict} -(yet another regexp) matches some string after @var{field} and before -the end of the matched @var{value}, the @var{split} is ignored. If -none of the @var{restrict} clauses match, @var{split} is processed. - -The last element @var{invert-match-partial-words} is optional. If it is -not omitted and the value is non-@code{nil}, the match-partial-words -behavior controlled by the @code{nnmail-split-fancy-match-partial-words} -variable (see below) will be inverted. (New in Gnus 5.10.7) +@item (@var{field} @var{value} [- @var{restrict} [@dots{}] ] @var{split} [@var{invert-partial}]) +The split can be a list containing at least three elements. If the +first element @var{field} (a regexp matching a header) contains +@var{value} (also a regexp) then store the message as specified by +@var{split}. + +If @var{restrict} (yet another regexp) matches some string after +@var{field} and before the end of the matched @var{value}, the +@var{split} is ignored. If none of the @var{restrict} clauses match, +@var{split} is processed. + +The last element @var{invert-partial} is optional. If it is +non-@code{nil}, the match-partial-words behavior controlled by the +variable @code{nnmail-split-fancy-match-partial-words} (see below) is +be inverted. (New in Gnus 5.10.7) @item (| @var{split} @dots{}) If the split is a list, and the first element is @code{|} (vertical @@ -14350,14 +14353,13 @@ in the rear of a word will be ignored. For example, the @var{value} @code{".*@@example\\.com"} does. @item -You can set the @var{invert-match-partial-words} flag in your split -rules of the @samp{(@var{field} @var{value} @dots{})} types, -aforementioned in this section. If the flag is set, word boundaries on -both sides of a word are ignored even if -@code{nnmail-split-fancy-match-partial-words} is @code{nil}. -Contrarily, if the flag is set, word boundaries are not ignored even if -@code{nnmail-split-fancy-match-partial-words} is non-@code{nil}. (New -in Gnus 5.10.7) +You can set the @var{invert-partial} flag in your split rules of the +@samp{(@var{field} @var{value} @dots{})} types, aforementioned in this +section. If the flag is set, word boundaries on both sides of a word +are ignored even if @code{nnmail-split-fancy-match-partial-words} is +@code{nil}. Contrarily, if the flag is set, word boundaries are not +ignored even if @code{nnmail-split-fancy-match-partial-words} is +non-@code{nil}. (New in Gnus 5.10.7) @end enumerate @vindex nnmail-split-abbrev-alist -- 1.7.10.4