regen

6 files changed, 150 insertions, 86 deletions

diff --git a/fml/doc/en/tutorial/internals/PCB.sgml b/fml/doc/en/tutorial/internals/PCB.sgml
index 975bc3fa..4d7dc1e2 100644
--- a/fml/doc/en/tutorial/internals/PCB.sgml
+++ b/fml/doc/en/tutorial/internals/PCB.sgml
@@ -4,61 +4,61 @@ module     function                                     category
                                                     <-- (get value)
                                                     --> (set value)
 --------------------------------------------------------------------------------
-Error      run                                      --> error
-Error      finish                                   <-- error
-Fake       set_emul_domain                          --> faker
-Fake       get_emul_domain                          <-- faker
-Fake       set_emul_ml_list                         --> faker
-Fake       get_emul_ml_list                         <-- faker
-Fake       set_emul_user_list                       --> faker
-Fake       get_emul_user_list                       <-- faker
-Kernel     sysflow_reopen_stderr_channel            --> stderr
-Kernel     sysflow_reopen_stderr_channel            --> stderr
-Kernel     sysflow_finalize_stderr_channel          <-- stderr
-Kernel     sysflow_finalize_stderr_channel          <-- stderr
-Kernel     sysflow_finalize_stderr_channel          --> stderr
-State      current_process_set_ml_name              <-- current_process
-State      current_process_get_ml_name              <-- current_process
-State      restriction_state_set_deny_reason        --> check_restrictions
-State      restriction_state_get_deny_reason        <-- check_restrictions
-State      article_set_id                           --> article_message
-State      article_get_id                           <-- article_message
-State      command_context_set_ml_name              --> process_command
 State      command_context_get_ml_name              <-- process_command
-State      command_context_set_stop_process         --> process_command
-State      command_context_get_stop_process         <-- process_command
-State      command_context_set_normal_stop          --> process_command
+State      command_context_get_admin_auth           <-- process_command
 State      command_context_get_normal_stop          <-- process_command
-State      command_context_set_need_confirm         --> process_command
 State      command_context_get_need_confirm         <-- process_command
+State      command_context_get_stop_process         <-- process_command
+State      command_context_get_admin_password       <-- process_command
+State      command_context_get_try_admin_auth_request <-- process_command
+State      command_context_set_ml_name              --> process_command
 State      command_context_set_admin_auth           --> process_command
-State      command_context_get_admin_auth           <-- process_command
+State      command_context_set_normal_stop          --> process_command
+State      command_context_set_need_confirm         --> process_command
+State      command_context_set_stop_process         --> process_command
 State      command_context_set_admin_password       --> process_command
-State      command_context_get_admin_password       <-- process_command
 State      command_context_set_try_admin_auth_request --> process_command
 State      command_context_reset_try_admin_auth_request --> process_command
-State      command_context_get_try_admin_auth_request <-- process_command
-State      filter_state_set_error                   --> filter_state
+State      article_get_id                           <-- article_message
+State      article_set_id                           --> article_message
+Utils      incoming_message_get_cache_file_path     <-- incoming_message
+Utils      incoming_message_set_cache_file_path     --> incoming_message
 State      filter_state_get_error                   <-- filter_state
-State      filter_state_spam_checker_set_error      --> filter_state
+State      filter_state_get_tempfail_request        <-- filter_state
 State      filter_state_spam_checker_get_error      <-- filter_state
-State      filter_state_virus_checker_set_error     --> filter_state
 State      filter_state_virus_checker_get_error     <-- filter_state
+State      filter_state_set_error                   --> filter_state
 State      filter_state_set_tempfail_request        --> filter_state
-State      filter_state_get_tempfail_request        <-- filter_state
-State      smtp_server_state_set_error              --> smtp_transaction
+State      filter_state_spam_checker_set_error      --> filter_state
+State      filter_state_virus_checker_set_error     --> filter_state
 State      smtp_server_state_get_error              <-- smtp_transaction
