regen

2 files changed, 108 insertions, 11 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 0e5db44f..299b6633 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -70,11 +70,6 @@
 maintainer	=
 
 
-=head2	language
-
-default_charset		=	us-ascii
-
-
 =head2	default modes
 
 
@@ -226,6 +221,27 @@ ml_local_lib_dir	=	$ml_local_dir/lib
 ml_local_share_dir	=	$ml_local_dir/share
 
 
+=head2 domain local
+
+#
+# used in admin/*.cgi e.g. when ml_name unspecified.
+#
+
+# Descriptions: domian local directory.
+#               used in admin/*.cgi e.g. when ml_name unspecified.
+#      History: none
+#        Value: directory
+#     Examples: /var/spool/ml
+domain_local_dir	=	$ml_home_prefix
+
+# Descriptions: domian local temporary directory.
+#               used in admin/*.cgi e.g. when ml_name unspecified.
+#      History: none
+#        Value: directory
+#     Examples: /var/spool/ml/@tmp@
+domain_local_tmp_dir	=	$ml_home_prefix/@tmp@
+
+
 =head2 scheduler
 
 # Descriptions: event queue directory for scheduler
@@ -608,14 +624,44 @@ digest_sequence_file	= $ml_home_dir/seq-digest
 #      History:
 #        Value:
 #     Examples:
-reply_message_charset	=	$default_charset
+reply_message_default_charset	=	$reply_message_charset_en
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+reply_message_charset_ja	=	iso-2022-jp
 
 # Descriptions:
 #      History:
 #        Value:
 #     Examples:
-template_file_charset	=	euc-jp
+reply_message_charset_en	=	us-ascii
 
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_default_charset	=	$template_file_charset_ja
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_ja	=	euc-jp
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_en	=	us-ascii
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+template_file_charset_list	=	euc-jp	
+					us-ascii
 
 # Descriptions:
 #      History:
@@ -840,6 +886,16 @@ log_format_type	=	process[pid]
 #     Examples:
 log_dir		=	$var_dir/log
 
+=head2 domain local
+
+
+# Descriptions: domin local log file.
+#               used in admin/*.cgi e.g. when ml_name unspecified.
+#      History: none
+#        Value: filename
+#     Examples: /var/spool/ml/@log@
+domain_local_log_file	=	$domain_local_dir/@log@
+
 =head1	function of article delivery
 
 =head2	article delivery process
@@ -1698,11 +1754,17 @@ ml_admin_cgi_base_dir	=	$cgi_base_dir/ml-admin/$ml_name
 #     Examples:
 cgi_default_charset	=	us-ascii
 
-# Descriptions: cgi charset
+# Descriptions: cgi charset in Japanese
+#      History:
+#        Value:
+#     Examples:
+cgi_charset_ja		=	euc-jp
+
+# Descriptions: cgi charset in English
 #      History:
 #        Value:
 #     Examples:
-cgi_charset		=	$cgi_default_charset
+cgi_charset_en		=	us-ascii
 
 # Descriptions: language mode of CGI (!= charset) 
 #      History:
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 2c2a3bca..dc31e4da 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -228,6 +228,28 @@ ml_local_lib_dir	=	$ml_local_dir/lib
 ml_local_share_dir	=	$ml_local_dir/share
 
 
+=head2 domain local
+
+#
+# admin/*.cgi など ml_name が特定されない場合にだけ使う
+#
+
+# Descriptions: domian local なディレクトリ。
+#               admin/*.cgi など ml_name が特定されない場合にだけ使う。
+#      History: none
+#        Value: directory
+#     Examples: /var/spool/ml
+domain_local_dir	=	$ml_home_prefix
+
+# Descriptions: domian local な tmp ディレクトリ。
+#               admin/*.cgi など ml_name が特定されない場合にだけ使う。
+#      History: none
+#        Value: directory
+#     Examples: /var/spool/ml/@tmp@
+domain_local_tmp_dir	=	$ml_home_prefix/@tmp@
+
+
+
 =head2 スケジューラ
 
 # Descriptions: イヴェントのキューディレクトリ
@@ -839,7 +861,9 @@ lock_file	= $lock_dir/giantlock
 #     Examples:
 lock_type	= flock
 
-=head1	ログのとり方
+=head1 ログのとり方
+
+=head2 普通のログファイル
 
 # Descriptions: ログとり機能を有効にする
 #      History: fml 4.0 では有無を言わさずログをとる
@@ -847,7 +871,7 @@ lock_type	= flock
 #     Examples:
 use_log		=	yes
 
-# Descriptions: ログファイル
+# Descriptions: ML 固有のログファイル
 #      History: fml 4.0 の $LOGFILE
 #        Value: filename
 #     Examples:
@@ -878,6 +902,17 @@ log_format_type	=	process[pid]
 #     Examples:
 log_dir		=	$var_dir/log
 
+
+=head2 ドメイン固有
+
+
+# Descriptions: ドメイン固有のログファイル
+#               admin/*.cgi など ml_name が特定されない場合にだけ使う。
+#      History: none
+#        Value: filename
+#     Examples: /var/spool/ml/@log@
+domain_local_log_file	=	$domain_local_dir/@log@
+
 =head1	配送プロセス
 
 =head2	プロセス