move dumped variable lists to newly defined variables/ repository.

7 files changed, 474 insertions, 77 deletions

diff --git a/fml/doc/ja/tutorial/Makefile.local b/fml/doc/ja/tutorial/Makefile.local
index 0bbb1561..796d5a66 100644
--- a/fml/doc/ja/tutorial/Makefile.local
+++ b/fml/doc/ja/tutorial/Makefile.local
@@ -1,23 +1,27 @@
 #
-# $FML: Makefile.local,v 1.3 2002/12/25 11:50:28 fukachan Exp $
+# $FML: Makefile.local,v 1.4 2003/06/15 05:23:11 fukachan Exp $
 #
 
-PROG_LIST  = ../../../utils/bin/varlist.pl
-PROG_CLASS = ../../../utils/bin/varclass.pl
-SOURCE     =  ../../../etc/default_config.cf.ja.in
+SHOW_CONFIG = ../../../utils/bin/show_config.pl --sgml
+PROG_LIST   = ../../../utils/bin/varlist.pl --sgml
+PROG_CLASS  = ../../../utils/bin/varclass.pl --sgml
+SOURCE      = ../../../etc/default_config.cf.ja.in
 
-VARLIST  = internals/list.variables.sgml
+# destination
+VARLIST           = variables/list.sgml
+VARCLASS          = variables/class.sgml
+SGML_FILTER_RULES = variables/filter.rules.sgml
+SGML_FILTER_SIZE  = variables/filter.size.sgml
 
-VARCLASS = internals/class.variables.sgml
 
-all: $(VARLIST) $(VARCLASS)
+all: $(VARLIST) $(VARCLASS) $(SGML_FILTER_RULES) $(SGML_FILTER_SIZE)
 
 $(VARLIST): $(SOURCE)
-	$(PROG_LIST) -sgml $(SOURCE) > $(VARLIST).new
+	$(PROG_LIST) $(SOURCE) > $(VARLIST).new
 	mv $(VARLIST).new $(VARLIST)
 
 $(VARCLASS): $(SOURCE)
-	$(PROG_CLASS) -sgml $(SOURCE) > $(VARCLASS).new
+	$(PROG_CLASS) $(SOURCE) > $(VARCLASS).new
 	mv $(VARCLASS).new $(VARCLASS)
 
 install: install_image
@@ -26,3 +30,13 @@ install_image: ../../en/figures/command.dataflow.gif
 
 ../../en/figures/command.dataflow.gif: command/states.gif
 	cp command/states.gif ../../en/figures/command.dataflow.gif
+
+$(SGML_FILTER_RULES): $(SOURCE)
+	$(SHOW_CONFIG) --type filter_rules $(SOURCE) \
+		> $(SGML_FILTER_RULES).new
+	mv $(SGML_FILTER_RULES).new $(SGML_FILTER_RULES)
+
+$(SGML_FILTER_SIZE): $(SOURCE)
+	$(SHOW_CONFIG) --type filter_size $(SOURCE) \
+		> $(SGML_FILTER_SIZE).new
+	mv $(SGML_FILTER_SIZE).new $(SGML_FILTER_SIZE)
diff --git a/fml/doc/ja/tutorial/include/chapters.ent b/fml/doc/ja/tutorial/include/chapters.ent
index 1ee50b69..ecd6f820 100644
--- a/fml/doc/ja/tutorial/include/chapters.ent
+++ b/fml/doc/ja/tutorial/include/chapters.ent
@@ -1,5 +1,5 @@
 <!--
-	$FML: chapters.ent,v 1.73 2003/05/31 08:51:08 fukachan Exp $
+	$FML: chapters.ent,v 1.74 2003/06/15 05:23:12 fukachan Exp $
 -->
 
 <!entity versin "1.1">
@@ -74,96 +74,99 @@
 <!-- フィルタ -->
 <!entity chapter.customize.filter    SYSTEM "customize/filter.sgml">
 <!entity recipe.filter.notice        SYSTEM "customize/recipe.filter.notice.sgml">
