regen: variable name and hook renaming.

4 files changed, 197 insertions, 18 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index bdf586bd..06434c2c 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -94,6 +94,14 @@ article {
           $use_article_size_filter
    }
 
+   article_spam_filter { 
+    ?     $article_spam_filter_bogofilter_options
+          $article_spam_filter_functions
+    ?     $article_spam_filter_spamassassin_options
+    ?     $article_spam_filter_spamc_options
+          $use_article_spam_filter
+   }
+
    article_text_plain_filter { 
           $article_text_plain_filter_rules
           $use_article_text_plain_filter
@@ -316,18 +324,15 @@ domain {
 error {
 
    error_mail_analyzer { 
+          $error_mail_analyzer_cache_dir
+    ?     $error_mail_analyzer_cache_mode
+    ?     $error_mail_analyzer_cache_size
+          $error_mail_analyzer_cache_type
+    ?     $error_mail_analyzer_function
+    ?     $error_mail_analyzer_function_select_list
+          $error_mail_analyzer_simple_count_limit
           $use_error_mail_analyzer_function
    }
-
-   error_* {
-          $error_analyzer_cache_dir
-    ?     $error_analyzer_cache_mode
-    ?     $error_analyzer_cache_size
-          $error_analyzer_cache_type
-    ?     $error_analyzer_function
-    ?     $error_analyzer_function_select_list
-          $error_analyzer_simple_count_limit
-   }
 }
 
 html {
diff --git a/fml/doc/en/tutorial/variables/filter.rules.sgml b/fml/doc/en/tutorial/variables/filter.rules.sgml
index a5fbabbb..c1413208 100644
--- a/fml/doc/en/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/en/tutorial/variables/filter.rules.sgml
@@ -192,6 +192,41 @@ article_filter_reject_notice_recipients	=	maintainer
 article_filter_reject_notice_data_type	=	string
 
 
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+use_article_spam_filter		=	no
+
+
+# Descriptions: list up driver names used as spam checker.
+#      History: none
+#        Value: spamassassin | spamc | bogofilter
+#     Examples: bogofilter
+article_spam_filter_functions	=	bogofilter
+
+
+# Descriptions: exit non-zero status code when spam caught if "-e" specified.
+#      History: none
+#        Value: STR
+#     Examples: -e
+article_spam_filter_spamassassin_options	=	-e
+
+
+# Descriptions: spamc optoins. "-c" means check only.
+#      History: none
+#        Value: STR
+#     Examples: -c
+article_spam_filter_spamc_options		=	-c
+
+
+# Descriptions: "-e" implies embedded mode.
+#      History: none
+#        Value: STR
+#     Examples: -e
+article_spam_filter_bogofilter_options		=	-e
+
+
 =head2	filter
 
 
@@ -259,5 +294,108 @@ command_mail_filter_reject_notice_data_type	=	string
 
 path_bogofilter           = @BOGOFILTER@
 
+# $article_digest_finish_end_hook = q{ 1;};
+# $article_digest_finish_start_hook = q{ 1;};
+# $article_digest_prepare_end_hook = q{ 1;};
+# $article_digest_prepare_start_hook = q{ 1;};
+# $article_digest_run_end_hook = q{ 1;};
+# $article_digest_run_start_hook = q{ 1;};
+# $article_digest_verify_request_end_hook = q{ 1;};
+# $article_digest_verify_request_start_hook = q{ 1;};
+# $article_filter_end_hook = q{ 1;};
+# $article_filter_start_hook = q{ 1;};
+# $article_header_rewrite_end_hook = q{ 1;};
+# $article_header_rewrite_start_hook = q{ 1;};
+# $article_post_finish_end_hook = q{ 1;};
+# $article_post_finish_start_hook = q{ 1;};
+# $article_post_prepare_end_hook = q{ 1;};
+# $article_post_prepare_start_hook = q{ 1;};
+# $article_post_run_end_hook = q{ 1;};
+# $article_post_run_start_hook = q{ 1;};
+# $article_post_verify_request_end_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;};
+# $command_mail_finish_end_hook = q{ 1;};
+# $command_mail_finish_start_hook = q{ 1;};
+# $command_mail_prepare_end_hook = q{ 1;};
+# $command_mail_prepare_start_hook = q{ 1;};
+# $command_mail_run_end_hook = q{ 1;};
+# $command_mail_run_start_hook = q{ 1;};
+# $command_mail_verify_request_end_hook = q{ 1;};
+# $command_mail_verify_request_start_hook = q{ 1;};
+# $distribute_finish_end_hook = q{ 1;};
+# $distribute_finish_start_hook = q{ 1;};
+# $distribute_prepare_end_hook = q{ 1;};
+# $distribute_prepare_start_hook = q{ 1;};
+# $distribute_run_end_hook = q{ 1;};
+# $distribute_run_start_hook = q{ 1;};
+# $distribute_verify_request_end_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;};
+# $error_mail_analyzer_prepare_end_hook = q{ 1;};
+# $error_mail_analyzer_prepare_start_hook = q{ 1;};
+# $error_mail_analyzer_run_end_hook = q{ 1;};
+# $error_mail_analyzer_run_start_hook = q{ 1;};
+# $error_mail_analyzer_verify_request_end_hook = q{ 1;};
+# $error_mail_analyzer_verify_request_start_hook = q{ 1;};
+# $faker_finish_end_hook = q{ 1;};
+# $faker_finish_start_hook = q{ 1;};
+# $faker_prepare_end_hook = q{ 1;};
+# $faker_prepare_start_hook = q{ 1;};
+# $faker_run_end_hook = q{ 1;};
+# $faker_run_start_hook = q{ 1;};
+# $faker_verify_request_end_hook = q{ 1;};
+# $faker_verify_request_start_hook = q{ 1;};
+# $fmladdr_finish_end_hook = q{ 1;};
+# $fmladdr_finish_start_hook = q{ 1;};
+# $fmladdr_prepare_end_hook = q{ 1;};
+# $fmladdr_prepare_start_hook = q{ 1;};
+# $fmladdr_run_end_hook = q{ 1;};
+# $fmladdr_run_start_hook = q{ 1;};
+# $fmladdr_verify_request_end_hook = q{ 1;};
+# $fmladdr_verify_request_start_hook = q{ 1;};
+# $fmlalias_finish_end_hook = q{ 1;};
+# $fmlalias_finish_start_hook = q{ 1;};
+# $fmlalias_prepare_end_hook = q{ 1;};
+# $fmlalias_prepare_start_hook = q{ 1;};
+# $fmlalias_run_end_hook = q{ 1;};
+# $fmlalias_run_start_hook = q{ 1;};
+# $fmlalias_verify_request_end_hook = q{ 1;};
+# $fmlalias_verify_request_start_hook = q{ 1;};
+# $fmlconf_finish_end_hook = q{ 1;};
+# $fmlconf_finish_start_hook = q{ 1;};
+# $fmlconf_prepare_end_hook = q{ 1;};
+# $fmlconf_prepare_start_hook = q{ 1;};
+# $fmlconf_run_end_hook = q{ 1;};
+# $fmlconf_run_start_hook = q{ 1;};
+# $fmlconf_verify_request_end_hook = q{ 1;};
+# $fmlconf_verify_request_start_hook = q{ 1;};
+# $fmldoc_finish_end_hook = q{ 1;};
+# $fmldoc_finish_start_hook = q{ 1;};
+# $fmldoc_prepare_end_hook = q{ 1;};
+# $fmldoc_prepare_start_hook = q{ 1;};
+# $fmldoc_run_end_hook = q{ 1;};
+# $fmldoc_run_start_hook = q{ 1;};
+# $fmldoc_verify_request_end_hook = q{ 1;};
+# $fmldoc_verify_request_start_hook = q{ 1;};
+# $fmlhtmlify_finish_end_hook = q{ 1;};
+# $fmlhtmlify_finish_start_hook = q{ 1;};
+# $fmlhtmlify_prepare_end_hook = q{ 1;};
+# $fmlhtmlify_prepare_start_hook = q{ 1;};
+# $fmlhtmlify_run_end_hook = q{ 1;};
+# $fmlhtmlify_run_start_hook = q{ 1;};
+# $fmlhtmlify_verify_request_end_hook = q{ 1;};
+# $fmlhtmlify_verify_request_start_hook = q{ 1;};
+# $makefml_finish_end_hook = q{ 1;};
+# $makefml_finish_start_hook = q{ 1;};
+# $makefml_prepare_end_hook = q{ 1;};
+# $makefml_prepare_start_hook = q{ 1;};
+# $makefml_run_end_hook = q{ 1;};
+# $makefml_run_start_hook = q{ 1;};
+# $makefml_verify_request_end_hook = q{ 1;};
+# $makefml_verify_request_start_hook = q{ 1;};
+
 </screen>
 </para>
diff --git a/fml/doc/en/tutorial/variables/filter.size.sgml b/fml/doc/en/tutorial/variables/filter.size.sgml
index a051d9c9..bf07a930 100644
--- a/fml/doc/en/tutorial/variables/filter.size.sgml
+++ b/fml/doc/en/tutorial/variables/filter.size.sgml
@@ -177,7 +177,7 @@ command_mail_size_filter_rules	=	check_header_size
 #      History: none
 #        Value: number
 #     Examples: 
-error_analyzer_cache_size		=	14
+error_mail_analyzer_cache_size		=	14
 
 </screen>
 </para>
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index d4aa5330..a749bc4d 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -186,6 +186,42 @@ check_header_size
 </row>
 <row>
 <entry>
+article_spam_filter_bogofilter_options</entry>
+<entry>
+ "-e" implies embedded mode.</entry>
+<entry>
+-e
+   </entry>
+</row>
+<row>
+<entry>
+article_spam_filter_functions</entry>
+<entry>
+ list up driver names used as spam checker.</entry>
+<entry>
+bogofilter
+   </entry>
+</row>
+<row>
+<entry>
+article_spam_filter_spamassassin_options</entry>
+<entry>
+ exit non-zero status code when spam caught if "-e" specified.</entry>
+<entry>
+-e
+   </entry>
+</row>
+<row>
+<entry>
+article_spam_filter_spamc_options</entry>
+<entry>
+ spamc optoins. "-c" means check only.</entry>
+<entry>
+-c
+   </entry>
+</row>
+<row>
+<entry>
 article_subject_tag</entry>
 <entry>
  Subject: tag.</entry>
@@ -592,7 +628,7 @@ $domain_config_base_dir/sendmail
 </row>
 <row>
 <entry>
-error_analyzer_cache_dir</entry>
+error_mail_analyzer_cache_dir</entry>
 <entry>
  directory to cache error messages.</entry>
 <entry>
@@ -601,7 +637,7 @@ $db_dir/error
 </row>
 <row>
 <entry>
-error_analyzer_cache_mode</entry>
+error_mail_analyzer_cache_mode</entry>
 <entry>
  mode of cache expiration</entry>
 <entry>
@@ -610,7 +646,7 @@ temporal
 </row>
 <row>
 <entry>
-error_analyzer_cache_size</entry>
+error_mail_analyzer_cache_size</entry>
 <entry>
  cache size.</entry>
 <entry>
@@ -619,7 +655,7 @@ error_analyzer_cache_size</entry>
 </row>
 <row>
 <entry>
-error_analyzer_cache_type</entry>
+error_mail_analyzer_cache_type</entry>
 <entry>
  module as cache engine</entry>
 <entry>
@@ -628,7 +664,7 @@ File::CacheDir
 </row>
 <row>
 <entry>
-error_analyzer_function</entry>
+error_mail_analyzer_function</entry>
 <entry>
  function in FML::Error::Analyze to analyze.</entry>
 <entry>
@@ -637,7 +673,7 @@ histgram
 </row>
 <row>
 <entry>
-error_analyzer_function_select_list</entry>
+error_mail_analyzer_function_select_list</entry>
 <entry>
  functions defined in FML::Error::Analyze</entry>
 <entry>
@@ -647,7 +683,7 @@ simple_count
 </row>
 <row>
 <entry>
-error_analyzer_simple_count_limit</entry>
+error_mail_analyzer_simple_count_limit</entry>
 <entry>
  error limit in using simple_count as anlyzer function.</entry>
 <entry>