[*_program -> *_function]

$use_command_mail_program   -> $use_command_mail_function
$use_digest_program         -> $use_article_digest_function
$use_distribute_program	    -> $use_article_post_function
$use_error_analyzer_program -> $use_error_mail_analyzer_function

[command list]

$commands_for_user            -> $user_command_mail_allowed_commands
$commands_for_stranger        -> $anonymous_command_mail_allowed_commands
$commands_for_privileged_user -> $admin_command_mail_allowed_commands
$commands_for_admin_cgi	      -> $admin_cgi_allowed_commands

[restrictions]

$post_restrictions -> $article_post_restrictions
$post_restrictions_reject_notice_data_type
-> $article_post_restrictions_reject_notice_data_type

$command_restrictions -> $command_mail_restrictions
permit_commands_for_stranger -> permit_anonymous_command_mail

$admin_command_restrictions -> $admin_command_mail_restrictions

12 files changed, 48 insertions, 45 deletions

diff --git a/fml/etc/src/config.cf.en/acl.cf b/fml/etc/src/config.cf.en/acl.cf
index fd6b877f..b17fe05c 100644
--- a/fml/etc/src/config.cf.en/acl.cf
+++ b/fml/etc/src/config.cf.en/acl.cf
@@ -27,24 +27,24 @@ address_compare_function_type = user_part_case_insensitive
 #			reject
 #		)
 #     Examples:
-post_restrictions	=	reject_system_special_accounts
-				permit_member_maps
-				reject
+article_post_restrictions	=	reject_system_special_accounts
+					permit_member_maps
+					reject
 
 # Descriptions: restrictions for command mail
 #      History: fml 4.0's PERMIT_COMMAND_FROM + REJECT_ADDR
 #        Value: list of attributes (
 #			permit_anyone
-#			permit_commands_for_stranger
+#			permit_anonymous_command_mail
 #			permit_member_maps
 #			reject_system_special_accounts
 #			reject
 #		)
 #     Examples:
-command_restrictions	=	reject_system_special_accounts
-				permit_commands_for_stranger
-				permit_member_maps
-				reject
+command_mail_restrictions	=	reject_system_special_accounts
+					permit_anonymous_command_mail
+					permit_member_maps
+					reject
 
 
 # Descriptions: restrictions for admin command mail
@@ -62,7 +62,7 @@ command_restrictions	=	reject_system_special_accounts
 #		2. password auth (members-admin + password)
 #			check_admin_member_password reject
 #
-admin_command_restrictions	=	reject_system_special_accounts
+admin_command_mail_restrictions	=	reject_system_special_accounts
 					check_admin_member_password
 					reject
 
diff --git a/fml/etc/src/config.cf.en/article.cf b/fml/etc/src/config.cf.en/article.cf
index 0ce282d6..e30e1131 100644
--- a/fml/etc/src/config.cf.en/article.cf
+++ b/fml/etc/src/config.cf.en/article.cf
@@ -19,7 +19,7 @@ article_sequence_file	= $sequence_file
 #      History: string in 4.0.
 #        Value: multipart / string
 #     Examples: string
-post_restrictions_reject_notice_data_type	=	string
+article_post_restrictions_reject_notice_data_type	=	string
 
 
 =head2	size limit
diff --git a/fml/etc/src/config.cf.en/command.cf b/fml/etc/src/config.cf.en/command.cf
index ddc2a419..a83dc965 100644
--- a/fml/etc/src/config.cf.en/command.cf
+++ b/fml/etc/src/config.cf.en/command.cf
@@ -5,9 +5,10 @@
 
 # Descriptions: use commnd mail ?
 #      History: none
+#		use_command_mail_program (fml8 pre alpha)
 #        Value: yes
 #     Examples: yes / no
-use_command_mail_program	=	yes
+use_command_mail_function = ${use_command_mail_program:-yes}
 
 
 =head2	size limit
@@ -153,7 +154,7 @@ unsubscribe_command_auth_type	=	confirmation
 #      History: @PERMIT_PROCEDURE @DENY_PROCEDURE
 #        Value:
 #     Examples:
-commands_for_user	=		help
+user_command_mail_allowed_commands	=		help
 					get
 					mget
 					get
@@ -178,7 +179,7 @@ commands_for_user	=		help
 					summary
 
 
-commands_for_stranger	=		guide
+anonymous_command_mail_allowed_commands	=		guide
 					info
 					add
 					subscribe