-
-
-
-<!entity sect.usage.guide           SYSTEM "usage/guide.sgml">
-<!entity sect.usage.subscribe       SYSTEM "usage/subscribe.sgml">
-<!entity sect.usage.unsubscribe     SYSTEM "usage/unsubscribe.sgml">
-<!entity sect.usage.get             SYSTEM "usage/get.sgml">
-<!entity sect.usage.help            SYSTEM "usage/help.sgml">
-<!entity sect.usage.post            SYSTEM "usage/post.sgml">
-<!entity sect.usage.command         SYSTEM "usage/command.sgml">
-<!entity sect.usage.procmail        SYSTEM "setup/procmail.sgml">
-<!entity sect.usage.makefml         SYSTEM "usage/makefml.sgml">
-<!entity sect.usage.fml             SYSTEM "usage/fml.sgml">
-<!entity sect.usage.fmladdr         SYSTEM "usage/fmladdr.sgml">
-<!entity sect.usage.fmlalias        SYSTEM "usage/fmlalias.sgml">
-<!entity sect.usage.fmlconf         SYSTEM "usage/fmlconf.sgml">
-<!entity sect.usage.fmldoc          SYSTEM "usage/fmldoc.sgml">
-<!entity sect.usage.fmlthread       SYSTEM "usage/fmlthread.sgml">
-<!entity sect.usage.fmlhtmlify      SYSTEM "usage/fmlhtmlify.sgml">
-<!entity sect.usage.fmlsummary      SYSTEM "usage/fmlsummary.sgml">
+<!entity chapter.filter              SYSTEM "internals/filter.sgml">
+<!entity var.filter.rules            SYSTEM "variables/filter.rules.sgml">
+<!entity var.filter.size             SYSTEM "variables/filter.size.sgml">
+
+
+<!entity sect.usage.guide            SYSTEM "usage/guide.sgml">
+<!entity sect.usage.subscribe        SYSTEM "usage/subscribe.sgml">
+<!entity sect.usage.unsubscribe      SYSTEM "usage/unsubscribe.sgml">
+<!entity sect.usage.get              SYSTEM "usage/get.sgml">
+<!entity sect.usage.help             SYSTEM "usage/help.sgml">
+<!entity sect.usage.post             SYSTEM "usage/post.sgml">
+<!entity sect.usage.command          SYSTEM "usage/command.sgml">
+<!entity sect.usage.procmail         SYSTEM "setup/procmail.sgml">
+<!entity sect.usage.makefml          SYSTEM "usage/makefml.sgml">
+<!entity sect.usage.fml              SYSTEM "usage/fml.sgml">
+<!entity sect.usage.fmladdr          SYSTEM "usage/fmladdr.sgml">
+<!entity sect.usage.fmlalias         SYSTEM "usage/fmlalias.sgml">
+<!entity sect.usage.fmlconf          SYSTEM "usage/fmlconf.sgml">
+<!entity sect.usage.fmldoc           SYSTEM "usage/fmldoc.sgml">
+<!entity sect.usage.fmlthread        SYSTEM "usage/fmlthread.sgml">
+<!entity sect.usage.fmlhtmlify       SYSTEM "usage/fmlhtmlify.sgml">
+<!entity sect.usage.fmlsummary       SYSTEM "usage/fmlsummary.sgml">
 
 
 <!-- コマンド -->
-<!entity chapter.command          SYSTEM "command/chapter.sgml">
-<!entity sect.command.dataflow    SYSTEM "command/dataflow.sgml">
-<!entity sect.command.internal    SYSTEM "command/internal.sgml">
-<!entity sect.command.extension   SYSTEM "command/extension.sgml">
-<!entity sect.command.module      SYSTEM "command/module.sgml">
+<!entity chapter.command             SYSTEM "command/chapter.sgml">
+<!entity sect.command.dataflow       SYSTEM "command/dataflow.sgml">
+<!entity sect.command.internal       SYSTEM "command/internal.sgml">
+<!entity sect.command.extension      SYSTEM "command/extension.sgml">
+<!entity sect.command.module         SYSTEM "command/module.sgml">
 
 
 <!-- う〜ん、分類は…？;-) -->
