summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fml/doc/en/tutorial/variables/class.sgml12
-rw-r--r--fml/doc/en/tutorial/variables/list.sgml58
-rw-r--r--fml/doc/ja/tutorial/variables/class.sgml22
-rw-r--r--fml/doc/ja/tutorial/variables/list.sgml62
-rw-r--r--fml/etc/default_config.cf.en.in43
-rw-r--r--fml/etc/default_config.cf.ja.in50
6 files changed, 217 insertions, 30 deletions
diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index aa1f5b7d..1d4c7040 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -60,6 +60,11 @@ article {
$use_article_digest_function
}
+ article_expire {
+ $article_expire_limit
+ $use_article_expire
+ }
+
article_filter {
$article_filter_functions
$use_article_filter
@@ -122,6 +127,10 @@ article {
$use_article_spool
}
+ article_summary_file_expire {
+ $use_article_summary_file_expire
+ }
+
article_text_plain_filter {
$article_text_plain_filter_rules
$use_article_text_plain_filter
@@ -636,6 +645,7 @@ moderate {
moderate {
$moderate_queue_dir
+ $moderate_queue_expire_limit
$use_moderate_function
}
}
@@ -899,10 +909,12 @@ x {
_file$ {
$compat_old_fml_default_config_ph_file
+ $deny_file
$guide_file
$help_file
$objective_file
$sequence_file
+ $welcome_file
}
_dir$ {
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 3a18e58a..16aaac1d 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -125,6 +125,15 @@ smtp
</row>
<row>
<entry>
+article_expire_limit</entry>
+<entry>
+ how old article to be removed</entry>
+<entry>
+90d
+ </entry>
+</row>
+<row>
+<entry>
article_filter_reject_notice_data_type</entry>
<entry>
how fml refer the rejeced message.</entry>
@@ -793,6 +802,15 @@ default_mail_header_size_limit</entry>
</row>
<row>
<entry>
+deny_file</entry>
+<entry>
+ deny file</entry>
+<entry>
+$ml_home_dir/deny
+ </entry>
+</row>
+<row>
+<entry>
digest_header_rewrite_rules</entry>
<entry>
digest article header rewrite rules</entry>
@@ -1121,7 +1139,7 @@ get_command_request_limit</entry>
<entry>
guide_file</entry>
<entry>
- guilde file</entry>
+ guide file</entry>
<entry>
$ml_home_dir/guide
</entry>
@@ -1379,7 +1397,7 @@ $var_dir/log
<entry>
log_file</entry>
<entry>
- log file</entry>
+ log file.</entry>
<entry>
$ml_home_dir/log
</entry>
@@ -1666,6 +1684,15 @@ $var_dir/mail/queue-moderate
</row>
<row>
<entry>
+moderate_queue_expire_limit</entry>
+<entry>
+ expire submitted queue after $moderate_expire_limit.</entry>
+<entry>
+14d
+ </entry>
+</row>
+<row>
+<entry>
moderator_member_maps</entry>
<entry>
all list of moderator lists.</entry>
@@ -2297,6 +2324,15 @@ yes
</row>
<row>
<entry>
+use_article_expire</entry>
+<entry>
+ expire too old article or not ?</entry>
+<entry>
+no
+ </entry>
+</row>
+<row>
+<entry>
use_article_filter_reject_notice</entry>
<entry>
infor the filter rejection ?</entry>
@@ -2378,6 +2414,15 @@ ${ues_spool:-yes}
</row>
<row>
<entry>
+use_article_summary_file_expire</entry>
+<entry>
+ remove content correspoding with article expiration.</entry>
+<entry>
+no
+ </entry>
+</row>
+<row>
+<entry>
use_article_text_plain_filter</entry>
<entry>
use text/plain filter, which is a simple syntax checker.</entry>
@@ -2713,6 +2758,15 @@ var_dir</entry>
$ml_home_dir/var
</entry>
</row>
+<row>
+<entry>
+welcome_file</entry>
+<entry>
+ welcome file</entry>
+<entry>
+$ml_home_dir/welcome
+ </entry>
+</row>
</tbody>
</tgroup>
</table>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index aa1f5b7d..cff33f82 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -16,16 +16,16 @@ address {
admin {
admin_command {
+ }
+
+ admin_command_mail {
? $admin_command_mail_allowed_commands
$admin_command_mail_auth_gpg_config_dir
? $admin_command_mail_auth_gpg_config_dir_alias
$admin_command_mail_auth_pgp_config_dir
? $admin_command_mail_auth_pgp_config_dir_alias
$admin_command_mail_restrictions
- }
-
- admin_command_mail_fucntion {
- $use_admin_command_mail_fucntion
+ $use_admin_command_mail_function
}
admin_member {
@@ -60,6 +60,11 @@ article {
$use_article_digest_function
}
+ article_expire {
+ $article_expire_limit
+ $use_article_expire
+ }
+
article_filter {
$article_filter_functions
$use_article_filter
@@ -122,6 +127,10 @@ article {
$use_article_spool
}
+ article_summary_file_expire {
+ $use_article_summary_file_expire
+ }
+
article_text_plain_filter {
$article_text_plain_filter_rules
$use_article_text_plain_filter
@@ -225,7 +234,7 @@ admin_command {
admin_command {
}
- admin_command_mail_fucntion {
+ admin_command_mail {
}
}
@@ -636,6 +645,7 @@ moderate {
moderate {
$moderate_queue_dir
+ $moderate_queue_expire_limit
$use_moderate_function
}
}
@@ -899,10 +909,12 @@ x {
_file$ {
$compat_old_fml_default_config_ph_file
+ $deny_file
$guide_file
$help_file
$objective_file
$sequence_file
+ $welcome_file
}
_dir$ {
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index aa9f50bf..649c85a5 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -125,6 +125,15 @@ smtp
</row>
<row>
<entry>
+article_expire_limit</entry>
+<entry>
+ どのくらい古い記事を消すか？</entry>
+<entry>
+90d
+ </entry>
+</row>
+<row>
+<entry>
article_filter_reject_notice_data_type</entry>
<entry>
弾いたメールをどのようにフォワードするか？</entry>
@@ -776,6 +785,15 @@ default_mail_header_size_limit</entry>
</row>
<row>
<entry>
+deny_file</entry>
+<entry>
+ deny ファイル</entry>
+<entry>
+$ml_home_dir/deny
+ </entry>
+</row>
+<row>
+<entry>
digest_header_rewrite_rules</entry>
<entry>
記事のまとめおくりのヘッダを書き換えるルール群</entry>
@@ -1104,7 +1122,7 @@ get_command_request_limit</entry>
<entry>
guide_file</entry>
<entry>
- ヘルプファイル</entry>
+ GUIDE ファイル</entry>
<entry>
$ml_home_dir/guide
</entry>
@@ -1371,7 +1389,7 @@ $var_dir/log
<entry>
log_file</entry>
<entry>
- ML 固有のログファイル</entry>
+ ML 固有のログファイル。</entry>
<entry>
$ml_home_dir/log
</entry>
@@ -1658,6 +1676,15 @@ $var_dir/mail/queue-moderate
</row>
<row>
<entry>
+moderate_queue_expire_limit</entry>
+<entry>
+ expire submitted queue after $moderate_expire_limit.</entry>
+<entry>
+14d
+ </entry>
+</row>
+<row>
+<entry>
moderator_member_maps</entry>
<entry>
メンバーかどうか認証する際に検索するすべてのメンバーリスト</entry>
@@ -1720,7 +1747,7 @@ config.cf
<entry>
objective_file</entry>
<entry>
- ヘルプファイル</entry>
+ objective ファイル</entry>
<entry>
$ml_home_dir/objective
</entry>
@@ -2309,7 +2336,7 @@ yes
</row>
<row>
<entry>
-use_admin_command_mail_fucntion</entry>
+use_admin_command_mail_function</entry>
<entry>
admin コマンドメールを使うか？</entry>
<entry>
@@ -2327,6 +2354,15 @@ yes
</row>
<row>
<entry>
+use_article_expire</entry>
+<entry>
+ 古い記事を自動消去するか否か？</entry>
+<entry>
+no
+ </entry>
+</row>
+<row>
+<entry>
use_article_filter_reject_notice</entry>
<entry>
フィルタで弾かれたことを教える</entry>
@@ -2408,6 +2444,15 @@ ${use_spool:-yes}
</row>
<row>
<entry>
+use_article_summary_file_expire</entry>
+<entry>
+ 記事の自動消去($use_article_expire)に追従して</entry>
+<entry>
+no
+ </entry>
+</row>
+<row>
+<entry>
use_article_text_plain_filter</entry>
<entry>
先頭の text/plain 部分に対するフィルタ。</entry>
@@ -2743,6 +2788,15 @@ var_dir</entry>
$ml_home_dir/var
</entry>
</row>
+<row>
+<entry>
+welcome_file</entry>
+<entry>
+ welcome ファイル</entry>
+<entry>
+$ml_home_dir/welcome
+ </entry>
+</row>
</tbody>
</tgroup>
</table>
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 機能を使うか否か？
generated by cgit v1.2.1 (git 2.18.0) at 2026-09-01 16:57:31 +0000