regen

2 files changed, 57 insertions, 2 deletions

diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index ebfdda7b..0ac15504 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -852,7 +852,7 @@ article_subject_tag			=	[$ml_name:%05d]
 #      History:
 #        Value:
 #     Examples: elena
-x_ml_name			=	$ml_name
+outgoing_mail_header_x_ml_name			=	$ml_name
 
 =head1	mail body
 
@@ -973,6 +973,25 @@ log_file_charset_en        =       us-ascii
 #     Examples: /var/spool/ml/@log@
 domain_local_log_file	=	$domain_local_dir/@log@
 
+
+
+=head2	makefml/fml outputs machine friendly log
+
+
+# Descriptions: if yes, makefml/fml outputs machine friendly log.
+#               --coputer-output option implies "use_computer_output = yes".
+#      History: none
+#        Value: yes | no
+#     Examples: no
+use_computer_output	=	no
+
+
+# Descriptions: specify perl module for output engine.
+#      History: none
+#        Value: CLASS
+#     Examples: FML::Log::Print::Simple
+computer_output_engine	=	FML::Log::Print::Simple
+
 =head1	function of article delivery
 
 =head2	article delivery process
@@ -2248,6 +2267,14 @@ sql_find	=	select fml_address from $sql_table
 # $error_run_start_hook = q{ 1;};
 # $error_verify_request_end_hook = q{ 1;};
 # $error_verify_request_start_hook = q{ 1;};
+# $faker_finish_end_hook = q{ 1;};
+# $faker_finish_start_hook = q{ 1;};
+# $faker_prepare_end_hook = q{ 1;};
+# $faker_prepare_start_hook = q{ 1;};
+# $faker_run_end_hook = q{ 1;};
+# $faker_run_start_hook = q{ 1;};
+# $faker_verify_request_end_hook = q{ 1;};
+# $faker_verify_request_start_hook = q{ 1;};
 # $fmladdr_finish_end_hook = q{ 1;};
 # $fmladdr_finish_start_hook = q{ 1;};
 # $fmladdr_prepare_end_hook = q{ 1;};
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 81fbfa18..b592b984 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -873,7 +873,7 @@ article_subject_tag			=	[$ml_name:%05d]
 #      History:
 #        Value:
 #     Examples: elena
-x_ml_name			=	$ml_name
+outgoing_mail_header_x_ml_name			=	$ml_name
 
 =head1	メール本文(ボディ)への操作
 
@@ -997,6 +997,26 @@ log_file_charset_en        =       us-ascii
 #     Examples: /var/spool/ml/@log@
 domain_local_log_file	=	$domain_local_dir/@log@
 
+
+=head2	makefml や fml で詳細なログを STDERR などへ出力したい場合
+
+
+# Descriptions: 機会処理にやさしいフォーマットでログを出力する。
+#               コマンドラインオプションで --computer-output を指定すると
+#               use_computer_output = yes と同じ意味になる。
+#      History: none
+#        Value: yes | no
+#     Examples: no
+use_computer_output	=	no
+
+
+# Descriptions: 機会処理にやさしいフォーマットを出力する際の出力エンジン。
+#               perl module を指定する。
+#      History: none
+#        Value: CLASS
+#     Examples: FML::Log::Print::Simple
+computer_output_engine	=	FML::Log::Print::Simple
+
 =head1	配送プロセス
 
 =head2	プロセス
@@ -2326,6 +2346,14 @@ sql_find	=	select fml_address from $sql_table
 # $error_run_start_hook = q{ 1;};
 # $error_verify_request_end_hook = q{ 1;};
 # $error_verify_request_start_hook = q{ 1;};
+# $faker_finish_end_hook = q{ 1;};
+# $faker_finish_start_hook = q{ 1;};
+# $faker_prepare_end_hook = q{ 1;};
+# $faker_prepare_start_hook = q{ 1;};
+# $faker_run_end_hook = q{ 1;};
+# $faker_run_start_hook = q{ 1;};
+# $faker_verify_request_end_hook = q{ 1;};
+# $faker_verify_request_start_hook = q{ 1;};
 # $fmladdr_finish_end_hook = q{ 1;};
 # $fmladdr_finish_start_hook = q{ 1;};
 # $fmladdr_prepare_end_hook = q{ 1;};