-<!entity chapter.directory        SYSTEM "internals/directory.sgml">
-<!entity chapter.db               SYSTEM "internals/db.sgml">
-<!entity chapter.db.modules       SYSTEM "internals/db_modules.sgml">
-<!entity chapter.dbms             SYSTEM "internals/dbms.sgml">
-<!entity chapter.hook             SYSTEM "internals/hook.sgml">
-<!entity chapter.policy           SYSTEM "policy.sgml">
+<!entity chapter.directory           SYSTEM "internals/directory.sgml">
+<!entity chapter.db                  SYSTEM "internals/db.sgml">
+<!entity chapter.db.modules          SYSTEM "internals/db_modules.sgml">
+<!entity chapter.dbms                SYSTEM "internals/dbms.sgml">
+<!entity chapter.hook                SYSTEM "internals/hook.sgml">
+<!entity chapter.policy              SYSTEM "policy.sgml">
+
+<!entity chapter.filename            SYSTEM "internals/filename.sgml">
+
+<!entity chapter.userctl             SYSTEM "internals/userctl.sgml">
 
-<!entity chapter.filename         SYSTEM "internals/filename.sgml">
-<!entity chapter.filter           SYSTEM "internals/filter.sgml">
-<!entity chapter.userctl          SYSTEM "internals/userctl.sgml">
 
 
 <!-- 配送 -->
-<!entity chapter.delivery         SYSTEM "delivery/chapter.sgml">
-<!entity sect.mailqueue           SYSTEM "delivery/queue.sgml">
+<!entity chapter.delivery            SYSTEM "delivery/chapter.sgml">
+<!entity sect.mailqueue              SYSTEM "delivery/queue.sgml">
 
 <!-- まとめおくり -->
-<!entity chapter.digest           SYSTEM "digest/chapter.sgml">
+<!entity chapter.digest              SYSTEM "digest/chapter.sgml">
 
 
-<!entity recipe.delivery.forward  SYSTEM "delivery/recipe.forward.sgml">
+<!entity recipe.delivery.forward     SYSTEM "delivery/recipe.forward.sgml">
 
 
 <!-- 内部構造 -->
-<!entity chapter.bootloader       SYSTEM "internals/bootloader.sgml">
-<!entity sect.main.cf             SYSTEM "internals/main.cf.sgml">
-<!entity chapter.internal.cgi	  SYSTEM "internals/cgi.sgml">
-<!entity chapter.programingstyle  SYSTEM "internals/style.sgml">
-<!entity chapter.design           SYSTEM "internals/design.sgml">
-<!entity chapter.config.cf        SYSTEM "internals/config.cf.sgml">
-<!entity chapter.restriction      SYSTEM "internals/restriction.sgml">
-<!entity chapter.credential       SYSTEM "internals/credential.sgml">
-<!entity chapter.lock             SYSTEM "internals/lock.sgml">
-<!entity chapter.io.abstraction   SYSTEM "internals/io_abstraction.sgml">
-
-<!entity chapter.virtual          SYSTEM "virtual/chapter.sgml">
-
-<!-- variables -->
-<!entity table.list.variables     SYSTEM "internals/list.variables.sgml">
-<!entity table.class.variables    SYSTEM "internals/class.variables.sgml">
+<!entity chapter.bootloader          SYSTEM "internals/bootloader.sgml">
+<!entity sect.main.cf                SYSTEM "internals/main.cf.sgml">
+<!entity chapter.internal.cgi	     SYSTEM "internals/cgi.sgml">
+<!entity chapter.programingstyle     SYSTEM "internals/style.sgml">
+<!entity chapter.design              SYSTEM "internals/design.sgml">
+<!entity chapter.config.cf           SYSTEM "internals/config.cf.sgml">
+<!entity chapter.restriction         SYSTEM "internals/restriction.sgml">
+<!entity chapter.credential          SYSTEM "internals/credential.sgml">
+<!entity chapter.lock                SYSTEM "internals/lock.sgml">
+<!entity chapter.io.abstraction      SYSTEM "internals/io_abstraction.sgml">
+
+<!entity chapter.virtual             SYSTEM "virtual/chapter.sgml">
+
+<!-- 変数一覧 -->
+<!entity var.table.list.variables    SYSTEM "variables/list.sgml">
+<!entity var.table.class.variables   SYSTEM "variables/class.sgml">
 
 <!-- -->
