regen:

[*_program -> *_function]

$use_command_mail_program   -> $use_command_mail_function
$use_digest_program         -> $use_article_digest_function
$use_distribute_program	    -> $use_article_post_function
$use_error_analyzer_program -> $use_error_mail_analyzer_function

[command list]

$commands_for_user            -> $user_command_mail_allowed_commands
$commands_for_stranger        -> $anonymous_command_mail_allowed_commands
$commands_for_privileged_user -> $admin_command_mail_allowed_commands
$commands_for_admin_cgi	      -> $admin_cgi_allowed_commands

[restrictions]

$post_restrictions -> $article_post_restrictions
$post_restrictions_reject_notice_data_type
-> $article_post_restrictions_reject_notice_data_type

$command_restrictions -> $command_mail_restrictions
permit_commands_for_stranger -> permit_anonymous_command_mail

$admin_command_restrictions -> $admin_command_mail_restrictions

5 files changed, 247 insertions, 221 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index acd8b658..65eff890 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -15,7 +15,8 @@ address {
 admin {
 
    admin_command { 
-          $admin_command_restrictions
+    ?     $admin_command_mail_allowed_commands
+          $admin_command_mail_restrictions
    }
 
    admin_member { 
@@ -34,6 +35,7 @@ admin {
    }
 
    admin_* {
+    ?     $admin_cgi_allowed_commands
           $admin_cgi_base_dir
    }
 }
@@ -44,6 +46,10 @@ article {
           $use_article_delivery
    }
 
+   article_digest { 
+          $use_article_digest_function
+   }
+
    article_filter { 
           $article_filter_functions
           $use_article_filter
@@ -75,6 +81,13 @@ article {
           $use_article_non_mime_filter
    }
 
+   article_post { 
+    ?     $article_post_address
+          $article_post_restrictions
+          $article_post_restrictions_reject_notice_data_type
+          $use_article_post_function
+   }
+
    article_size_filter { 
           $article_size_filter_rules
           $use_article_size_filter
@@ -113,9 +126,11 @@ cgi {
 command {
 
    command_mail { 
+    ?     $command_mail_address
           $command_mail_line_length_limit
     ?     $command_mail_reply_prompt
-          $use_command_mail_program
+          $command_mail_restrictions
+          $use_command_mail_function
    }
 
    command_mail_filter { 
@@ -141,10 +156,6 @@ command {
    command_mail_valid_command { 
           $command_mail_valid_command_limit
    }
-
-   command_* {
-          $command_restrictions
-   }
 }
 
 admin_command {
@@ -153,6 +164,13 @@ admin_command {
    }
 }
 
+anonymous_command {
+
+   anonymous_command { 
+    ?     $anonymous_command_mail_allowed_commands
+   }
+}
+
 chaddr_command {
 
    chaddr_command { 
@@ -221,6 +239,13 @@ unsubscribe_command {
    }
 }
 
+user_command {
+
+   user_command { 
+    ?     $user_command_mail_allowed_commands
+   }
+}
+
 default {
 
    default_* {
@@ -232,11 +257,6 @@ default {
 
 digest {
 
-   digest { 
-          $digest_sequence_file
-          $use_digest_program
-   }
-
    digest_header_rewrite { 
           $digest_header_rewrite_rules
           $use_digest_header_rewrite
@@ -251,6 +271,10 @@ digest {
           $digest_recipient_maps
           $primary_digest_recipient_map
    }
+
+   digest_* {
+          $digest_sequence_file
+   }
 }
 
 directory {
@@ -262,13 +286,6 @@ directory {
    }
 }
 
-distribute {
-
-   distribute { 
-          $use_distribute_program
-   }
-}
-
 domain {
 
    domain_* {
@@ -286,7 +303,11 @@ domain {
 
 error {
 
-   error_analyzer { 
+   error_mail_analyzer { 
+          $use_error_mail_analyzer_function
+   }
+
+   error_* {
           $error_analyzer_cache_dir
     ?     $error_analyzer_cache_mode
     ?     $error_analyzer_cache_size
@@ -294,7 +315,6 @@ error {
     ?     $error_analyzer_function
     ?     $error_analyzer_function_list
           $error_analyzer_simple_count_limit
-          $use_error_analyzer_program
    }
 }
 
@@ -517,11 +537,6 @@ path {
 }
 
 post {
-
-   post_* {
-          $post_restrictions
-          $post_restrictions_reject_notice_data_type
-   }
 }
 
 postfix {
@@ -659,6 +674,9 @@ thread {
 
 user {
 
+   user_command { 
+   }
+
    user_db_gecos { 
           $primary_user_db_gecos_map
           $user_db_gecos_maps
@@ -696,12 +714,7 @@ _dir$ {
 
 
 *** unclassified ***
-    ?     $commands_for_admin
-    ?     $commands_for_admin_cgi
     ?     $commands_for_ml_admin_cgi
-    ?     $commands_for_privileged_user
-    ?     $commands_for_stranger
-    ?     $commands_for_user
     ?     $file_default_mode
     ?     $language_preference_order
     ?     $list_addresses
diff --git a/fml/doc/en/tutorial/variables/filter.rules.sgml b/fml/doc/en/tutorial/variables/filter.rules.sgml
index f1f65ceb..f04b5783 100644
--- a/fml/doc/en/tutorial/variables/filter.rules.sgml
+++ b/fml/doc/en/tutorial/variables/filter.rules.sgml
@@ -7,7 +7,7 @@
 #      History: string in 4.0.
 #        Value: multipart / string
 #     Examples: string
-post_restrictions_reject_notice_data_type	=	string
+article_post_restrictions_reject_notice_data_type	=	string
 
 
 =head2	filter
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index bf43e0a6..7b221d4d 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -32,7 +32,7 @@ $cgi_base_dir/admin
 </row>
 <row>
 <entry>
-admin_command_restrictions</entry>
+admin_command_mail_restrictions</entry>
 <entry>
  restrictions for admin command mail</entry>
 <entry>
@@ -137,6 +137,26 @@ permit
 </row>
 <row>
 <entry>
+article_post_restrictions</entry>
+<entry>
+ restrictions for post</entry>
+<entry>
+reject_system_special_accounts
+   permit_member_maps
+   reject
+   </entry>
+</row>
+<row>
+<entry>
+article_post_restrictions_reject_notice_data_type</entry>
+<entry>
+ how to inform the rejected message </entry>
+<entry>
+string
+   </entry>
+</row>
+<row>
+<entry>
 article_sequence_file</entry>
 <entry>
  file to store sequence number</entry>
@@ -357,6 +377,18 @@ command_mail_reply_prompt</entry>
 </row>
 <row>
 <entry>
+command_mail_restrictions</entry>
+<entry>
+ restrictions for command mail</entry>
+<entry>
+reject_system_special_accounts
+   permit_anonymous_command_mail
+   permit_member_maps
+   reject
+   </entry>
+</row>
+<row>
+<entry>
 command_mail_size_filter_rules</entry>
 <entry>
  size based filter rules.</entry>
@@ -379,49 +411,6 @@ command_mail_valid_command_limit</entry>
 </row>
 <row>
 <entry>
-command_restrictions</entry>
-<entry>
- restrictions for command mail</entry>
-<entry>
-reject_system_special_accounts
-   permit_commands_for_stranger
-   permit_member_maps
-   reject
-   </entry>
-</row>
-<row>
-<entry>
-commands_for_user</entry>
-<entry>
- effective command in normal commnd mail (for usual users)</entry>
-<entry>
-help
-   get
-   mget
-   get
-   mget
-   send
-   subscribe
-   add
-   unsubscribe
-   bye
-   on
-   off
-   digest
-   remove
-   resign
-   signoff
-   chaddr
-   confirm
-   guide
-   info
-   admin
-   objective
-   summary
-   </entry>
-</row>
-<row>
-<entry>
 confirm_command_prefix</entry>
 <entry>
  special command name used as confirmation</entry>
@@ -808,9 +797,9 @@ list_addresses</entry>
 <entry>
  addresses fml uses: e.g. elena, elena-ctl</entry>
 <entry>
-$address_for_post
-   $address_for_command
-   $maintainer
+$maintainer
+   $article_post_address
+   $command_mail_address
    </entry>
 </row>
 <row>
@@ -1137,26 +1126,6 @@ $ml_name
 </row>
 <row>
 <entry>
-post_restrictions</entry>
-<entry>
- restrictions for post</entry>
-<entry>
-reject_system_special_accounts
-   permit_member_maps
-   reject
-   </entry>
-</row>
-<row>
-<entry>
-post_restrictions_reject_notice_data_type</entry>
-<entry>
- how to inform the rejected message </entry>
-<entry>
-string
-   </entry>
-</row>
-<row>
-<entry>
 postfix_verp_delimiters</entry>
 <entry>
  verps delimieters used in postfix</entry>
@@ -1656,6 +1625,15 @@ yes
 </row>
 <row>
 <entry>
+use_article_post_function</entry>
+<entry>
+ use function of article delivery</entry>
+<entry>
+${use_distribute_program:-yes}
+   </entry>
+</row>
+<row>
+<entry>
 use_article_size_filter</entry>
 <entry>
  use size based filter</entry>
@@ -1683,11 +1661,11 @@ yes
 </row>
 <row>
 <entry>
-use_command_mail_program</entry>
+use_command_mail_function</entry>
 <entry>
  use commnd mail ?</entry>
 <entry>
-yes
+${use_command_mail_program:-yes}
    </entry>
 </row>
 <row>
@@ -1710,20 +1688,11 @@ yes
 </row>
 <row>
 <entry>
-use_distribute_program</entry>
-<entry>
- use function of article delivery</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-use_error_analyzer_program</entry>
+use_error_mail_analyzer_function</entry>
 <entry>
  use error message analyzer ?</entry>
 <entry>
-yes
+${use_error_analyzer_program:-yes}
    </entry>
 </row>
 <row>
@@ -1827,6 +1796,37 @@ yes
 </row>
 <row>
 <entry>
+user_command_mail_allowed_commands</entry>
+<entry>
+ effective command in normal commnd mail (for usual users)</entry>
+<entry>
+help
+   get
+   mget
+   get
+   mget
+   send
+   subscribe
+   add
+   unsubscribe
+   bye
+   on
+   off
+   digest
+   remove
+   resign
+   signoff
+   chaddr
+   confirm
+   guide
+   info
+   admin
+   objective
+   summary
+   </entry>
+</row>
+<row>
+<entry>
 user_db_gecos_maps</entry>
 <entry>
  { address => gecos_field } maps.</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 0b0530d34..3a3d0d32 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -15,7 +15,8 @@ address {
 admin {
 
    admin_command { 
-          $admin_command_restrictions
+    ?     $admin_command_mail_allowed_commands
+          $admin_command_mail_restrictions
    }
 
    admin_member { 
@@ -34,6 +35,7 @@ admin {
    }
 
    admin_* {
+    ?     $admin_cgi_allowed_commands
           $admin_cgi_base_dir
    }
 }
@@ -44,6 +46,10 @@ article {
           $use_article_delivery
    }
 
+   article_digest { 
+          $use_article_digest_function
+   }
+
    article_filter { 
           $article_filter_functions
           $use_article_filter
@@ -75,6 +81,13 @@ article {
           $use_article_non_mime_filter
    }
 
+   article_post { 
+    ?     $article_post_address
+          $article_post_restrictions
+          $article_post_restrictions_reject_notice_data_type
+          $use_article_post_function
+   }
+
    article_size_filter { 
           $article_size_filter_rules
           $use_article_size_filter
@@ -113,9 +126,12 @@ cgi {
 command {
 
    command_mail { 
+    ?     $command_mail_address
           $command_mail_line_length_limit
     ?     $command_mail_reply_prompt
-          $use_command_mail_program
+          $command_mail_restrictions
+          $use_command_mail_function
+    ?     $user_command_mail_allowed_commands
    }
 
    command_mail_filter { 
@@ -141,10 +157,6 @@ command {
    command_mail_valid_command { 
           $command_mail_valid_command_limit
    }
-
-   command_* {
-          $command_restrictions
-   }
 }
 
 admin_command {
@@ -153,6 +165,13 @@ admin_command {
    }
 }
 
+anonymous_command {
+
+   anonymous_command { 
+    ?     $anonymous_command_mail_allowed_commands
+   }
+}
+
 chaddr_command {
 
    chaddr_command { 
@@ -232,6 +251,12 @@ unsubscribe_command {
    }
 }
 
+user_command {
+
+   user_command { 
+   }
+}
+
 default {
 
    default_* {
@@ -243,11 +268,6 @@ default {
 
 digest {
 
-   digest { 
-          $digest_sequence_file
-          $use_digest_program
-   }
-
    digest_header_rewrite { 
           $digest_header_rewrite_rules
           $use_digest_header_rewrite
@@ -262,6 +282,10 @@ digest {
           $digest_recipient_maps
           $primary_digest_recipient_map
    }
+
+   digest_* {
+          $digest_sequence_file
+   }
 }
 
 directory {
@@ -273,13 +297,6 @@ directory {
    }
 }
 
-distribute {
-
-   distribute { 
-          $use_distribute_program
-   }
-}
-
 domain {
 
    domain_* {
@@ -297,7 +314,11 @@ domain {
 
 error {
 
-   error_analyzer { 
+   error_mail_analyzer { 
+          $use_error_mail_analyzer_function
+   }
+
+   error_* {
           $error_analyzer_cache_dir
     ?     $error_analyzer_cache_mode
     ?     $error_analyzer_cache_size
@@ -305,7 +326,6 @@ error {
     ?     $error_analyzer_function
     ?     $error_analyzer_function_list
           $error_analyzer_simple_count_limit
-          $use_error_analyzer_program
    }
 }
 
@@ -541,11 +561,6 @@ path {
 }
 
 post {
-
-   post_* {
-          $post_restrictions
-          $post_restrictions_reject_notice_data_type
-   }
 }
 
 postfix {
@@ -683,6 +698,9 @@ thread {
 
 user {
 
+   user_command { 
+   }
+
    user_db_gecos { 
           $primary_user_db_gecos_map
           $user_db_gecos_maps
@@ -720,12 +738,7 @@ _dir$ {
 
 
 *** unclassified ***
-    ?     $commands_for_admin
-    ?     $commands_for_admin_cgi
     ?     $commands_for_ml_admin_cgi
-    ?     $commands_for_privileged_user
-    ?     $commands_for_stranger
-    ?     $commands_for_user
     ?     $file_default_mode
     ?     $language_preference_order
     ?     $unsafe_header_fields
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index a02a6a7c..737f7e26 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -32,7 +32,7 @@ $cgi_base_dir/admin
 </row>
 <row>
 <entry>
-admin_command_restrictions</entry>
+admin_command_mail_restrictions</entry>
 <entry>
  admin コマンドへの制限</entry>
 <entry>
@@ -138,6 +138,26 @@ reject_empty_content_type
 </row>
 <row>
 <entry>
+article_post_restrictions</entry>
+<entry>
+ 投稿への制限</entry>
+<entry>
+reject_system_special_accounts
+   permit_member_maps
+   reject
+   </entry>
+</row>
+<row>
+<entry>
+article_post_restrictions_reject_notice_data_type</entry>
+<entry>
+ 弾いたメールをどのようにフォワードするか？</entry>
+<entry>
+string
+   </entry>
+</row>
+<row>
+<entry>
 article_sequence_file</entry>
 <entry>
  記事番号を保存するファイル (ダミー？)</entry>
@@ -340,6 +360,18 @@ command_mail_reply_prompt</entry>
 </row>
 <row>
 <entry>
+command_mail_restrictions</entry>
+<entry>
+ コマンドへの制限</entry>
+<entry>
+reject_system_special_accounts
+   permit_anonymous_command_mail
+   permit_member_maps
+   reject
+   </entry>
+</row>
+<row>
+<entry>
 command_mail_size_filter_rules</entry>
 <entry>
  フィルタリングのルール。</entry>
@@ -362,49 +394,6 @@ command_mail_valid_command_limit</entry>
 </row>
 <row>
 <entry>
-command_restrictions</entry>
-<entry>
- コマンドへの制限</entry>
-<entry>
-reject_system_special_accounts
-   permit_commands_for_stranger
-   permit_member_maps
-   reject
-   </entry>
-</row>
-<row>
-<entry>
-commands_for_user</entry>
-<entry>
- 有効なコマンド一覧を書く</entry>
-<entry>
-help
-   get
-   mget
-   get
-   mget
-   send
-   subscribe
-   add
-   unsubscribe
-   bye
-   on
-   off
-   digest
-   remove
-   resign
-   signoff
-   chaddr
-   confirm
-   guide
-   info
-   admin
-   objective
-   summary
-   </entry>
-</row>
-<row>
-<entry>
 confirm_command_prefix</entry>
 <entry>
  confirmation の返事を表す特別なコマンド</entry>
@@ -800,9 +789,9 @@ list_addresses</entry>
 <entry>
  ＭＬが使うアドレス: 例: elena, elena-ctl</entry>
 <entry>
-$address_for_post
-   $address_for_command
-   $maintainer
+$maintainer
+   $article_post_address
+   $command_mail_address
    </entry>
 </row>
 <row>
@@ -1147,26 +1136,6 @@ $ml_name
 </row>
 <row>
 <entry>
-post_restrictions</entry>
-<entry>
- 投稿への制限</entry>
-<entry>
-reject_system_special_accounts
-   permit_member_maps
-   reject
-   </entry>
-</row>
-<row>
-<entry>
-post_restrictions_reject_notice_data_type</entry>
-<entry>
- 弾いたメールをどのようにフォワードするか？</entry>
-<entry>
-string
-   </entry>
-</row>
-<row>
-<entry>
 postfix_verp_delimiters</entry>
 <entry>
  verps delimieters used in postfix</entry>
@@ -1666,6 +1635,15 @@ yes
 </row>
 <row>
 <entry>
+use_article_post_function</entry>
+<entry>
+ 記事の配送処理プログラムをそもそも使うか？</entry>
+<entry>
+${use_distribute_program:-yes}
+   </entry>
+</row>
+<row>
+<entry>
 use_article_size_filter</entry>
 <entry>
  サイズ情報を根拠にしたフィルタリングをするか？</entry>
@@ -1693,11 +1671,11 @@ yes
 </row>
 <row>
 <entry>
-use_command_mail_program</entry>
+use_command_mail_function</entry>
 <entry>
  コマンドメールを使うか？</entry>
 <entry>
-yes
+${use_command_mail_program:-yes}
    </entry>
 </row>
 <row>
@@ -1720,20 +1698,11 @@ yes
 </row>
 <row>
 <entry>
-use_distribute_program</entry>
-<entry>
- 記事の配送処理プログラムをそもそも使うか？</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-use_error_analyzer_program</entry>
+use_error_mail_analyzer_function</entry>
 <entry>
  エラー解析プログラムを使うか？</entry>
 <entry>
-yes
+${use_error_analyzer_program:-yes}
    </entry>
 </row>
 <row>
@@ -1837,6 +1806,37 @@ yes
 </row>
 <row>
 <entry>
+user_command_mail_allowed_commands</entry>
+<entry>
+ 有効なコマンド一覧を書く</entry>
+<entry>
+help
+   get
+   mget
+   get
+   mget
+   send
+   subscribe
+   add
+   unsubscribe
+   bye
+   on
+   off
+   digest
+   remove
+   resign
+   signoff
+   chaddr
+   confirm
+   guide
+   info
+   admin
+   objective
+   summary
+   </entry>
+</row>
+<row>
+<entry>
 user_db_gecos_maps</entry>
 <entry>
  { address => gecos_field } maps.</entry>