regen: new systematic value definitions

2 files changed, 93 insertions, 42 deletions

diff --git a/fml/doc/en/tutorial/variables/filter.rules.sgml b/fml/doc/en/tutorial/variables/filter.rules.sgml
index cb2c5533..4670d3b1 100644
--- a/fml/doc/en/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/en/tutorial/variables/filter.rules.sgml
@@ -5,7 +5,7 @@
 #               when the filter system rejects.
 #               We prefer string not mime/multipart to avoid parsing by MUA.
 #      History: string in 4.0.
-#        Value: multipart / string
+#        Value: SELECT ( multipart string )
 #     Examples: string
 article_post_restrictions_reject_notice_data_type	=	string
 
@@ -21,14 +21,22 @@ article_post_restrictions_reject_notice_data_type	=	string
 #			$INCOMING_MAIL_SIZE_LIMIT
 #			ADD_CONTENT_HANDLER()
 #		functions.
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples: yes
 use_article_filter	= 	yes
  
 
 # Descriptions:
 #      History:
-#        Value:
+#        Value: MIX (
+#			article_size_filter
+#			article_header_filter
+#			article_non_mime_filter
+#			article_mime_component_filter
+#			article_text_plain_filter
+#			article_spam_filter
+#			article_virus_filter
+#		)
 #     Examples:
 article_filter_functions	=	article_size_filter
 					article_header_filter
@@ -44,7 +52,7 @@ article_filter_functions	=	article_size_filter
 
 # Descriptions: use size based filter.
 #      History: no
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_article_size_filter	=	yes
 
@@ -53,7 +61,10 @@ use_article_size_filter	=	yes
 #               first match. 
 #               permit post if no rule matched.
 #      History:
-#        Value:
+#        Value: MIX (	check_header_size
+#			check_body_size
+#			permit
+#		)
 #     Examples:
 article_size_filter_rules	=	check_header_size
 					check_body_size
@@ -66,7 +77,7 @@ article_size_filter_rules	=	check_header_size
 # Descriptions: use header based filter ?
 #      History: disabled by default.
 #               "yes" always if $USE_DISTRIBUTE_FILTER is yes.
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_article_header_filter		=	yes
 
@@ -75,7 +86,11 @@ use_article_header_filter		=	yes
 #               first match. 
 #               permit post if no rule matched.
 #      History: fml4 has no check_date rule.
-#        Value:
+#        Value: MIX (
+#			check_message_id
+#			check_date
+#			permit
+#		)
 #     Examples:
 article_header_filter_rules		=	check_message_id
 						check_date
@@ -88,28 +103,28 @@ article_header_filter_rules		=	check_message_id
 # Descriptions: dummy
 #      History: disabled by default.
 #		!MIME of 4.0 content filter.
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_article_non_mime_filter		=	yes
 
 
 # Descriptions: dummy
 #      History:
-#        Value: permit / reject
+#        Value: MIX ( permit reject_empty_content_type )
 #     Examples: permit
 article_non_mime_filter_rules		=	permit
 
 
 # Descriptions: MIME structure based filter
 #      History: 4.0 content filter. disabled by default.
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_article_mime_component_filter	=	yes
 
 
 # Descriptions: file of filter rules
 #      History: @CONTENT_HANDLER
-#        Value:
+#        Value: FILE
 #     Examples:
 article_mime_component_filter_rules	= $fml_config_dir/mime_component_filter
 
@@ -120,7 +135,7 @@ article_mime_component_filter_rules	= $fml_config_dir/mime_component_filter
 #      History: 4.0's EnvelopeFilter.
 #		half of the following rules applied when
 #		$USE_DISTRIBUTE_FILTER is enabled.
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_article_text_plain_filter		=	yes
 
@@ -150,7 +165,16 @@ use_article_text_plain_filter		=	yes
 #				<=> FILTER_ATTR_REJECT_MS_GUID
 #
 #         Note: permit by default 
-#        Value:
+#        Value: MIX (
+#			reject_not_iso2022jp_japanese_string
+#			reject_null_mail_body
+#			reject_one_line_message
+#			reject_old_fml_command_syntax
+#			reject_invalid_fml_command_syntax
+#			reject_japanese_command_syntax
+#			reject_ms_guid
+#			permit
+#		)
 #     Examples:
 article_text_plain_filter_rules	=	reject_not_iso2022jp_japanese_string
 					reject_null_mail_body
@@ -169,14 +193,14 @@ article_text_plain_filter_rules	=	reject_not_iso2022jp_japanese_string
 #		disabled by default.
 #		add flag to header and go through if the message looks a spam.
 #      History: none