@@ -186,7 +187,7 @@ commands_for_stranger	=		guide
 					$confirm_command_prefix
 
 
-commands_for_privileged_user	=	subscribe
+admin_command_mail_allowed_commands	=	subscribe
 					add
 					unsubscribe
 					bye
@@ -216,9 +217,7 @@ commands_for_privileged_user	=	subscribe
 					list
 
 
-commands_for_admin	=		$commands_for_privileged_user
-
-commands_for_admin_cgi	=		adduser
+admin_cgi_allowed_commands	=		adduser
 					deluser
 					addadmin
 					deladmin
diff --git a/fml/etc/src/config.cf.en/digest.cf b/fml/etc/src/config.cf.en/digest.cf
index ccf06529..2e9fac1f 100644
--- a/fml/etc/src/config.cf.en/digest.cf
+++ b/fml/etc/src/config.cf.en/digest.cf
@@ -2,10 +2,11 @@
 
 
 # Descriptions:
-#      History:
+#      History: none
+#		use_digest_program (fml8 pre alpha)
 #        Value:
 #     Examples:
-use_digest_program	=	yes
+use_article_digest_function = ${use_digest_program:-yes}
 
 
 # Descriptions: file to store the last sequence to deliver
diff --git a/fml/etc/src/config.cf.en/distribute.cf b/fml/etc/src/config.cf.en/distribute.cf
index 14ba109d..aa4ed183 100644
--- a/fml/etc/src/config.cf.en/distribute.cf
+++ b/fml/etc/src/config.cf.en/distribute.cf
@@ -5,8 +5,8 @@
 
 # Descriptions: use function of article delivery
 #      History: none
+#		use_distribute_program (fml8 pre alpha)
 #        Value: yes
 #     Examples: yes / no
-use_distribute_program	=	yes
-
+use_article_post_function = ${use_distribute_program:-yes}
 
diff --git a/fml/etc/src/config.cf.en/error.cf b/fml/etc/src/config.cf.en/error.cf
index 08c32a54..a316c911 100644
--- a/fml/etc/src/config.cf.en/error.cf
+++ b/fml/etc/src/config.cf.en/error.cf
@@ -17,10 +17,10 @@ maintainer_recipient_maps	=
 
 # Descriptions: use error message analyzer ?
 #      History: none
+#		use_error_analyzer_program (fml8 pre alpha)
 #        Value: yes
 #     Examples: yes / no
-use_error_analyzer_program	=	yes
-
+use_error_mail_analyzer_function = ${use_error_analyzer_program:-yes}
 
 =head2	cache
 
diff --git a/fml/etc/src/config.cf.ja/acl.cf b/fml/etc/src/config.cf.ja/acl.cf
index 4278736c..41098a9b 100644
--- a/fml/etc/src/config.cf.ja/acl.cf
+++ b/fml/etc/src/config.cf.ja/acl.cf
@@ -31,24 +31,24 @@ address_compare_function_type = user_part_case_insensitive
 #			reject
 #		)
 #     Examples:
-post_restrictions	=	reject_system_special_accounts
-				permit_member_maps
-				reject
+article_post_restrictions	=	reject_system_special_accounts
+					permit_member_maps
+					reject
 
 # Descriptions: コマンドへの制限
 #      History: fml 4.0 の PERMIT_COMMAND_FROM と REJECT_ADDR を合体したもの
 #        Value: list of attributes (
 #			permit_anyone
-#			permit_commands_for_stranger
+#			permit_anonymous_command_mail
 #			permit_member_maps
 #			reject_system_special_accounts
 #			reject
 #		)
 #     Examples:
-command_restrictions	=	reject_system_special_accounts
-				permit_commands_for_stranger
-				permit_member_maps
-				reject
+command_mail_restrictions	=	reject_system_special_accounts
+					permit_anonymous_command_mail
+					permit_member_maps
+					reject
 
 
 # Descriptions: admin コマンドへの制限
@@ -66,7 +66,7 @@ command_restrictions	=	reject_system_special_accounts
 #		2. パスワード認証 (members-admin ＆＆パスワード認証)
 #			check_admin_member_password reject
 #
-admin_command_restrictions	=	reject_system_special_accounts
+admin_command_mail_restrictions	=	reject_system_special_accounts
 					check_admin_member_password
 					reject
 