+State      smtp_server_state_set_error              --> smtp_transaction
+Utils      incoming_message_get_current_queue       <-- incoming_smtp_transaction
+Utils      incoming_message_set_current_queue       --> incoming_smtp_transaction
+Fake       _get_emul_domain                         <-- faker
+Fake       _get_emul_ml_list                        <-- faker
+Fake       _get_emul_user_list                      <-- faker
+Fake       _set_emul_domain                         --> faker
+Fake       _set_emul_ml_list                        --> faker
+Fake       _set_emul_user_list                      --> faker
+Error      finish                                   <-- error
+Error      run                                      --> error
+Kernel     sysflow_finalize_stderr_channel          <-- stderr
+Kernel     sysflow_finalize_stderr_channel          <-- stderr
+Kernel     sysflow_reopen_stderr_channel            --> stderr
+Kernel     sysflow_reopen_stderr_channel            --> stderr
+Kernel     sysflow_finalize_stderr_channel          --> stderr
+State      restriction_state_get_deny_reason        <-- check_restrictions
+State      restriction_state_set_deny_reason        --> check_restrictions
+State      current_process_get_ml_name              <-- current_process
+State      current_process_set_ml_name              <-- current_process
+Utils      langinfo_get_charset                     <-- charset
+Utils      langinfo_get_charset                     <-- charset
+Utils      langinfo_set_charset                     --> charset
+Utils      langinfo_get_language_hint               <-- language_hint
+Utils      langinfo_set_language_hint               --> language_hint
+State      error_message_get_count                  <-- reply_message_count
 State      error_message_set_count                  <-- reply_message_count
 State      error_message_set_count                  --> reply_message_count
-State      error_message_get_count                  <-- reply_message_count
-Utils      incoming_message_set_cache_file_path     --> incoming_message
-Utils      incoming_message_get_cache_file_path     <-- incoming_message
-Utils      incoming_message_set_current_queue       --> incoming_smtp_transaction
-Utils      incoming_message_get_current_queue       <-- incoming_smtp_transaction
-Utils      set_language_hint                        --> language_hint
-Utils      get_language_hint                        <-- language_hint
-Utils      set_charset                              --> charset
-Utils      get_charset                              <-- charset
-Utils      get_charset                              <-- charset
 </screen>
 </para>
diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 780dce13..b21c3b74 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -7,6 +7,7 @@ __exceptional__ {
 address {
 
    address_compare { 
+    ?     $address_compare_function_domain_matching_level
           $address_compare_function_type
           $use_address_compare_function
    }
@@ -122,6 +123,13 @@ article {
           $use_article_text_plain_filter
    }
 
+   article_thread_outline { 
+    ?     $article_thread_outline_greeting_en
+    ?     $article_thread_outline_greeting_ja
+          $article_thread_outline_rules
+          $use_article_thread_outline
+   }
+
    article_virus_filter { 
     ?     $article_virus_filter_clamav_options
     ?     $article_virus_filter_drivers
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index bbfe0387..51345543 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -14,6 +14,15 @@ default value(s)</entry>
 <tbody>
 <row>
 <entry>
+address_compare_function_domain_matching_level</entry>
+<entry>
+ domain matching level in comparing mail addresses</entry>
+<entry>
+3
+   </entry>
+</row>
+<row>
+<entry>
 address_compare_function_type</entry>
 <entry>
  case insensitive comparison of user part of mail address.</entry>
@@ -384,6 +393,34 @@ reject_not_iso2022jp_japanese_string
 </row>
 <row>
 <entry>
+article_thread_outline_greeting_en</entry>
+<entry>
+ greeting prepended to thread outline</entry>
+<entry>
+[outline of this thread]
+   </entry>
+</row>
+<row>
+<entry>
+article_thread_outline_greeting_ja</entry>
+<entry>
+ スレッドの概要が始まる部分につける挨拶</entry>
+<entry>
+[本スレッドのあらすじ]
+   </entry>
+</row>
+<row>
+<entry>
+article_thread_outline_rules</entry>
+<entry>
+ where should we add thread outline ?</entry>
+<entry>
+add_outline_to_header
+   append_outline_to_body
+   </entry>
+</row>
+<row>
+<entry>
 article_virus_filter_clamav_options</entry>
 <entry>
  --mbox needed for mail files.</entry>
@@ -2124,6 +2161,15 @@ yes
 </row>
 <row>
 <entry>
+use_article_thread_outline</entry>
+<entry>
+ add thread outline automatically ?</entry>
+<entry>
+no
+   </entry>
+</row>
+<row>
+<entry>
 use_article_virus_filter</entry>
 <entry>
  external virus checker. disabled by default.</entry>
diff --git a/fml/doc/ja/tutorial/internals/PCB.sgml b/fml/doc/ja/tutorial/internals/PCB.sgml
index 975bc3fa..4d7dc1e2 100644
--- a/fml/doc/ja/tutorial/internals/PCB.sgml
+++ b/fml/doc/ja/tutorial/internals/PCB.sgml
@@ -4,61 +4,61 @@ module     function                                     category
                                                     <-- (get value)
                                                     --> (set value)
 --------------------------------------------------------------------------------
-Error      run                                      --> error
-Error      finish                                   <-- error
-Fake       set_emul_domain                          --> faker
-Fake       get_emul_domain                          <-- faker
-Fake       set_emul_ml_list                         --> faker
-Fake       get_emul_ml_list                         <-- faker
-Fake       set_emul_user_list                       --> faker
-Fake       get_emul_user_list                       <-- faker
-Kernel     sysflow_reopen_stderr_channel            --> stderr
-Kernel     sysflow_reopen_stderr_channel            --> stderr
-Kernel     sysflow_finalize_stderr_channel          <-- stderr
-Kernel     sysflow_finalize_stderr_channel          <-- stderr
-Kernel     sysflow_finalize_stderr_channel          --> stderr
-State      current_process_set_ml_name              <-- current_process
-State      current_process_get_ml_name              <-- current_process
-State      restriction_state_set_deny_reason        --> check_restrictions
-State      restriction_state_get_deny_reason        <-- check_restrictions
-State      article_set_id                           --> article_message
-State      article_get_id                           <-- article_message
-State      command_context_set_ml_name              --> process_command
 State      command_context_get_ml_name              <-- process_command
-State      command_context_set_stop_process         --> process_command
-State      command_context_get_stop_process         <-- process_command
-State      command_context_set_normal_stop          --> process_command
+State      command_context_get_admin_auth           <-- process_command
 State      command_context_get_normal_stop          <-- process_command
-State      command_context_set_need_confirm         --> process_command
 State      command_context_get_need_confirm         <-- process_command
+State      command_context_get_stop_process         <-- process_command
+State      command_context_get_admin_password       <-- process_command
+State      command_context_get_try_admin_auth_request <-- process_command
+State      command_context_set_ml_name              --> process_command
 State      command_context_set_admin_auth           --> process_command
-State      command_context_get_admin_auth           <-- process_command
+State      command_context_set_normal_stop          --> process_command
+State      command_context_set_need_confirm         --> process_command
+State      command_context_set_stop_process         --> process_command
 State      command_context_set_admin_password       --> process_command
-State      command_context_get_admin_password       <-- process_command
 State      command_context_set_try_admin_auth_request --> process_command
 State      command_context_reset_try_admin_auth_request --> process_command
-State      command_context_get_try_admin_auth_request <-- process_command
-State      filter_state_set_error                   --> filter_state
+State      article_get_id                           <-- article_message
+State      article_set_id                           --> article_message
+Utils      incoming_message_get_cache_file_path     <-- incoming_message
+Utils      incoming_message_set_cache_file_path     --> incoming_message
 State      filter_state_get_error                   <-- filter_state
-State      filter_state_spam_checker_set_error      --> filter_state
+State      filter_state_get_tempfail_request        <-- filter_state
 State      filter_state_spam_checker_get_error      <-- filter_state
-State      filter_state_virus_checker_set_error     --> filter_state
 State      filter_state_virus_checker_get_error     <-- filter_state
+State      filter_state_set_error                   --> filter_state
 State      filter_state_set_tempfail_request        --> filter_state
-State      filter_state_get_tempfail_request        <-- filter_state
-State      smtp_server_state_set_error              --> smtp_transaction
+State      filter_state_spam_checker_set_error      --> filter_state
+State      filter_state_virus_checker_set_error     --> filter_state
 State      smtp_server_state_get_error              <-- smtp_transaction
+State      smtp_server_state_set_error              --> smtp_transaction
+Utils      incoming_message_get_current_queue       <-- incoming_smtp_transaction
+Utils      incoming_message_set_current_queue       --> incoming_smtp_transaction
+Fake       _get_emul_domain                         <-- faker
+Fake       _get_emul_ml_list                        <-- faker
+Fake       _get_emul_user_list                      <-- faker
+Fake       _set_emul_domain                         --> faker
+Fake       _set_emul_ml_list                        --> faker
+Fake       _set_emul_user_list                      --> faker
+Error      finish                                   <-- error
+Error      run                                      --> error
+Kernel     sysflow_finalize_stderr_channel          <-- stderr
+Kernel     sysflow_finalize_stderr_channel          <-- stderr
+Kernel     sysflow_reopen_stderr_channel            --> stderr
+Kernel     sysflow_reopen_stderr_channel            --> stderr
+Kernel     sysflow_finalize_stderr_channel          --> stderr
+State      restriction_state_get_deny_reason        <-- check_restrictions
+State      restriction_state_set_deny_reason        --> check_restrictions
+State      current_process_get_ml_name              <-- current_process
+State      current_process_set_ml_name              <-- current_process
+Utils      langinfo_get_charset                     <-- charset
+Utils      langinfo_get_charset                     <-- charset
+Utils      langinfo_set_charset                     --> charset
+Utils      langinfo_get_language_hint               <-- language_hint
+Utils      langinfo_set_language_hint               --> language_hint
+State      error_message_get_count                  <-- reply_message_count
 State      error_message_set_count                  <-- reply_message_count
 State      error_message_set_count                  --> reply_message_count
-State      error_message_get_count                  <-- reply_message_count
-Utils      incoming_message_set_cache_file_path     --> incoming_message
-Utils      incoming_message_get_cache_file_path     <-- incoming_message
-Utils      incoming_message_set_current_queue       --> incoming_smtp_transaction
-Utils      incoming_message_get_current_queue       <-- incoming_smtp_transaction
-Utils      set_language_hint                        --> language_hint
-Utils      get_language_hint                        <-- language_hint
-Utils      set_charset                              --> charset
-Utils      get_charset                              <-- charset
-Utils      get_charset                              <-- charset
 </screen>
 </para>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 30db12c3..b21c3b74 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -7,6 +7,7 @@ __exceptional__ {
 address {
 
    address_compare { 
+    ?     $address_compare_function_domain_matching_level
           $address_compare_function_type
           $use_address_compare_function
    }
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 7cda3764..675c7f83 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -14,6 +14,15 @@ default value(s)</entry>
 <tbody>
 <row>
 <entry>
+address_compare_function_domain_matching_level</entry>
+<entry>
+ メールアドレスを比較する際のドメイン比較レベル</entry>
+<entry>
+3
+   </entry>
+</row>
+<row>
+<entry>
 address_compare_function_type</entry>
 <entry>
  メンバーチェックをする際に、ユーザパートの比較で</entry>
@@ -389,8 +398,8 @@ article_thread_outline_rules</entry>
 <entry>
  スレッドの概要を記事に追加する際にどこに追加するのか</entry>
 <entry>
-add_header
-   append_body
+add_outline_to_header
+   append_outline_to_body
    </entry>
 </row>
 <row>