-#        Value: yes | no
+#        Value: YES_OR_NO
 #     Examples: no
 use_article_spam_filter		=	no
 
 
 # Descriptions: action if the message looks a spam.
 #      History: none
-#        Value: reject | ignore | header_rewrite
+#        Value: MIX ( reject ignore header_rewrite )
 #     Examples: header_rewrite
 article_spam_filter_rules	=	header_rewrite
 
@@ -184,21 +208,21 @@ article_spam_filter_rules	=	header_rewrite
 # Descriptions: external spam checker.
 #		if plural drivers specified, try them sequentially.
 #      History: none
-#        Value: spamassasin | spamc | bogofilter
+#        Value: MIX ( spamassasin spamc bogofilter )
 #     Examples: bogofilter
 article_spam_filter_drivers	=	bogofilter
 
 
 # Descriptions: external virus checker. disabled by default.
 #      History: none
-#        Value: yes | no
+#        Value: YES_OR_NO
 #     Examples: no
 use_article_virus_filter	=	no
 
 
 # Descriptions: action if virus found.
 #      History: none
-#        Value: reject | ignore | header_rewrite
+#        Value: MIX ( reject ignore header_rewrite )
 #     Examples: reject
 article_virus_filter_rules	=	reject
 
@@ -206,7 +230,7 @@ article_virus_filter_rules	=	reject
 # Descriptions: external virus checker.
 #		if plural drivers specified, try them sequentially.
 #      History: none
-#        Value: clamscan 
+#        Value: MIX ( clamscan )
 #     Examples: clamscan
 article_virus_filter_drivers	=	clamscan
 
@@ -218,7 +242,7 @@ article_virus_filter_drivers	=	clamscan
 #		notice is always sent to maintainer, 
 #		but not to sender by default.
 #		$FILTER_NOTIFY_REJECTION controlls notice to sender.
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples: yes
 use_article_filter_reject_notice	=	yes
 
@@ -228,7 +252,7 @@ use_article_filter_reject_notice	=	yes
 #		notice is always sent to maintainer, 
 #		but not to sender by default.
 #		$FILTER_NOTIFY_REJECTION controlls notice to sender.
-#        Value: maintainer | sender
+#        Value: MIX ( maintainer sender )
 #     Examples: maintainer sender
 article_filter_reject_notice_recipients	=	maintainer
 						sender
@@ -237,42 +261,42 @@ article_filter_reject_notice_recipients	=	maintainer
 # Descriptions: how fml refer the rejeced message.
 #               We prefer string not multipart to avoid parsing of MUA.
 #      History: string in fml 4.0.
-#        Value: multipart / string
+#        Value: SELECT ( multipart string )
 #     Examples: string
 article_filter_reject_notice_data_type	=	string
 
 
 # Descriptions:
 #      History:
-#        Value:
+#        Value: YES_OR_NO
 #     Examples:
 use_article_spam_filter		=	no
 
 
 # Descriptions: list up driver names used as spam checker.
 #      History: none
-#        Value: spamassassin | spamc | bogofilter
+#        Value: MIX ( spamassassin spamc bogofilter )
 #     Examples: bogofilter
 article_spam_filter_functions	=	bogofilter
 
 
 # Descriptions: exit non-zero status code when spam caught if "-e" specified.
 #      History: none
-#        Value: STR
+#        Value: COMMAND_LINE_OPTIONS
 #     Examples: -e
 article_spam_filter_spamassassin_options	=	-e
 
 
 # Descriptions: spamc optoins. "-c" means check only.
 #      History: none
-#        Value: STR
+#        Value: COMMAND_LINE_OPTIONS
 #     Examples: -c
 article_spam_filter_spamc_options		=	-c
 
 
 # Descriptions: "-e" implies embedded mode.
 #      History: none
-#        Value: STR
+#        Value: COMMAND_LINE_OPTIONS
 #     Examples: -e
 article_spam_filter_bogofilter_options		=	-e
 
@@ -282,14 +306,14 @@ article_spam_filter_bogofilter_options		=	-e
 
 # Descriptions:
 #      History:
-#        Value:
+#        Value: YES_OR_NO
 #     Examples:
 use_command_mail_filter	= 	yes
  
 
 # Descriptions:
 #      History:
-#        Value:
+#        Value: MIX ( command_mail_size_filter )
 #     Examples:
 command_mail_filter_functions	=	command_mail_size_filter
 
@@ -299,7 +323,7 @@ command_mail_filter_functions	=	command_mail_size_filter
 
 # Descriptions: use size based filter
 #      History:
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_command_mail_size_filter	=	yes
 
