regen

8 files changed, 244 insertions, 42 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index ce190d5f..89c62562 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -105,13 +105,19 @@ article {
           $use_article_spam_filter
    }
 
+   article_spool { 
+          $use_article_spool
+   }
+
    article_text_plain_filter { 
           $article_text_plain_filter_rules
           $use_article_text_plain_filter
    }
 
    article_virus_filter { 
+    ?     $article_virus_filter_clamav_options
     ?     $article_virus_filter_drivers
+          $article_virus_filter_functions
           $article_virus_filter_rules
           $use_article_virus_filter
    }
@@ -150,7 +156,6 @@ command {
     ?     $command_mail_reply_prompt
           $command_mail_restrictions
           $use_command_mail_function
-    ?     $user_command_mail_allowed_commands
    }
 
    command_mail_filter { 
@@ -168,6 +173,14 @@ command {
           $command_mail_invalid_command_limit
    }
 
+   command_mail_reply_preamble { 
+          $use_command_mail_reply_preamble
+   }
+
+   command_mail_reply_trailor { 
+          $use_command_mail_reply_trailor
+   }
+
    command_mail_size_filter { 
           $command_mail_size_filter_rules
           $use_command_mail_size_filter
@@ -273,6 +286,7 @@ unsubscribe_command {
 user_command {
 
    user_command { 
+    ?     $user_command_mail_allowed_commands
    }
 }
 
@@ -446,6 +460,11 @@ log {
     ?     $log_file_charset_ja
     ?     $log_file_default_charset
           $log_format_type
+    ?     $log_syslog_facility
+    ?     $log_syslog_host
+    ?     $log_syslog_ident
+    ?     $log_syslog_options
+    ?     $log_syslog_priority
           $log_type
           $use_log
    }
diff --git a/fml/doc/en/tutorial/variables/filter.rules.sgml b/fml/doc/en/tutorial/variables/filter.rules.sgml
index 4670d3b1..65a507eb 100644
--- a/fml/doc/en/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/en/tutorial/variables/filter.rules.sgml
@@ -301,6 +301,27 @@ article_spam_filter_spamc_options		=	-c
 article_spam_filter_bogofilter_options		=	-e
 
 
+# Descriptions:
+#      History:
+#        Value: YES_OR_NO
+#     Examples:
+use_article_virus_filter	=	no
+
+
+# Descriptions: list up driver names used as virus checker.
+#      History: none
+#        Value: MIX ( virusassassin virusc bogofilter )
+#     Examples: bogofilter
+article_virus_filter_functions	=	clamav
+
+
+# Descriptions: --mbox needed for mail files.
+#      History: none
+#        Value: COMMAND_LINE_OPTIONS
+#     Examples: --quiet --mbox
+article_virus_filter_clamav_options		=	--quiet --mbox
+
+
 =head2	filter
 
 
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index b5f0ddd8..e08fa4f1 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -312,6 +312,15 @@ reject_not_iso2022jp_japanese_string
 </row>
 <row>
 <entry>
+article_virus_filter_clamav_options</entry>
+<entry>
+ --mbox needed for mail files.</entry>
+<entry>
+--quiet --mbox
+   </entry>
+</row>
+<row>
+<entry>
 article_virus_filter_drivers</entry>
 <entry>
  external virus checker.</entry>
@@ -321,6 +330,15 @@ clamscan
 </row>
 <row>
 <entry>
+article_virus_filter_functions</entry>
+<entry>
+ list up driver names used as virus checker.</entry>
+<entry>
+clamav
+   </entry>
+</row>
+<row>
+<entry>
 article_virus_filter_rules</entry>
 <entry>
  action if virus found.</entry>
@@ -1058,6 +1076,42 @@ log_rotate_size</entry>
 </row>
 <row>
 <entry>
+log_syslog_facility</entry>
+<entry>
+ see syslog(3)</entry>
+<entry>
+mail
+   </entry>
+</row>
+<row>
+<entry>
+log_syslog_ident</entry>
+<entry>
+ string prepended to every message.</entry>
+<entry>
+fml/$program_name
+   </entry>
+</row>
+<row>
+<entry>
+log_syslog_options</entry>
+<entry>
+ see syslog(3)</entry>
+<entry>
+pid
+   </entry>
+</row>
+<row>
+<entry>
+log_syslog_priority</entry>
+<entry>
+ see syslog(3)</entry>
+<entry>
+info
+   </entry>
+</row>
+<row>
+<entry>
 log_type</entry>
 <entry>
  logging type</entry>
@@ -1834,6 +1888,15 @@ no
 </row>
 <row>
 <entry>
+use_article_spool</entry>
+<entry>
+ store article into spool directory ?</entry>
+<entry>
+${ues_spool:-yes}
+   </entry>
+</row>
+<row>
+<entry>
 use_article_text_plain_filter</entry>
 <entry>
  use text/plain filter, which is a simple syntax checker.</entry>
@@ -1870,6 +1933,24 @@ ${use_command_mail_program:-yes}
 </row>
 <row>
 <entry>
+use_command_mail_reply_preamble</entry>
+<entry>
+ add self introduction into the preamble of command mail reply. </entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+use_command_mail_reply_trailor</entry>
+<entry>
+ add processing summary into the trailor of command mail reply.</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
 use_command_mail_size_filter</entry>
 <entry>
  use size based filter</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index ce190d5f..89c62562 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -105,13 +105,19 @@ article {
           $use_article_spam_filter
    }
 
+   article_spool { 
+          $use_article_spool
+   }
+
    article_text_plain_filter { 
           $article_text_plain_filter_rules
           $use_article_text_plain_filter
    }
 
    article_virus_filter { 
+    ?     $article_virus_filter_clamav_options
     ?     $article_virus_filter_drivers
+          $article_virus_filter_functions
           $article_virus_filter_rules
           $use_article_virus_filter
    }
@@ -150,7 +156,6 @@ command {
     ?     $command_mail_reply_prompt
           $command_mail_restrictions
           $use_command_mail_function
-    ?     $user_command_mail_allowed_commands
    }
 
    command_mail_filter { 
@@ -168,6 +173,14 @@ command {
           $command_mail_invalid_command_limit
    }
 
+   command_mail_reply_preamble { 
+          $use_command_mail_reply_preamble
+   }
+
+   command_mail_reply_trailor { 
+          $use_command_mail_reply_trailor
+   }
+
    command_mail_size_filter { 
           $command_mail_size_filter_rules
           $use_command_mail_size_filter
@@ -273,6 +286,7 @@ unsubscribe_command {
 user_command {
 
    user_command { 
+    ?     $user_command_mail_allowed_commands
    }
 }
 
@@ -446,6 +460,11 @@ log {
     ?     $log_file_charset_ja
     ?     $log_file_default_charset
           $log_format_type
+    ?     $log_syslog_facility
+    ?     $log_syslog_host
+    ?     $log_syslog_ident
+    ?     $log_syslog_options
+    ?     $log_syslog_priority
           $log_type
           $use_log
    }
diff --git a/fml/doc/ja/tutorial/variables/filter.rules.sgml b/fml/doc/ja/tutorial/variables/filter.rules.sgml
index 5961b2a5..f561e0f3 100644
--- a/fml/doc/ja/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/ja/tutorial/variables/filter.rules.sgml
@@ -272,6 +272,27 @@ article_spam_filter_bogofilter_options		=	-e
 #      History:
 #        Value: YES_OR_NO
 #     Examples:
+use_article_virus_filter	=	no
+
+
+# Descriptions: list up driver names used as virus checker.
+#      History: none
+#        Value: MIX ( virusassassin virusc bogofilter )
+#     Examples: bogofilter
+article_virus_filter_functions	=	clamav
+
+
+# Descriptions: --mbox needed for mail files.
+#      History: none
+#        Value: COMMAND_LINE_OPTIONS
+#     Examples: --quiet --mbox
+article_virus_filter_clamav_options		=	--quiet --mbox
+
+
+# Descriptions:
+#      History:
+#        Value: YES_OR_NO
+#     Examples:
 use_command_mail_filter	= 	yes
  
 
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 85908141..7a68be18 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -295,6 +295,15 @@ reject_not_iso2022jp_japanese_string
 </row>
 <row>
 <entry>
+article_virus_filter_clamav_options</entry>
+<entry>
+ --mbox needed for mail files.</entry>
+<entry>
+--quiet --mbox
+   </entry>
+</row>
+<row>
+<entry>
 article_virus_filter_drivers</entry>
 <entry>
  ウィルスチェッカとして使う外部プログラム</entry>
@@ -304,6 +313,15 @@ clamscan
 </row>
 <row>
 <entry>
+article_virus_filter_functions</entry>
+<entry>
+ list up driver names used as virus checker.</entry>
+<entry>
+clamav
+   </entry>
+</row>
+<row>
+<entry>
 article_virus_filter_rules</entry>
 <entry>
  ウィルスだと判定された場合、どうするか？</entry>
@@ -1050,6 +1068,42 @@ log_rotate_size</entry>
 </row>
 <row>
 <entry>
+log_syslog_facility</entry>
+<entry>
+ see syslog(3)</entry>
+<entry>
+mail
+   </entry>
+</row>
+<row>
+<entry>
+log_syslog_ident</entry>
+<entry>
+ すべてのメッセージの前に現れる文字列</entry>
+<entry>
+fml/$program_name
+   </entry>
+</row>
+<row>
+<entry>
+log_syslog_options</entry>
+<entry>
+ see syslog(3)</entry>
+<entry>
+pid
+   </entry>
+</row>
+<row>
+<entry>
+log_syslog_priority</entry>
+<entry>
+ see syslog(3)</entry>
+<entry>
+info
+   </entry>
+</row>
+<row>
+<entry>
 log_type</entry>
 <entry>
  ログとりのタイプ (syslog は未実装)</entry>
@@ -1826,6 +1880,15 @@ no
 </row>
 <row>
 <entry>
+use_article_spool</entry>
+<entry>
+ 記事をスプールディレクトリに保存する</entry>
+<entry>
+${use_spool:-yes}
+   </entry>
+</row>
+<row>
+<entry>
 use_article_text_plain_filter</entry>
 <entry>
  先頭の text/plain 部分に対するフィルタ。</entry>
@@ -1862,6 +1925,24 @@ ${use_command_mail_program:-yes}
 </row>
 <row>
 <entry>
+use_command_mail_reply_preamble</entry>
+<entry>
+ コマンドメールの返事の先頭に</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+use_command_mail_reply_trailor</entry>
+<entry>
+ コマンドメールの返事の最後に処理結果のサマリをつけるか否か？</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
 use_command_mail_size_filter</entry>
 <entry>
  サイズ情報を根拠にしたフィルタリングをするか？</entry>
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 9fe68196..88c62b7b 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -2990,28 +2990,16 @@ sql_find	=	select fml_address from $sql_table
 # $article_digest_verify_request_end_hook = q{ 1;};
 # $article_digest_verify_request_start_hook = q{ 1;};
 # $article_filter_end_hook = q{ 1;};
-# $article_filter_end_hook = q{ 1;};
-# $article_filter_start_hook = q{ 1;};
 # $article_filter_start_hook = q{ 1;};
 # $article_header_rewrite_end_hook = q{ 1;};
-# $article_header_rewrite_end_hook = q{ 1;};
 # $article_header_rewrite_start_hook = q{ 1;};
-# $article_header_rewrite_start_hook = q{ 1;};
-# $article_post_finish_end_hook = q{ 1;};
 # $article_post_finish_end_hook = q{ 1;};
 # $article_post_finish_start_hook = q{ 1;};
-# $article_post_finish_start_hook = q{ 1;};
-# $article_post_prepare_end_hook = q{ 1;};
 # $article_post_prepare_end_hook = q{ 1;};
 # $article_post_prepare_start_hook = q{ 1;};
-# $article_post_prepare_start_hook = q{ 1;};
 # $article_post_run_end_hook = q{ 1;};
-# $article_post_run_end_hook = q{ 1;};
-# $article_post_run_start_hook = q{ 1;};
 # $article_post_run_start_hook = q{ 1;};
 # $article_post_verify_request_end_hook = q{ 1;};
-# $article_post_verify_request_end_hook = q{ 1;};
-# $article_post_verify_request_start_hook = q{ 1;};
 # $article_post_verify_request_start_hook = q{ 1;};
 # $command_mail_filter_end_hook = q{ 1;};
 # $command_mail_filter_start_hook = q{ 1;};
@@ -3024,20 +3012,12 @@ sql_find	=	select fml_address from $sql_table
 # $command_mail_verify_request_end_hook = q{ 1;};
 # $command_mail_verify_request_start_hook = q{ 1;};
 # $distribute_finish_end_hook = q{ 1;};
-# $distribute_finish_end_hook = q{ 1;};
 # $distribute_finish_start_hook = q{ 1;};
-# $distribute_finish_start_hook = q{ 1;};
-# $distribute_prepare_end_hook = q{ 1;};
 # $distribute_prepare_end_hook = q{ 1;};
 # $distribute_prepare_start_hook = q{ 1;};
-# $distribute_prepare_start_hook = q{ 1;};
-# $distribute_run_end_hook = q{ 1;};
 # $distribute_run_end_hook = q{ 1;};
 # $distribute_run_start_hook = q{ 1;};
-# $distribute_run_start_hook = q{ 1;};
 # $distribute_verify_request_end_hook = q{ 1;};
-# $distribute_verify_request_end_hook = q{ 1;};
-# $distribute_verify_request_start_hook = q{ 1;};
 # $distribute_verify_request_start_hook = q{ 1;};
 # $error_mail_analyzer_finish_end_hook = q{ 1;};
 # $error_mail_analyzer_finish_start_hook = q{ 1;};
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 0fbbb081..8f419337 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -3081,28 +3081,16 @@ sql_find	=	select fml_address from $sql_table
 # $article_digest_verify_request_end_hook = q{ 1;};
 # $article_digest_verify_request_start_hook = q{ 1;};
 # $article_filter_end_hook = q{ 1;};
-# $article_filter_end_hook = q{ 1;};
-# $article_filter_start_hook = q{ 1;};
 # $article_filter_start_hook = q{ 1;};
 # $article_header_rewrite_end_hook = q{ 1;};
-# $article_header_rewrite_end_hook = q{ 1;};
 # $article_header_rewrite_start_hook = q{ 1;};
-# $article_header_rewrite_start_hook = q{ 1;};
-# $article_post_finish_end_hook = q{ 1;};
 # $article_post_finish_end_hook = q{ 1;};
 # $article_post_finish_start_hook = q{ 1;};
-# $article_post_finish_start_hook = q{ 1;};
-# $article_post_prepare_end_hook = q{ 1;};
 # $article_post_prepare_end_hook = q{ 1;};
 # $article_post_prepare_start_hook = q{ 1;};
-# $article_post_prepare_start_hook = q{ 1;};
 # $article_post_run_end_hook = q{ 1;};
-# $article_post_run_end_hook = q{ 1;};
-# $article_post_run_start_hook = q{ 1;};
 # $article_post_run_start_hook = q{ 1;};
 # $article_post_verify_request_end_hook = q{ 1;};
-# $article_post_verify_request_end_hook = q{ 1;};
-# $article_post_verify_request_start_hook = q{ 1;};
 # $article_post_verify_request_start_hook = q{ 1;};
 # $command_mail_filter_end_hook = q{ 1;};
 # $command_mail_filter_start_hook = q{ 1;};
@@ -3115,20 +3103,12 @@ sql_find	=	select fml_address from $sql_table
 # $command_mail_verify_request_end_hook = q{ 1;};
 # $command_mail_verify_request_start_hook = q{ 1;};
 # $distribute_finish_end_hook = q{ 1;};
-# $distribute_finish_end_hook = q{ 1;};
 # $distribute_finish_start_hook = q{ 1;};
-# $distribute_finish_start_hook = q{ 1;};
-# $distribute_prepare_end_hook = q{ 1;};
 # $distribute_prepare_end_hook = q{ 1;};
 # $distribute_prepare_start_hook = q{ 1;};
-# $distribute_prepare_start_hook = q{ 1;};
-# $distribute_run_end_hook = q{ 1;};
 # $distribute_run_end_hook = q{ 1;};
 # $distribute_run_start_hook = q{ 1;};
-# $distribute_run_start_hook = q{ 1;};
 # $distribute_verify_request_end_hook = q{ 1;};
-# $distribute_verify_request_end_hook = q{ 1;};
-# $distribute_verify_request_start_hook = q{ 1;};
 # $distribute_verify_request_start_hook = q{ 1;};
 # $error_mail_analyzer_finish_end_hook = q{ 1;};
 # $error_mail_analyzer_finish_start_hook = q{ 1;};