regen:

+address_compare_function_domain_matching_level
+use_article_thread_outline
+article_thread_outline_rules
+article_thread_outline_greeting_ja
+article_thread_outline_greeting_en

2 files changed, 47 insertions, 4 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 230439c3..cc1c84a9 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -314,6 +314,12 @@ use_address_compare_function = yes
 #     Examples: user_part_case_insensitive
 address_compare_function_type = user_part_case_insensitive
 
+# Descriptions: domain matching level in comparing mail addresses
+#      History: ML_MEMBER_CHECK
+#        Value: NUM
+#     Examples: 3
+address_compare_function_domain_matching_level	=	3
+
 
 =head2 restrictinos
 
@@ -1530,6 +1536,36 @@ article_filter_reject_notice_recipients	=	maintainer
 #     Examples: string
 article_filter_reject_notice_data_type	=	string
 
+
+=head2 article thread
+
+
+# Descriptions: add thread outline automatically ?
+#      History: none
+#        Value: YES_OR_NO
+#     Examples: no
+use_article_thread_outline		=	no
+
+# Descriptions: where should we add thread outline ?
+#      History: none
+#        Value: SELECT ( add_outline_to_header | append_outline_to_body )
+#     Examples: add_header append_body
+article_thread_outline_rules		=	add_outline_to_header
+						append_outline_to_body
+
+# Descriptions: スレッドの概要が始まる部分につける挨拶
+#      History: none
+#        Value: STR
+#     Examples: [本スレッドのあらすじ]
+article_thread_outline_greeting_ja	=	[本スレッドのあらすじ]
+
+# Descriptions: greeting prepended to thread outline
+#      History: none
+#        Value: STR
+#     Examples: [outline of this thread]
+article_thread_outline_greeting_en	=	[outline of this thread]
+
+
 =head2	ARTICLE SPAM FILTER CONFIGURATIONS
 
 
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index e0447e2b..57e62024 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -323,6 +323,13 @@ use_address_compare_function = yes
 address_compare_function_type = user_part_case_insensitive
 
 
+# Descriptions: メールアドレスを比較する際のドメイン比較レベル
+#      History: ML_MEMBER_CHECK
+#        Value: NUM
+#     Examples: 3
+address_compare_function_domain_matching_level	=	3
+
+
 =head2	各機能における制限( ***_restrictions )
 
 
@@ -1579,10 +1586,10 @@ use_article_thread_outline		=	no
 
 # Descriptions: スレッドの概要を記事に追加する際にどこに追加するのか
 #      History: none
-#        Value: SELECT ( add_header | append_body )
+#        Value: SELECT ( add_outline_to_header | append_outline_to_body )
 #     Examples: add_header append_body
-article_thread_outline_rules		=	add_header
-						append_body
+article_thread_outline_rules		=	add_outline_to_header
+						append_outline_to_body
 
 # Descriptions: スレッドの概要が始まる部分につける挨拶
 #      History: none
@@ -1593,7 +1600,7 @@ article_thread_outline_greeting_ja	=	[本スレッドのあらすじ]
 # Descriptions: スレッドの概要が始まる部分につける挨拶
 #      History: none
 #        Value: STR
-#     Examples: [本スレッドのあらすじ]
+#     Examples: [outline of this thread]
 article_thread_outline_greeting_en	=	[outline of this thread]