@@ -308,7 +332,13 @@ use_command_mail_size_filter	=	yes
 #               first match.
 #               permit if no rule matched.
 #      History:
-#        Value:
+#        Value: MIX (
+#			check_header_size
+#			check_body_size
+#			check_command_limit
+#			check_line_length_limit
+#			permit
+#		)
 #     Examples:
 command_mail_size_filter_rules	=	check_header_size
 					check_body_size
@@ -322,14 +352,14 @@ command_mail_size_filter_rules	=	check_header_size
 
 # Descriptions: inform filter rejection ?
 #      History: hard-coded.
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples: yes
 use_command_mail_filter_reject_notice	=	yes
 
 
 # Descriptions: recipients to inform
 #      History: hard-coded.
-#        Value: maintainer | sender
+#        Value: MIX ( maintainer sender )
 #     Examples: maintainer sender
 command_mail_filter_reject_notice_recipients	=	maintainer
 							sender
@@ -338,10 +368,14 @@ command_mail_filter_reject_notice_recipients	=	maintainer
 # Descriptions: how fml refer the rejeced message.
 #               We prefer string not multipart to avoid parsing of MUA.
 #      History: string in fml 4.0.
-#        Value: multipart / string
+#        Value: SELECT ( multipart string )
 #     Examples: string
 command_mail_filter_reject_notice_data_type	=	string
 
+# Descriptions:
+#      History:
+#        Value: FILE
+#     Examples:
 path_bogofilter           = @BOGOFILTER@
 
 # $article_digest_finish_end_hook = q{ 1;};
diff --git a/fml/doc/en/tutorial/variables/filter.size.sgml b/fml/doc/en/tutorial/variables/filter.size.sgml
index 4e5db296..1fa58901 100644
--- a/fml/doc/en/tutorial/variables/filter.size.sgml
+++ b/fml/doc/en/tutorial/variables/filter.size.sgml
@@ -35,7 +35,7 @@ outgoing_mail_cache_size	=	128
 
 # Descriptions: log rotation policy. 
 #      History: none
-#        Value: size | interval
+#        Value: SELECT ( size interval )
 #     Examples: size
 log_rotate_policy	=	size
 
@@ -80,7 +80,15 @@ outgoing_article_body_size_limit	= $default_mail_body_size_limit
 
 # Descriptions:
 #      History:
-#        Value:
+#        Value: MIX (
+#			article_size_filter
+#			article_header_filter
+#			article_non_mime_filter
+#			article_mime_component_filter
+#			article_text_plain_filter
+#			article_spam_filter
+#			article_virus_filter
+#		)
 #     Examples:
 article_filter_functions	=	article_size_filter
 					article_header_filter
@@ -96,7 +104,7 @@ article_filter_functions	=	article_size_filter
 
 # Descriptions: use size based filter.
 #      History: no
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_article_size_filter	=	yes
 
@@ -105,7 +113,10 @@ use_article_size_filter	=	yes
 #               first match. 
 #               permit post if no rule matched.
 #      History:
-#        Value:
+#        Value: MIX (	check_header_size
+#			check_body_size
+#			permit
+#		)
 #     Examples:
 article_size_filter_rules	=	check_header_size
 					check_body_size
@@ -146,7 +157,7 @@ outgoing_command_mail_body_size_limit	= $default_mail_body_size_limit
 
 # Descriptions:
 #      History:
-#        Value:
+#        Value: MIX ( command_mail_size_filter )
 #     Examples:
 command_mail_filter_functions	=	command_mail_size_filter
 
@@ -156,7 +167,7 @@ command_mail_filter_functions	=	command_mail_size_filter
 
 # Descriptions: use size based filter
 #      History:
-#        Value: yes / no
+#        Value: YES_OR_NO
 #     Examples:
 use_command_mail_size_filter	=	yes
 
@@ -165,7 +176,13 @@ use_command_mail_size_filter	=	yes
 #               first match.
 #               permit if no rule matched.
 #      History:
-#        Value:
+#        Value: MIX (
+#			check_header_size
+#			check_body_size
+#			check_command_limit
+#			check_line_length_limit
+#			permit
+#		)
 #     Examples:
 command_mail_size_filter_rules	=	check_header_size
 					check_body_size
@@ -177,7 +194,7 @@ command_mail_size_filter_rules	=	check_header_size
 # Descriptions: cache size.
 #		it implies days if the cache mode is temporal.
 #      History: none
-#        Value: number
+#        Value: NUM
 #     Examples: 
 error_mail_analyzer_cache_size		=	14