diff --git a/fml/etc/src/config.cf.ja/article.cf b/fml/etc/src/config.cf.ja/article.cf
index d254c2e1..23e8ab67 100644
--- a/fml/etc/src/config.cf.ja/article.cf
+++ b/fml/etc/src/config.cf.ja/article.cf
@@ -18,7 +18,7 @@ article_sequence_file	= $sequence_file
 #      History: 4.0 では文字列で、これはハードコーディングされていた。
 #        Value: multipart / string
 #     Examples: string
-post_restrictions_reject_notice_data_type	=	string
+article_post_restrictions_reject_notice_data_type	=	string
 
 
 =head2	サイズ制限
diff --git a/fml/etc/src/config.cf.ja/command.cf b/fml/etc/src/config.cf.ja/command.cf
index 1f7aaaea..67bb5567 100644
--- a/fml/etc/src/config.cf.ja/command.cf
+++ b/fml/etc/src/config.cf.ja/command.cf
@@ -5,9 +5,11 @@
 
 # Descriptions: コマンドメールを使うか？
 #      History: なし
+#		$use_command_mail_program (fml8 pre alpha)
 #        Value: yes
 #     Examples: yes / no
-use_command_mail_program	=	yes
+use_command_mail_function = ${use_command_mail_program:-yes}
+
 
 
 =head2	コマンド プロンプト
@@ -183,7 +185,7 @@ listinfo_dir	= $listinfo_base_dir/$ml_domain/$ml_name
 #               変更を加える
 #        Value:
 #     Examples:
-commands_for_user	=		help
+user_command_mail_allowed_commands	=		help
 					get
 					mget
 					get
@@ -208,7 +210,7 @@ commands_for_user	=		help
 					summary
 
 
-commands_for_stranger	=		guide
+anonymous_command_mail_allowed_commands	=		guide
 					info
 					add
 					subscribe
@@ -216,7 +218,7 @@ commands_for_stranger	=		guide
 					$confirm_command_prefix
 
 
-commands_for_privileged_user	=	subscribe
+admin_command_mail_allowed_commands	=	subscribe
 					add
 					unsubscribe
 					bye
@@ -246,9 +248,7 @@ commands_for_privileged_user	=	subscribe
 					list
 
 
-commands_for_admin	=		$commands_for_privileged_user
-
-commands_for_admin_cgi	=		adduser
+admin_cgi_allowed_commands	=		adduser
 					deluser
 					addadmin
 					deladmin
diff --git a/fml/etc/src/config.cf.ja/digest.cf b/fml/etc/src/config.cf.ja/digest.cf
index 62ae0622..8e329198 100644
--- a/fml/etc/src/config.cf.ja/digest.cf
+++ b/fml/etc/src/config.cf.ja/digest.cf
@@ -2,11 +2,11 @@
 
 
 # Descriptions:
-#      History:
+#      History: none
+#		use_digest_program (fml8 pre alpha)
 #        Value:
 #     Examples:
-use_digest_program	=	yes
-
+use_article_digest_function = ${use_digest_program:-yes}
 
 # Descriptions: まとめ送りした最後の記事番号を保存するファイル
 #      History: fml4 では各自それぞれの番号を保存していた。
diff --git a/fml/etc/src/config.cf.ja/distribute.cf b/fml/etc/src/config.cf.ja/distribute.cf
index 9996548f..34b5fee4 100644
--- a/fml/etc/src/config.cf.ja/distribute.cf
+++ b/fml/etc/src/config.cf.ja/distribute.cf
@@ -5,8 +5,10 @@
 
 # Descriptions: 記事の配送処理プログラムをそもそも使うか？
 #      History: なし
+#	 	$use_distribute_program (fml8 pre alpha) 
 #        Value: yes
 #     Examples: yes / no
-use_distribute_program	=	yes
+use_article_post_function = ${use_distribute_program:-yes}
+
 
 
diff --git a/fml/etc/src/config.cf.ja/error.cf b/fml/etc/src/config.cf.ja/error.cf
index 314b6434..410eb193 100644
--- a/fml/etc/src/config.cf.ja/error.cf
+++ b/fml/etc/src/config.cf.ja/error.cf
@@ -18,9 +18,10 @@ maintainer_recipient_maps	=
 
 # Descriptions: エラー解析プログラムを使うか？
 #      History: なし
+#		use_error_analyzer_program (fml8 pre alpha)
 #        Value: yes
 #     Examples: yes / no
-use_error_analyzer_program	=	yes
+use_error_mail_analyzer_function = ${use_error_analyzer_program:-yes}
 
 
 =head2	キャッシュ