default_file_mode -> file_default_mode

default_directory_mode -> directory_default_mode

move definitions from basic.cf to file.cf.

4 files changed, 41 insertions, 40 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index 9983c9b8..10b22373 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -221,8 +221,6 @@ unsubscribe_command {
 default {
 
    default_* {
-    ?     $default_directory_mode
-    ?     $default_file_mode
           $default_mail_body_size_limit
           $default_mail_header_size_limit
     ?     $default_umask
@@ -255,6 +253,7 @@ digest {
 directory {
 
    directory_* {
+    ?     $directory_default_mode
     ?     $directory_private_mode
     ?     $directory_public_mode
    }
@@ -675,6 +674,7 @@ _dir$ {
     ?     $commands_for_privileged_user
     ?     $commands_for_stranger
     ?     $commands_for_user
+    ?     $file_default_mode
     ?     $list_addresses
     ?     $unsafe_header_fields
 </screen>
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 56d15a4e..d40b26f3 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -449,24 +449,6 @@ $var_dir/db
 </row>
 <row>
 <entry>
-default_directory_mode</entry>
-<entry>
- default mode in mkdir</entry>
-<entry>
-0755
-   </entry>
-</row>
-<row>
-<entry>
-default_file_mode</entry>
-<entry>
- default mode in creating file</entry>
-<entry>
-0600
-   </entry>
-</row>
-<row>
-<entry>
 default_mail_body_size_limit</entry>
 <entry>
  body size limit</entry>
@@ -522,6 +504,15 @@ $ml_home_dir/seq-digest
 </row>
 <row>
 <entry>
+directory_default_mode</entry>
+<entry>
+ default mode in creating directory.</entry>
+<entry>
+0755
+   </entry>
+</row>
+<row>
+<entry>
 domain_config_base_dir</entry>
 <entry>
  system data directory provided by fml</entry>
@@ -685,6 +676,15 @@ $var_dir/event/queue
 </row>
 <row>
 <entry>
+file_default_mode</entry>
+<entry>
+ default mode in creating file</entry>
+<entry>
+0600
+   </entry>
+</row>
+<row>
+<entry>
 get_command_request_limit</entry>
 <entry>
  maximu number of request in get command(s) in one mail.</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 9983c9b8..d4913410 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -221,8 +221,6 @@ unsubscribe_command {
 default {
 
    default_* {
-    ?     $default_directory_mode
-    ?     $default_file_mode
           $default_mail_body_size_limit
           $default_mail_header_size_limit
     ?     $default_umask
@@ -255,6 +253,7 @@ digest {
 directory {
 
    directory_* {
+    ?     $directory_default_mode
     ?     $directory_private_mode
     ?     $directory_public_mode
    }
@@ -675,7 +674,9 @@ _dir$ {
     ?     $commands_for_privileged_user
     ?     $commands_for_stranger
     ?     $commands_for_user
+    ?     $file_default_mode
     ?     $list_addresses
+    ?     $n
     ?     $unsafe_header_fields
 </screen>
 </para>
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 00599847..19cb6b45 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -431,24 +431,6 @@ $var_dir/db
 </row>
 <row>
 <entry>
-default_directory_mode</entry>
-<entry>
- ディレクトリを作成する時のデフォルトモード</entry>
-<entry>
-0755
-   </entry>
-</row>
-<row>
-<entry>
-default_file_mode</entry>
-<entry>
- ファイルを作成する時のデフォルトモード</entry>
-<entry>
-0600
-   </entry>
-</row>
-<row>
-<entry>
 default_mail_body_size_limit</entry>
 <entry>
  本文サイズの上限のデフォルト値</entry>
@@ -504,6 +486,15 @@ $ml_home_dir/seq-digest
 </row>
 <row>
 <entry>
+directory_default_mode</entry>
+<entry>
+ ディレクトリを作成する時のデフォルトモード</entry>
+<entry>
+0755
+   </entry>
+</row>
+<row>
+<entry>
 domain_config_base_dir</entry>
 <entry>
  fml からシステムに教えるデータを置くためのディレクトリ</entry>
@@ -667,6 +658,15 @@ $var_dir/event/queue
 </row>
 <row>
 <entry>
+file_default_mode</entry>
+<entry>
+ ファイルを作成する時のデフォルトモード</entry>
+<entry>
+0600
+   </entry>
+</row>
+<row>
+<entry>
 get_command_request_limit</entry>
 <entry>
  get コマンドで指定できる記事数の上限。</entry>