has_* -> system_has_*

8 files changed, 120 insertions, 126 deletions

diff --git a/fml/doc/en/tutorial/variables/class.sgml b/fml/doc/en/tutorial/variables/class.sgml
index e0ca21f6..8c452558 100644
--- a/fml/doc/en/tutorial/variables/class.sgml
+++ b/fml/doc/en/tutorial/variables/class.sgml
@@ -284,14 +284,6 @@ error {
 }
 
 has {
-
-   has_* {
-          $has_alarm
-          $has_fork
-          $has_getpwgid
-          $has_getpwuid
-          $has_select
-   }
 }
 
 html {
@@ -596,6 +588,11 @@ system {
 
    system_* {
     ?     $system_accounts
+    ?     $system_has_alarm
+    ?     $system_has_fork
+    ?     $system_has_getpwgid
+    ?     $system_has_getpwuid
+    ?     $system_has_select
    }
 }
 
diff --git a/fml/doc/en/tutorial/variables/list.sgml b/fml/doc/en/tutorial/variables/list.sgml
index 368cdc4a..006673d7 100644
--- a/fml/doc/en/tutorial/variables/list.sgml
+++ b/fml/doc/en/tutorial/variables/list.sgml
@@ -685,51 +685,6 @@ $ml_home_dir/guide
 </row>
 <row>
 <entry>
-has_alarm</entry>
-<entry>
- has alarm(2) ?</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_fork</entry>
-<entry>
- has fork(2) ?</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_getpwgid</entry>
-<entry>
- has getpwgid(2) ?</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_getpwuid</entry>
-<entry>
- has getpwuid(2) ?</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_select</entry>
-<entry>
- has select(2) ?</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
 help_file</entry>
 <entry>
  help file</entry>
@@ -1422,6 +1377,51 @@ root
 </row>
 <row>
 <entry>
+system_has_alarm</entry>
+<entry>
+ has alarm(2) ?</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_fork</entry>
+<entry>
+ has fork(2) ?</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_getpwgid</entry>
+<entry>
+ has getpwgid(2) ?</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_getpwuid</entry>
+<entry>
+ has getpwuid(2) ?</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_select</entry>
+<entry>
+ has select(2) ?</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
 thread_cgi_base_url</entry>
 <entry>
  CGI relative path</entry>
diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index e0ca21f6..8c452558 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -284,14 +284,6 @@ error {
 }
 
 has {
-
-   has_* {
-          $has_alarm
-          $has_fork
-          $has_getpwgid
-          $has_getpwuid
-          $has_select
-   }
 }
 
 html {
@@ -596,6 +588,11 @@ system {
 
    system_* {
     ?     $system_accounts
+    ?     $system_has_alarm
+    ?     $system_has_fork
+    ?     $system_has_getpwgid
+    ?     $system_has_getpwuid
+    ?     $system_has_select
    }
 }
 
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index 82f2dad6..bcf7c542 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -667,51 +667,6 @@ $ml_home_dir/guide
 </row>
 <row>
 <entry>
-has_alarm</entry>
-<entry>
- alarm(2) があるか？</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_fork</entry>
-<entry>
- fork(2) があるか？</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_getpwgid</entry>
-<entry>
- getpwgid(2) があるか？</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_getpwuid</entry>
-<entry>
- getpwuid(2) があるか？</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
-has_select</entry>
-<entry>
- select(2) があるか？</entry>
-<entry>
-yes
-   </entry>
-</row>
-<row>
-<entry>
 help_file</entry>
 <entry>
  ヘルプファイル</entry>
@@ -1404,6 +1359,51 @@ root
 </row>
 <row>
 <entry>
+system_has_alarm</entry>
+<entry>
+ alarm(2) があるか？</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_fork</entry>
+<entry>
+ fork(2) があるか？</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_getpwgid</entry>
+<entry>
+ getpwgid(2) があるか？</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_getpwuid</entry>
+<entry>
+ getpwuid(2) があるか？</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
+system_has_select</entry>
+<entry>
+ select(2) があるか？</entry>
+<entry>
+yes
+   </entry>
+</row>
+<row>
+<entry>
 thread_cgi_base_url</entry>
 <entry>
  CGI の相対パス</entry>
diff --git a/fml/etc/default_config.cf.en.in b/fml/etc/default_config.cf.en.in
index 9fa1dd1c..62a252fa 100644
--- a/fml/etc/default_config.cf.en.in
+++ b/fml/etc/default_config.cf.en.in
@@ -2086,31 +2086,31 @@ path_spamc                = @SPAMC@
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwuid	=	yes
+system_has_getpwuid	=	yes
 
 # Descriptions: has getpwgid(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwgid	=	yes
+system_has_getpwgid	=	yes
 
 # Descriptions: has alarm(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_alarm	=	yes
+system_has_alarm	=	yes
 
 # Descriptions: has select(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_select	=	yes
+system_has_select	=	yes
 
 # Descriptions: has fork(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_fork	=	yes
+system_has_fork	=	yes
 
 =head1 MySQL example
 
diff --git a/fml/etc/default_config.cf.ja.in b/fml/etc/default_config.cf.ja.in
index 5f3f6cf1..4859ffd7 100644
--- a/fml/etc/default_config.cf.ja.in
+++ b/fml/etc/default_config.cf.ja.in
@@ -2154,31 +2154,31 @@ path_spamc                = @SPAMC@
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwuid	=	yes
+system_has_getpwuid	=	yes
 
 # Descriptions: getpwgid(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwgid	=	yes
+system_has_getpwgid	=	yes
 
 # Descriptions: alarm(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_alarm	=	yes
+system_has_alarm	=	yes
 
 # Descriptions: select(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_select	=	yes
+system_has_select	=	yes
 
 # Descriptions: fork(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_fork	=	yes
+system_has_fork	=	yes
 
 =head1 MySQL の例
 
diff --git a/fml/etc/src/config.cf.en/system_dependence.cf b/fml/etc/src/config.cf.en/system_dependence.cf
index f797f092..0bbb5348 100644
--- a/fml/etc/src/config.cf.en/system_dependence.cf
+++ b/fml/etc/src/config.cf.en/system_dependence.cf
@@ -8,28 +8,28 @@
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwuid	=	yes
+system_has_getpwuid	=	yes
 
 # Descriptions: has getpwgid(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwgid	=	yes
+system_has_getpwgid	=	yes
 
 # Descriptions: has alarm(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_alarm	=	yes
+system_has_alarm	=	yes
 
 # Descriptions: has select(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_select	=	yes
+system_has_select	=	yes
 
 # Descriptions: has fork(2) ?
 #      History:
 #        Value: yes / no
 #     Examples:
-has_fork	=	yes
+system_has_fork	=	yes
diff --git a/fml/etc/src/config.cf.ja/system_dependence.cf b/fml/etc/src/config.cf.ja/system_dependence.cf
index e6081778..30087768 100644
--- a/fml/etc/src/config.cf.ja/system_dependence.cf
+++ b/fml/etc/src/config.cf.ja/system_dependence.cf
@@ -8,28 +8,28 @@
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwuid	=	yes
+system_has_getpwuid	=	yes
 
 # Descriptions: getpwgid(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_getpwgid	=	yes
+system_has_getpwgid	=	yes
 
 # Descriptions: alarm(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_alarm	=	yes
+system_has_alarm	=	yes
 
 # Descriptions: select(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_select	=	yes
+system_has_select	=	yes
 
 # Descriptions: fork(2) があるか？
 #      History:
 #        Value: yes / no
 #     Examples:
-has_fork	=	yes
+system_has_fork	=	yes