regen: update comments

2 files changed, 93 insertions, 25 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index ae9b3390..2b07a14f 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -1085,9 +1085,15 @@ outgoing_article_body_size_limit	= $default_mail_body_size_limit
 
 
 # Descriptions:
-#      History:
-#        Value:
-#     Examples:
+#      History: fml8 rearragena fml4 filter functions and integrates them
+#		into one.
+#		Roughly speaking, fml8 filter is composed of the following
+#			$USE_DISTRIBUTE_FILTER
+#			$INCOMING_MAIL_SIZE_LIMIT
+#			ADD_CONTENT_HANDLER()
+#		functions.
+#        Value: yes / no
+#     Examples: yes
 use_article_filter	= 	yes
  
 
@@ -1105,8 +1111,8 @@ article_filter_functions	=	article_size_filter
 =head2	size based filter
 
 
-# Descriptions: use size based filter
-#      History:
+# Descriptions: use size based filter.
+#      History: no
 #        Value: yes / no
 #     Examples:
 use_article_size_filter	=	yes
@@ -1127,7 +1133,8 @@ article_size_filter_rules	=	check_header_size
 
 
 # Descriptions: use header based filter ?
-#      History:
+#      History: disabled by default.
+#               "yes" always if $USE_DISTRIBUTE_FILTER is yes.
 #        Value: yes / no
 #     Examples:
 use_article_header_filter		=	yes
@@ -1136,7 +1143,7 @@ use_article_header_filter		=	yes
 # Descriptions: header filter rules.
 #               first match. 
 #               permit post if no rule matched.
-#      History:
+#      History: fml4 has no check_date rule.
 #        Value:
 #     Examples:
 article_header_filter_rules		=	check_message_id
@@ -1148,7 +1155,8 @@ article_header_filter_rules		=	check_message_id
 
 
 # Descriptions: dummy
-#      History: !MIME of 4.0 content filter
+#      History: disabled by default.
+#		!MIME of 4.0 content filter.
 #        Value: yes / no
 #     Examples:
 use_article_non_mime_filter		=	yes
@@ -1162,7 +1170,7 @@ article_non_mime_filter_rules		=	permit
 
 
 # Descriptions: MIME structure based filter
-#      History: 4.0 content filter
+#      History: 4.0 content filter. disabled by default.
 #        Value: yes / no
 #     Examples:
 use_article_mime_component_filter	=	yes
@@ -1180,7 +1188,9 @@ article_mime_component_filter_rules	= $fml_config_dir/mime_component_filter
 
 
 # Descriptions: use text/plain filter, which is a simple syntax checker.
-#      History: 4.0's EnvelopeFilter
+#      History: 4.0's EnvelopeFilter.
+#		half of the following rules applied when
+#		$USE_DISTRIBUTE_FILTER is enabled.
 #        Value: yes / no
 #     Examples:
 use_article_text_plain_filter		=	yes
@@ -1189,7 +1199,27 @@ use_article_text_plain_filter		=	yes
 # Descriptions: filter rules of text/plain filter.
 #               first match.
 #               permit post if no rule matched.
-#      History:
+#      History: See kern/libenvf.pl for more detail.
+#		[DISABLED BY DEFAULT]
+#
+#			reject_not_iso2022jp_japanese_string
+#				<=> FILTER_ATTR_REJECT_INVALID_JAPANESE
+#			reject_old_fml_command_syntax
+#				<=> FILTER_ATTR_REJECT_COMMAND
+#			reject_japanese_command_syntax
+#				<=> FILTER_ATTR_REJECT_2BYTES_COMMAND
+#
+#		[ENABLED BY DEFAULT]
+#
+#			reject_null_mail_body
+#				<=> FILTER_ATTR_REJECT_NULL_BODY
+#			reject_invalid_fml_command_syntax
+#				<=> FILTER_ATTR_REJECT_INVALID_COMMAND
+#			reject_one_line_message
+#				<=> FILTER_ATTR_REJECT_ONE_LINE_BODY
+#			reject_ms_guid
+#				<=> FILTER_ATTR_REJECT_MS_GUID
+#
 #         Note: permit by default 
 #        Value:
 #     Examples:
@@ -1207,14 +1237,20 @@ article_text_plain_filter_rules	=	reject_not_iso2022jp_japanese_string
 
 
 # Descriptions: infor the filter rejection ?
-#      History: hard-coded in fml 4.0
+#      History: halfly hard-coded in fml 4.0.
+#		notice is always sent to maintainer, 
+#		but not to sender by default.
+#		$FILTER_NOTIFY_REJECTION controlls notice to sender.
 #        Value: yes / no
 #     Examples: yes
 use_article_filter_reject_notice	=	yes
 
 
 # Descriptions: recipients to inform
-#      History: hard-coded in fml 4.0
+#      History: halfly hard-coded in fml 4.0.
+#		notice is always sent to maintainer, 
+#		but not to sender by default.
+#		$FILTER_NOTIFY_REJECTION controlls notice to sender.
 #        Value: maintainer | sender
 #     Examples: maintainer sender
 article_filter_reject_notice_recipients	=	maintainer
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 8d2a3869..65701a84 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -1130,9 +1130,13 @@ outgoing_article_body_size_limit	= $default_mail_body_size_limit
 
 
 # Descriptions:
