regen

2 files changed, 74 insertions, 19 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 2ab19e44..e2c0f5a2 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -849,23 +849,41 @@ ml_local_message_template_dir	= $ml_local_share_dir/message
 
 
 # Descriptions: help file
-#      History:
+#      History: $HELP_FILE
 #        Value: FILE
-#     Examples:
+#     Examples: /var/spool/ml/elena/help
 help_file		=	$ml_home_dir/help
 
-# Descriptions: guilde file
-#      History:
+
+# Descriptions: guide file
+#      History: $GUIDE_FILE
 #        Value: FILE
-#     Examples:
+#     Examples: /var/spool/ml/elena/guide
 guide_file		=	$ml_home_dir/guide
 
+
 # Descriptions: objective file
-#      History:
+#      History: $OBJECTIVE_FILE
 #        Value: FILE
-#     Examples:
+#     Examples: /var/spool/ml/elena/objective
 objective_file		=	$ml_home_dir/objective
 
+
+# Descriptions: welcome file
+#      History: $WELCOME_FILE
+#        Value: FILE
+#     Examples: /var/spool/ml/elena/welcome
+welcome_file		=	$ml_home_dir/welcome
+
+
+# Descriptions: deny file
+#      History: $DENY_FILE
+#        Value: FILE
+#     Examples: /var/spool/ml/elena/deny
+deny_file		=	$ml_home_dir/deny
+
+
+
 =head1	header manipulation
 
 
@@ -1177,7 +1195,9 @@ lock_type	= flock
 #     Examples:
 use_log		=	yes
 
-# Descriptions: log file
+# Descriptions: log file.
+#               You can use % format strftime(3) can recognize
+#               (e.g. log.%C%y%m%d).
 #      History: $LOGFILE
 #        Value: FILE
 #     Examples:
@@ -2978,6 +2998,13 @@ use_moderate_function	=	yes
 moderate_queue_dir = $var_dir/mail/queue-moderate
 
 
+# Descriptions: expire submitted queue after $moderate_expire_limit.
+#      History: $MODERATOR_EXPIRE_LIMIT
+#        Value: TIME
+#     Examples: 14d
+moderate_queue_expire_limit	=	14d
+
+
 
 =head1 CREATE-ON-POST
 
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index a3db39fe..05b2d4fa 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -879,23 +879,41 @@ ml_local_message_template_dir	= $ml_local_share_dir/message
 
 
 # Descriptions: ヘルプファイル
-#      History:
+#      History: $HELP_FILE
 #        Value: FILE
-#     Examples:
+#     Examples: /var/spool/ml/elena/help
 help_file		=	$ml_home_dir/help
 
-# Descriptions: ヘルプファイル
-#      History:
+
+# Descriptions: GUIDE ファイル
+#      History: $GUIDE_FILE
 #        Value: FILE
-#     Examples:
+#     Examples: /var/spool/ml/elena/guide
 guide_file		=	$ml_home_dir/guide
 
-# Descriptions: ヘルプファイル
-#      History:
+
+# Descriptions: objective ファイル
+#      History: $OBJECTIVE_FILE
 #        Value: FILE
-#     Examples:
+#     Examples: /var/spool/ml/elena/objective
 objective_file		=	$ml_home_dir/objective
 
+
+# Descriptions: welcome ファイル
+#      History: $WELCOME_FILE
+#        Value: FILE
+#     Examples: /var/spool/ml/elena/welcome
+welcome_file		=	$ml_home_dir/welcome
+
+
+# Descriptions: deny ファイル
+#      History: $DENY_FILE
+#        Value: FILE
+#     Examples: /var/spool/ml/elena/deny
+deny_file		=	$ml_home_dir/deny
+
+
+
 =head1	ヘッダの操作
 
 
@@ -1212,8 +1230,10 @@ lock_type	= flock
 #     Examples:
 use_log		=	yes
 
-# Descriptions: ML 固有のログファイル
-#      History: fml 4.0 の $LOGFILE
+# Descriptions: ML 固有のログファイル。
+#               strftime(3) で使用可能な文字列を使うことも可能
+#               (例: log.%C%y%m%d)。
+#      History: fml 4.0 の $LOGFILE と $LOGFILE_SUFFIX
 #        Value: FILE
 #     Examples:
 log_file	=	$ml_home_dir/log
@@ -2100,7 +2120,7 @@ use_command_mail_function = ${use_command_mail_program:-yes}
 #      History: $REMOTE_ADMINISTRATION
 #        Value: YES_OR_NO
 #     Examples: yes / no
-use_admin_command_mail_fucntion = no
+use_admin_command_mail_function = no
 
 
 # Descriptions: コマンドメールの返事の先頭に
@@ -3059,6 +3079,14 @@ moderate_queue_dir = $var_dir/mail/queue-moderate
 
 
 
+# Descriptions: expire submitted queue after $moderate_expire_limit.
+#      History: $MODERATOR_EXPIRE_LIMIT
+#        Value: TIME
+#     Examples: 14d
+moderate_queue_expire_limit	=	14d
+
+
+
 =head1 CREATE-ON-POST
 
 # Descriptions: CREATE-ON-POST 機能を使うか否か？