-<!entity chapter.struct           SYSTEM "internals/struct.sgml">
-<!entity struct.curproc           SYSTEM "internals/CURPROC.sgml">
+<!entity chapter.struct              SYSTEM "internals/struct.sgml">
+<!entity struct.curproc              SYSTEM "internals/CURPROC.sgml">
 
 
 
 <!-- メッセージの取り扱い -->
-<!entity chapter.message          SYSTEM "message/chapter.sgml">
-<!entity sect.message.nl          SYSTEM "message/language.sgml">
-<!entity sect.message.discuss     SYSTEM "message/discussion.sgml">
+<!entity chapter.message             SYSTEM "message/chapter.sgml">
+<!entity sect.message.nl             SYSTEM "message/language.sgml">
+<!entity sect.message.discuss        SYSTEM "message/discussion.sgml">
 
 
 <!-- 開発 -->
-<!entity chapter.cvstree          SYSTEM "devel/cvstree.sgml">
-<!entity chapter.cvstags          SYSTEM "devel/cvstags.sgml">
-<!entity chapter.docbook          SYSTEM "devel/docbook.sgml">
-<!entity chapter.inet6            SYSTEM "devel/inet6.sgml">
-<!entity chapter.program.create   SYSTEM "devel/create_program.sgml">
+<!entity chapter.cvstree             SYSTEM "devel/cvstree.sgml">
+<!entity chapter.cvstags             SYSTEM "devel/cvstags.sgml">
+<!entity chapter.docbook             SYSTEM "devel/docbook.sgml">
+<!entity chapter.inet6               SYSTEM "devel/inet6.sgml">
+<!entity chapter.program.create      SYSTEM "devel/create_program.sgml">
 
 
 <!-- misc -->
diff --git a/fml/doc/ja/tutorial/internals/filter.sgml b/fml/doc/ja/tutorial/internals/filter.sgml
index 4d760067..968eef5c 100644
--- a/fml/doc/ja/tutorial/internals/filter.sgml
+++ b/fml/doc/ja/tutorial/internals/filter.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: filter.sgml,v 1.3 2003/04/15 14:51:41 fukachan Exp $
+   $FML: filter.sgml,v 1.4 2003/06/19 16:24:53 fukachan Exp $
 -->
 
 <chapter id="internals.filter">
@@ -68,7 +68,7 @@ use_機能A   = yes
 </screen>
 </para>
 
-&table.list.filter.rules;
+&var.filter.rules;
 
 </sect1>
 
@@ -89,7 +89,7 @@ use_機能A   = yes
 parse() する時にサイズもはかっているので、このフィルタの実装は簡単だ。
 </para>
 
-&table.list.filter.size;
+&var.filter.size;
 
 </sect1>
 