-#      History:
-#        Value:
-#     Examples:
+#      History: fml8 では、いくつかのフィルタや制限が整理統合された。
+#		fml4 では、おおむね次の３つの機能に相当している。
+#		$USE_DISTRIBUTE_FILTER
+#		$INCOMING_MAIL_SIZE_LIMIT
+#		ADD_CONTENT_HANDLER()
+#        Value: yes / no
+#     Examples: yes
 use_article_filter	= 	yes
  
 
@@ -1151,7 +1155,7 @@ article_filter_functions	=	article_size_filter
 
 
 # Descriptions: サイズ情報を根拠にしたフィルタリングをするか？
-#      History:
+#      History: no
 #        Value: yes / no
 #     Examples:
 use_article_size_filter	=	yes
@@ -1171,7 +1175,8 @@ article_size_filter_rules	=	check_header_size
 
 
 # Descriptions: ヘッダ情報を根拠にしたフィルタリングをするか？
-#      History:
+#      History: disabled by default.
+#               "yes" always if $USE_DISTRIBUTE_FILTER is yes.
 #        Value: yes / no
 #     Examples:
 use_article_header_filter		=	yes
@@ -1179,7 +1184,7 @@ use_article_header_filter		=	yes
 
 # Descriptions: フィルタリングのルール。
 #               どのルールにもマッチしないなら、記事の投稿は認められる。
-#      History:
+#      History: check_date に該当するものはない。
 #        Value:
 #     Examples:
 article_header_filter_rules		=	check_message_id
@@ -1191,7 +1196,8 @@ article_header_filter_rules		=	check_message_id
 
 
 # Descriptions: とりあえず、だみ〜
-#      History: 4.0 の content filter で、!MIME にあたる部分
+#      History: 4.0 の content filter で、!MIME にあたる部分。
+#		よって、デフォルトでは no ということになる。
 #        Value: yes / no
 #     Examples:
 use_article_non_mime_filter		=	yes
@@ -1206,7 +1212,7 @@ article_non_mime_filter_rules		=	reject_empty_content_type
 
 
 # Descriptions: MIME の構造に基づいたフィルタを行なう
-#      History: 4.0 の content filter 相当
+#      History: 4.0 の content filter 相当。デフォルトでは no だ。
 #        Value: yes / no
 #     Examples:
 use_article_mime_component_filter	=	yes
@@ -1225,7 +1231,9 @@ article_mime_component_filter_rules	= $fml_config_dir/mime_component_filter
 
 # Descriptions: 先頭の text/plain 部分に対するフィルタ。
 #		簡単なシンタックスチェック
-#      History: 4.0 の EnvelopeFilter 相当
+#      History: 4.0 の EnvelopeFilter 相当。
+#		$USE_DISTRIBUTE_FILTER が yes の場合、
+#		以下のルールの半分くらいが自動的に適用されていた。
 #        Value: yes / no
 #     Examples:
 use_article_text_plain_filter		=	yes
@@ -1233,7 +1241,27 @@ use_article_text_plain_filter		=	yes
 
 # Descriptions: テキスト部分へのフィルタリングのルール。
 #               正確には弾くべき特別なもののルール(マッチしないなら通す)
-#      History:
+#      History: See kern/libenvf.pl for more detail.
+#		[DISABLED BY DEFAULT]
+#
+#			reject_not_iso2022jp_japanese_string
+#				<=> FILTER_ATTR_REJECT_INVALID_JAPANESE
+#			reject_old_fml_command_syntax
+#				<=> FILTER_ATTR_REJECT_COMMAND
+#			reject_japanese_command_syntax
+#				<=> FILTER_ATTR_REJECT_2BYTES_COMMAND
+#
+#		[ENABLED BY DEFAULT]
+#
+#			reject_null_mail_body
+#				<=> FILTER_ATTR_REJECT_NULL_BODY
+#			reject_invalid_fml_command_syntax
+#				<=> FILTER_ATTR_REJECT_INVALID_COMMAND
+#			reject_one_line_message
+#				<=> FILTER_ATTR_REJECT_ONE_LINE_BODY
+#			reject_ms_guid
+#				<=> FILTER_ATTR_REJECT_MS_GUID
+#
 #         Note: permit by default 
 #        Value:
 #     Examples:
@@ -1251,14 +1279,18 @@ article_text_plain_filter_rules	=	reject_not_iso2022jp_japanese_string
 
 
 # Descriptions: フィルタで弾かれたことを教える
-#      History: 4.0 ではハードコードだったような…
+#      History: maintainer には常に弾かれたことを知らせるが、
+#		sender に対しては $FILTER_NOTIFY_REJECTION (= 0 by default)。
+#		デフォルトでは、管理者にのみ知らせる。
 #        Value: yes / no
 #     Examples: yes
 use_article_filter_reject_notice	=	yes
 
 
 # Descriptions: エラーのお知らせの受信者
-#      History: 4.0 ではハードコードだったような…
+#      History: 4.0 では maintainer あてはハードコーデイングで常に知らせる。
+#		sender 宛ては $FILTER_NOTIFY_REJECTION で制御されていて
+#		デフォルトでは知らせない。
 #        Value: maintainer | sender
 #     Examples: maintainer sender
 article_filter_reject_notice_recipients	=	maintainer