body_loop_check_rules -> incoming_mail_body_loop_check_rules

use_body_loop_check	->	use_incoming_mail_body_loop_check
body_cksum_cache_dir	->	incoming_mail_body_cksum_cache_dir
header_loop_check_rules	->	incoming_mail_header_loop_check_rules
use_header_loop_check	->	use_incoming_mail_header_loop_check

2 files changed, 56 insertions, 62 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 10b22373..e0ca21f6 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -86,18 +86,6 @@ article {
    }
 }
 
-body {
-
-   body_loop_check { 
-          $body_loop_check_rules
-          $use_body_loop_check
-   }
-
-   body_* {
-          $body_cksum_cache_dir
-   }
-}
-
 cgi {
 
    cgi_* {
@@ -306,14 +294,6 @@ has {
    }
 }
 
-header {
-
-   header_loop_check { 
-          $header_loop_check_rules
-          $use_header_loop_check
-   }
-}
-
 html {
 
    html_archive { 
@@ -340,11 +320,25 @@ incoming {
           $incoming_command_mail_header_size_limit
    }
 
+   incoming_mail_body_loop_check { 
+          $incoming_mail_body_loop_check_rules
+          $use_incoming_mail_body_loop_check
+   }
+
    incoming_mail_cache { 
           $incoming_mail_cache_dir
     ?     $incoming_mail_cache_size
           $use_incoming_mail_cache
    }
+
+   incoming_mail_header_loop_check { 
+          $incoming_mail_header_loop_check_rules
+          $use_incoming_mail_header_loop_check
+   }
+
+   incoming_* {
+          $incoming_mail_body_cksum_cache_dir
+   }
 }
 
 ldap {
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 233dd333..368cdc4a 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -200,24 +200,6 @@ reject_not_iso2022jp_japanese_string
 </row>
 <row>
 <entry>
-body_cksum_cache_dir</entry>
-<entry>
- Message-ID cache directory</entry>
-<entry>
-$db_dir/body_cksum
-   </entry>
-</row>
-<row>
-<entry>
-body_loop_check_rules</entry>
-<entry>
- body loop check rules</entry>
-<entry>
-check_body_cksum
-   </entry>
-</row>
-<row>
-<entry>
 cgi_base_dir</entry>
 <entry>
  base directory which locates .cgi for this domain.</entry>
@@ -748,17 +730,6 @@ yes
 </row>
 <row>
 <entry>
-header_loop_check_rules</entry>
-<entry>
- loop check rules</entry>
-<entry>
-check_message_id
-   check_x_ml_info
-   check_list_post
-   </entry>
-</row>
-<row>
-<entry>
 help_file</entry>
 <entry>
  help file</entry>
@@ -813,6 +784,24 @@ $default_mail_header_size_limit
 </row>
 <row>
 <entry>
+incoming_mail_body_cksum_cache_dir</entry>
+<entry>
+ Message-ID cache directory</entry>
+<entry>
+$db_dir/body_cksum
+   </entry>
+</row>
+<row>
+<entry>
+incoming_mail_body_loop_check_rules</entry>
+<entry>
+ body loop check rules</entry>
+<entry>
+check_body_cksum
+   </entry>
+</row>
+<row>
+<entry>
 incoming_mail_cache_dir</entry>
 <entry>
  incoming mail queue directory</entry>
@@ -831,6 +820,17 @@ incoming_mail_cache_size</entry>
 </row>
 <row>
 <entry>
+incoming_mail_header_loop_check_rules</entry>
+<entry>
+ loop check rules</entry>
+<entry>
+check_message_id
+   check_x_ml_info
+   check_list_post
+   </entry>
+</row>
+<row>
+<entry>
 ldap_query_filter</entry>
 <entry>
  LDAP filter</entry>
@@ -1611,15 +1611,6 @@ yes
 </row>
 <row>
 <entry>
-use_body_loop_check</entry>
-<entry>
- use loop check based on body information</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
 use_command_mail_filter_reject_notice</entry>
 <entry>
  inform filter rejection ?</entry>
@@ -1674,18 +1665,18 @@ yes
 </row>
 <row>
 <entry>
-use_header_loop_check</entry>
+use_html_archive</entry>
 <entry>
- use loop check based on header information ?</entry>
+ use html converter function ?</entry>
 <entry>
 yes
    </entry>
 </row>
 <row>
 <entry>
-use_html_archive</entry>
+use_incoming_mail_body_loop_check</entry>
 <entry>
- use html converter function ?</entry>
+ use loop check based on body information</entry>
 <entry>
 yes
    </entry>
@@ -1701,6 +1692,15 @@ yes
 </row>
 <row>
 <entry>
+use_incoming_mail_header_loop_check</entry>
+<entry>
+ use loop check based on header information ?</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
 use_lock</entry>
 <entry>
  use lock system ?</entry>