regen: spammer_maps, envelope sender loop check

4 files changed, 80 insertions, 0 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 1d4c7040..0b77f26e 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -496,6 +496,11 @@ incoming {
           $use_incoming_mail_cache
    }
 
+   incoming_mail_envelope_loop_check { 
+          $incoming_mail_envelope_loop_check_rules
+          $use_incoming_mail_envelope_loop_check
+   }
+
    incoming_mail_header_loop_check { 
           $incoming_mail_header_loop_check_rules
           $use_incoming_mail_header_loop_check
@@ -810,6 +815,14 @@ smtp {
    }
 }
 
+spammer {
+
+   spammer { 
+          $primary_spammer_map
+          $spammer_maps
+   }
+}
+
 spool {
 
    spool { 
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 16aaac1d..e789ecad 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -1236,6 +1236,15 @@ incoming_mail_cache_size</entry>
 </row>
 <row>
 <entry>
+incoming_mail_envelope_loop_check_rules</entry>
+<entry>
+ envelope based loop check rules</entry>
+<entry>
+check_envelope_sender
+   </entry>
+</row>
+<row>
+<entry>
 incoming_mail_header_loop_check_rules</entry>
 <entry>
  loop check rules</entry>
@@ -2070,6 +2079,15 @@ smtp_servers</entry>
 </row>
 <row>
 <entry>
+spammer_maps</entry>
+<entry>
+ list of spammers or addresses to reject.</entry>
+<entry>
+$primary_spammer_map
+   </entry>
+</row>
+<row>
+<entry>
 spool_dir</entry>
 <entry>
  spool directory</entry>
@@ -2594,6 +2612,15 @@ yes
 </row>
 <row>
 <entry>
+use_incoming_mail_envelope_loop_check</entry>
+<entry>
+ enable envelope based loop check or not ?</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
 use_incoming_mail_header_loop_check</entry>
 <entry>
  use loop check based on header information ?</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index cff33f82..94213871 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -496,6 +496,11 @@ incoming {
           $use_incoming_mail_cache
    }
 
+   incoming_mail_envelope_loop_check { 
+          $incoming_mail_envelope_loop_check_rules
+          $use_incoming_mail_envelope_loop_check
+   }
+
    incoming_mail_header_loop_check { 
           $incoming_mail_header_loop_check_rules
           $use_incoming_mail_header_loop_check
@@ -810,6 +815,14 @@ smtp {
    }
 }
 
+spammer {
+
+   spammer { 
+          $primary_spammer_map
+          $spammer_maps
+   }
+}
+
 spool {
 
    spool { 
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 649c85a5..f85004f6 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -1219,6 +1219,15 @@ incoming_mail_cache_size</entry>
 </row>
 <row>
 <entry>
+incoming_mail_envelope_loop_check_rules</entry>
+<entry>
+ Envelope に対するループチェックのルール群</entry>
+<entry>
+check_envelope_sender
+   </entry>
+</row>
+<row>
+<entry>
 incoming_mail_header_loop_check_rules</entry>
 <entry>
  ヘッダに対するループチェックのルール群</entry>
@@ -2062,6 +2071,15 @@ smtp_servers</entry>
 </row>
 <row>
 <entry>
+spammer_maps</entry>
+<entry>
+ スパマーというか拒否したいアドレスのリスト</entry>
+<entry>
+$primary_spammer_map
+   </entry>
+</row>
+<row>
+<entry>
 spool_dir</entry>
 <entry>
  記事を保存するディレクトリ</entry>
@@ -2624,6 +2642,15 @@ yes
 </row>
 <row>
 <entry>
+use_incoming_mail_envelope_loop_check</entry>
+<entry>
+ Envelope 情報を根拠にしたループチェックをするか？</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
 use_incoming_mail_header_loop_check</entry>
 <entry>
  ヘッダ情報を根拠にしたループチェックをするか？</entry>