diff --git a/fml/doc/ja/tutorial/internals/class.variables.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 5c281e9e..856af4f2 100644
--- a/fml/doc/ja/tutorial/internals/class.variables.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -117,6 +117,7 @@ chaddr {
 command {
 
    command_mail { 
+    ?     $command_mail_line_length_limit
           $use_command_mail_program
    }
 
@@ -131,11 +132,19 @@ command {
           $use_command_mail_filter_reject_notice
    }
 
+   command_mail_junk_command { 
+    ?     $command_mail_junk_command_limit
+   }
+
    command_mail_size_filter { 
           $command_mail_size_filter_rules
           $use_command_mail_size_filter
    }
 
+   command_mail_valid_command { 
+    ?     $command_mail_valid_command_limit
+   }
+
    command_restrictions { 
           $command_restrictions
    }
diff --git a/fml/doc/ja/tutorial/variables/filter.rules.sgml b/fml/doc/ja/tutorial/variables/filter.rules.sgml
new file mode 100644
index 00000000..f6a18903
--- /dev/null
+++ b/fml/doc/ja/tutorial/variables/filter.rules.sgml
@@ -0,0 +1,187 @@
+<para>
+<screeen>
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+use_article_filter	= 	yes
+ 
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+article_filter_functions	=	article_size_filter
+					article_header_filter
+					article_non_mime_filter
+					article_mime_component_filter
+					article_text_plain_filter
+
+
+# Descriptions: サイズ情報を根拠にしたフィルタリングをするか？
+#      History:
+#        Value: yes / no
+#     Examples:
+use_article_size_filter	=	yes
+
+
+# Descriptions: フィルタリングのルール。
+#               どのルールにもマッチしないなら、記事の投稿は認められる。
+#      History:
+#        Value:
+#     Examples:
+article_size_filter_rules	=	check_header_size
+					check_body_size
+					permit
+
+
+# Descriptions: ヘッダ情報を根拠にしたフィルタリングをするか？
+#      History:
+#        Value: yes / no
+#     Examples:
+use_article_header_filter		=	yes
+
+
+# Descriptions: フィルタリングのルール。
+#               どのルールにもマッチしないなら、記事の投稿は認められる。
+#      History:
+#        Value:
+#     Examples:
+article_header_filter_rules		=	check_message_id
+						check_date
+						permit
+
+
+# Descriptions: とりあえず、だみ〜
+#      History: 4.0 の content filter で、!MIME にあたる部分
+#        Value: yes / no
+#     Examples:
+use_article_non_mime_filter		=	yes
+
+
+# Descriptions: とりあえず、だみ〜
+#      History:
+#        Value: permit / reject
+#     Examples: permit
+article_non_mime_filter_rules		=	permit
+
+
+# Descriptions: MIME の構造に基づいたフィルタを行なう
+#      History: 4.0 の content filter 相当
+#        Value: yes / no
+#     Examples:
+use_article_mime_component_filter	=	yes
+
+
+# Descriptions: ファイル名
+#      History: 4.0 の @CONTENT_HANDLER 相当
+#        Value:
+#     Examples:
+article_mime_component_filter_rules	= $fml_config_dir/mime_component_filter
+
+
+# Descriptions: 先頭の text/plain 部分に対するフィルタ。
+#		簡単なシンタックスチェック
+#      History: 4.0 の EnvelopeFilter 相当
+#        Value: yes / no
+#     Examples:
+use_article_text_plain_filter		=	yes
+
+
+# Descriptions: テキスト部分へのフィルタリングのルール。
+#               正確には弾くべき特別なもののルール(マッチしないなら通す)
+#      History:
+#         Note: permit by default 
+#        Value:
+#     Examples:
+article_text_plain_filter_rules	=	reject_not_iso2022jp_japanese_string
+					reject_null_mail_body
+					reject_one_line_message
+					reject_old_fml_command_syntax
+					reject_invalid_fml_command_syntax
+					reject_japanese_command_syntax
+					reject_ms_guid
+					permit
+
+
+# Descriptions: フィルタで弾かれたことを教える
+#      History: 4.0 ではハードコードだったような…
+#        Value: yes / no
+#     Examples: yes
+use_article_filter_reject_notice	=	yes
+
+
+# Descriptions: エラーのお知らせの受信者
+#      History: 4.0 ではハードコードだったような…
+#        Value: maintainer | sender
+#     Examples: maintainer sender
+article_filter_reject_notice_recipients	=	maintainer
+						sender
+
+
+# Descriptions: 弾いたメールをどのようにフォワードするか？
+#               ウィルスなどを考慮すると、文字列がいいとおもう
+#      History: 4.0 では文字列で、これはハードコーディングされていた。
+#        Value: multipart / string
+#     Examples: string
+article_filter_reject_notice_data_type	=	string
+
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+use_command_mail_filter	= 	yes
+ 
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+command_mail_filter_functions	=	command_mail_size_filter
+
+
+# Descriptions: サイズ情報を根拠にしたフィルタリングをするか？
+#      History:
+#        Value: yes / no
+#     Examples:
+use_command_mail_size_filter	=	yes
+
+
+# Descriptions: フィルタリングのルール。
+#               どのルールにもマッチしないなら、コマンドメールは認められる。
+#      History:
+#        Value:
+#     Examples:
+command_mail_size_filter_rules	=	check_header_size
+					check_body_size
+					check_command_limit
+					check_line_length_limit
+					permit
+
+
+# Descriptions: フィルタで弾かれたことを教える
+#      History: 4.0 ではハードコードだったような…
+#        Value: yes / no
+#     Examples: yes
+use_command_mail_filter_reject_notice	=	yes
+
+
+# Descriptions: エラーのお知らせの受信者
+#      History: 4.0 ではハードコードだったような…
+#        Value: maintainer | sender
+#     Examples: maintainer sender
+command_mail_filter_reject_notice_recipients	=	maintainer
+							sender
+
+
+# Descriptions: 弾いたメールをどのようにフォワードするか？
+#               ウィルスなどを考慮すると、文字列がいいとおもう
+#      History: 4.0 では文字列で、これはハードコーディングされていた。
+#        Value: multipart / string
+#     Examples: string
+command_mail_filter_reject_notice_data_type	=	string
+
+</screeen>
+</para>
diff --git a/fml/doc/ja/tutorial/variables/filter.size.sgml b/fml/doc/ja/tutorial/variables/filter.size.sgml
new file mode 100644
index 00000000..0147a746
--- /dev/null
+++ b/fml/doc/ja/tutorial/variables/filter.size.sgml
@@ -0,0 +1,155 @@
+<para>
+<screeen>
+
+# Descriptions: ヘッダサイズの上限のデフォルト値
+#      History:
+#        Value: NUM
+#     Examples: 102400
+default_mail_header_size_limit	=	102400
+
+
+# Descriptions: 本文サイズの上限のデフォルト値
+#      History:
+#        Value: NUM
+#     Examples: 10240000
+default_mail_body_size_limit	=	10240000
+
+
+# Descriptions: 入力されるメールを最大何通キャッシュするか
+#      History: $NUM_LOG_MAIL
+#        Value: NUM
+#     Examples: 128
+incoming_mail_cache_size	=	128
+
+
+# Descriptions: 出力(配送)されるメールを最大何通キャッシュするか
+#      History: $NUM_LOG_MAIL
+#        Value: NUM
+#     Examples: 128
+outgoing_mail_cache_size	=	128
+
+
+# Descriptions: 投稿された記事のヘッダの上限値
+#               (MTA から fml が受けとる際の記事のヘッダサイズの上限値)
+#      History:
+#        Value: NUM
+#     Examples: 102400
+incoming_article_header_size_limit	= $default_mail_header_size_limit
+
+
+# Descriptions: 投稿された記事の本文の上限値
+#               (MTA から fml が受けとる際の記事の本文サイズの上限値)
+#      History:
+#        Value: NUM
+#     Examples: 10240000
+incoming_article_body_size_limit	= $default_mail_body_size_limit
+
+
+# Descriptions: 投稿された記事の(配送時の)ヘッダの上限値
+#               (fml から MTA へ渡す際の記事のヘッダサイズの上限値)
+#		(ごめん、この機能は未実装;-)
+#      History:
+#        Value: NUM
+#     Examples: 102400
+outgoing_article_header_size_limit	= $default_mail_header_size_limit
+
+
+# Descriptions: 投稿された記事の(配送時の)本文の上限値
+#               (fml から MTA へ渡す際の記事の本文サイズの上限値)
+#		(ごめん、この機能は未実装;-)
+#        Value: NUM
+#     Examples: 10240000
+outgoing_article_body_size_limit	= $default_mail_body_size_limit
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+article_filter_functions	=	article_size_filter
+					article_header_filter
+					article_non_mime_filter
+					article_mime_component_filter
+					article_text_plain_filter
+
+
+# Descriptions: サイズ情報を根拠にしたフィルタリングをするか？
+#      History:
+#        Value: yes / no
+#     Examples:
+use_article_size_filter	=	yes
+
+
+# Descriptions: フィルタリングのルール。
+#               どのルールにもマッチしないなら、記事の投稿は認められる。
+#      History:
+#        Value:
+#     Examples:
+article_size_filter_rules	=	check_header_size
+					check_body_size
+					permit
+
+
+# Descriptions: MTA から fml が受けとる際のコマンドメールのヘッダサイズの上限値
+#      History:
+#        Value: NUM
+#     Examples: 102400
+incoming_command_mail_header_size_limit	= $default_mail_header_size_limit
+
+
+# Descriptions: MTA から fml が受けとる際のコマンドメールの本文サイズの上限値
+#      History:
+#        Value: NUM
+#     Examples: 10240000
+incoming_command_mail_body_size_limit	= $default_mail_body_size_limit
+
+
+# Descriptions: fml から MTA へ渡す際のコマンドメールのヘッダサイズの上限値
+#		(ごめん、この機能は未実装;-)
+#      History:
+#        Value: NUM
+#     Examples: 102400
+outgoing_command_mail_header_size_limit	= $default_mail_header_size_limit
+
+
+# Descriptions: fml から MTA へ渡す際のコマンドメールの本文サイズの上限値
+#		(ごめん、この機能は未実装;-)
+#      History:
+#        Value: NUM
+#     Examples: 10240000
+outgoing_command_mail_body_size_limit	= $default_mail_body_size_limit
+
+# Descriptions:
+#      History:
+#        Value:
+#     Examples:
+command_mail_filter_functions	=	command_mail_size_filter
+
+
+# Descriptions: サイズ情報を根拠にしたフィルタリングをするか？
+#      History:
+#        Value: yes / no
+#     Examples:
+use_command_mail_size_filter	=	yes
+
+
+# Descriptions: フィルタリングのルール。
+#               どのルールにもマッチしないなら、コマンドメールは認められる。
+#      History:
+#        Value:
+#     Examples:
+command_mail_size_filter_rules	=	check_header_size
+					check_body_size
+					check_command_limit
+					check_line_length_limit
+					permit
+
+
+# Descriptions: キャッシュのサイズ
+#		mode が temporal なら日数だ。
+#      History: none
+#        Value: number
+#     Examples: 
+error_analyzer_cache_size		=	14
+
+</screeen>
+</para>
diff --git a/fml/doc/ja/tutorial/internals/list.variables.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index d4483bbd..9052b3e7 100644
--- a/fml/doc/ja/tutorial/internals/list.variables.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -275,17 +275,46 @@ maintainer
 </row>
 <row>
 <entry>
+command_mail_junk_command_limit</entry>
+<entry>
+ メール一通あたりに含まれているコマンドの総数の上限。</entry>
+<entry>
+100
+   </entry>
+</row>
+<row>
+<entry>
+command_mail_line_length_limit</entry>
+<entry>
+ 一行あたりのコマンドの長さの上限</entry>
+<entry>
+128
+   </entry>
+</row>
+<row>
+<entry>
 command_mail_size_filter_rules</entry>
 <entry>
  フィルタリングのルール。</entry>
 <entry>
 check_header_size
    check_body_size
+   check_command_limit
+   check_line_length_limit
    permit
    </entry>
 </row>
 <row>
 <entry>
+command_mail_valid_command_limit</entry>
+<entry>
+ メール一通あたりに含まれているコマンドの総数の上限。</entry>
+<entry>
+100
+   </entry>
+</row>
+<row>
+<entry>
 command_prompt</entry>
 <entry>
  command prompt in message reply</entry>