regen: dbms et.al.

2 files changed, 98 insertions, 14 deletions

diff --git a/fml/doc/ja/tutorial/variables/class.sgml b/fml/doc/ja/tutorial/variables/class.sgml
index 3d6f5e8d..6f846138 100644
--- a/fml/doc/ja/tutorial/variables/class.sgml
+++ b/fml/doc/ja/tutorial/variables/class.sgml
@@ -458,11 +458,19 @@ incoming {
 ldap {
 
    ldap_* {
-    ?     $ldap_query_filter
-    ?     $ldap_search_base
-    ?     $ldap_server_bind
-    ?     $ldap_server_password
+    ?     $ldap_base_dn
+    ?     $ldap_bind_dn
+    ?     $ldap_password
+    ?     $ldap_query_add_as_ldif
+    ?     $ldap_query_delete_as_ldif
+    ?     $ldap_query_find_result_attribute
+    ?     $ldap_query_find_search_filter
+    ?     $ldap_query_get_next_key_result_attribute
+    ?     $ldap_query_get_next_key_search_filter
+    ?     $ldap_query_getline_result_attribute
+    ?     $ldap_query_getline_search_filter
     ?     $ldap_servers
+    ?     $ldap_user
    }
 }
 
@@ -500,10 +508,10 @@ log {
     ?     $log_file_default_charset
           $log_format_type
     ?     $log_syslog_facility
-    ?     $log_syslog_host
     ?     $log_syslog_ident
     ?     $log_syslog_options
     ?     $log_syslog_priority
+    ?     $log_syslog_servers
           $log_type
           $use_log
    }
@@ -740,14 +748,14 @@ spool {
 sql {
 
    sql_* {
-    ?     $sql_add
     ?     $sql_database
-    ?     $sql_delete
-    ?     $sql_find
-    ?     $sql_get_next_key
-    ?     $sql_getline
     ?     $sql_password
-    ?     $sql_server
+    ?     $sql_query_add
+    ?     $sql_query_delete
+    ?     $sql_query_find
+    ?     $sql_query_get_next_key
+    ?     $sql_query_getline
+    ?     $sql_servers
     ?     $sql_table
     ?     $sql_user
    }
diff --git a/fml/doc/ja/tutorial/variables/list.sgml b/fml/doc/ja/tutorial/variables/list.sgml
index d595bc61..65f7231f 100644
--- a/fml/doc/ja/tutorial/variables/list.sgml
+++ b/fml/doc/ja/tutorial/variables/list.sgml
@@ -1084,11 +1084,49 @@ ja en
 </row>
 <row>
 <entry>
-ldap_query_filter</entry>
+ldap_base_dn</entry>
 <entry>
- LDAP のフィルタ</entry>
+ base DN to contact in modify, search et.al.</entry>
 <entry>
-(objectclass=*)
+dc=$ml_name, dc=fml, dc=org
+   </entry>
+</row>
+<row>
+<entry>
+ldap_bind_dn</entry>
+<entry>
+ DN to bind.</entry>
+<entry>
+dc=fml, dc=org
+   </entry>
+</row>
+<row>
+<entry>
+ldap_query_add_as_ldif</entry>
+<entry>
+ attributes to add into $ldap_base_dn entry.</entry>
+<entry>
+fmlrecipient:&address
+   fmlmember:&address
+   </entry>
+</row>
+<row>
+<entry>
+ldap_query_delete_as_ldif</entry>
+<entry>
+ attributes to remove from $ldap_base_dn entry.</entry>
+<entry>
+fmlrecipient:&address
+   fmlmember:&address
+   </entry>
+</row>
+<row>
+<entry>
+ldap_user</entry>
+<entry>
+ dummy</entry>
+<entry>
+fml
    </entry>
 </row>
 <row>
@@ -1779,6 +1817,44 @@ plane
 </row>
 <row>
 <entry>
+sql_query_find</entry>
+<entry>
+ 注意: 各行を取り出すのではなく</entry>
+<entry>
+select fml_address from $sql_table
+   where	fml_ml = '$ml_name'
+   and
+   fml_domain = '$ml_domain'
+   and
+   fml_address like '%&regexp%'
+   </entry>
+</row>
+<row>
+<entry>
+sql_query_get_next_key</entry>
+<entry>
+ 注意: 各行を取り出すのではなく</entry>
+<entry>
+select fml_address from $sql_table
+   where fml_ml = '$ml_name'
+   and
+   fml_domain = '$ml_domain'
+   </entry>
+</row>
+<row>
+<entry>
+sql_query_getline</entry>
+<entry>
+ 注意: 各行を取り出すのではなく</entry>
+<entry>
+select fml_address from $sql_table
+   where fml_ml = '$ml_name'
+   and
+   fml_domain = '$ml_domain'
+   </entry>
+</row>
+<row>
+<entry>
 subscribe_command_auth_type</entry>
 <entry>
  subscribe コマンドで confirmation 認証(コールバック認証)</entry>