translated.

9 files changed, 693 insertions, 56 deletions

diff --git a/fml/doc/en/tutorial/setup/apache.sgml b/fml/doc/en/tutorial/setup/apache.sgml
new file mode 100644
index 00000000..728a29d4
--- /dev/null
+++ b/fml/doc/en/tutorial/setup/apache.sgml
@@ -0,0 +1,68 @@
+<!--
+   $FML: apache.sgml,v 1.4 2005/06/25 15:11:36 fukachan Exp $
+-->
+
+
+<chapter id="setup.apache">
+	<title>
+	Apache configuration
+	</title>
+
+
+<warning>
+
+<para>
+See 
+<link linkend="cgi.internal.method">
+<xref linkend="cgi.internal.method">
+</link>
+for the &fml8; CGI internals.
+</para>
+
+</warning>
+
+
+<sect1 id="setup.apache.suexec">
+	<title>
+	Use suexec of apache
+	</title>
+
+<para>
+Build apache enabled with suexec. 
+Run configure  by
+<screen>
+(apache 1.x)
+configure --enable-suexec --suexec-caller=www
+</screen>
+The user "www" can call suexec.
+Please prepare a user specific for suexec-ed environment.
+</para>
+
+<para>
+After apache installation, change httpd.conf to allow ~user/cgi-bin/ form.
+<screen>
+Example:
+
+&lt;Directory /home/*/*/public_html&gt;
+    AllowOverride FileInfo AuthConfig Limit
+    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec ExecCGI
+    &lt;Limit GET POST OPTIONS PROPFIND&gt;
+        Order allow,deny
+        Allow from SPECIFIC_HOST
+    &lt;/Limit&gt;
+&lt;/Directory&gt;
+
+&lt;IfModule mod_mime.c&gt;
+	... snip ...
+
+   AddHandler cgi-script .cgi
+
+	... snip ...
+&lt;/IfModule&gt;
+</screen>
+</para>
+
+</sect1>
+
+
+</chapter>
diff --git a/fml/doc/en/tutorial/setup/cgi.sgml b/fml/doc/en/tutorial/setup/cgi.sgml
index 7a44906b..8e051b8e 100644
--- a/fml/doc/en/tutorial/setup/cgi.sgml
+++ b/fml/doc/en/tutorial/setup/cgi.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML$
+   $FML: cgi.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
    $jaFML: cgi.sgml,v 1.4 2003/04/15 14:51:43 fukachan Exp $
 -->
 
@@ -13,24 +13,29 @@
 
 <para>
 See the section
-<link linkend="internalcgi.method">
-<xref linkend="internalcgi.method">
+<link linkend="cgi.internal.method">
+<xref linkend="cgi.internal.method">
 </link>
 for CGI Internal details.
 </para>
 
 <para>
-We assumes you use suexec under apache.
+We assumes 
+<link linkend="setup.apache.suexec">
+you use suexec under apache.
+</link>
 </para>
 
 <para>
-Now &fml8; provides the master cgi to control all ML's in one domain,
-but not support a ecgi for each ml. It is not yet implemented.
+Now &fml8; provides both the master cgi to control all ML's in one
+domain and a cgi for each ml. 
+You can add and remove a user, or view member list et.al by this interface.
+Editing of configuration on this cgi is incomplete.
 </para>
 
 <para>
 If you use postfix and qmail, you do not need to modify MTA
-configuration.
+configuration for cgi specific reason.
 </para>
 
 </warning>
@@ -38,7 +43,7 @@ configuration.
 
 <sect1 id="setupcgi.install">
 	<title>
-	"makefml newml" creates CGI script.
+	"makefml newml" creates CGI script always.
 	</title>
 
 <para>
@@ -64,7 +69,6 @@ http://lists.fml.org/~fml/cgi-bin/fml/$domain/ml-admin/${ml_name}/config.cgi
 Example:
 http://lists.fml.org/~fml/cgi-bin/fml/fml.org/ml-admin/elena/config.cgi
 </screen>
-which is not yet created (not implemented _o_).
 </para>
 
 <para>
@@ -90,7 +94,7 @@ http://lists.fml.org/~fml/cgi-bin/fml/fml.org/.htaccess
 </para>
 
 <para>
-The default .htaccess is dummy like this:
+The default .htaccess is a dummy like this:
 <screen>
 AuthName ByPassword
 AuthType Basic
@@ -99,6 +103,11 @@ require valid-user
 Please edit .htaccess properly.
 </para>
 
+<para>
+Apache dos not support ~user style access by default.
+Please set up apache to enable it.
+</para>
+
 </sect1>
 
 
@@ -188,4 +197,24 @@ Specify the address to subscribe and push "submit" at the center.
 </sect1>
 
 
+<sect1 id="setupcgi.admin.cgi.skin">
+	<title>
+	CGI skin selection
+	</title>	
+
+<para>
+config.cgi is TABLE and SELECT based.
+If you use old style menu, use menu.cgi.
+<screen>
+for a whole domain
+~fml/public_html/fml/DOMAIN/admin/menu.cgi
+
+for a ml
+~fml/public_html/fml/DOMAIN/ml-admin/menu.cgi
+</screen>
+</para>
+
+</sect1>
+
+
 </chapter>
diff --git a/fml/doc/en/tutorial/setup/config.cf.sgml b/fml/doc/en/tutorial/setup/config.cf.sgml
index 290c9a03..f05bc2ff 100644
--- a/fml/doc/en/tutorial/setup/config.cf.sgml
+++ b/fml/doc/en/tutorial/setup/config.cf.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML$
+   $FML: config.cf.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
    $jaFML: config.cf.sgml,v 1.3 2003/04/15 14:51:44 fukachan Exp $
 -->
 
@@ -11,7 +11,7 @@
 <para>
 In running "makefml newml", makefml sets up
 configuration files such as config.cf,
-include files for sendmail and postfix, 
+include files for sendmail and postfix and
 ~fml/.qmail-* files. 
 <screen>
 % su fml
@@ -30,7 +30,7 @@ edit config.cf.
 
 <warning>
 <para>
-no menu tool to edit config.cf yet implemented.
+menu tool to edit config.cf is incomplete.
 </para>
 </warning>
 
@@ -42,8 +42,20 @@ For example,
 <screen>
 "| /usr/local/libexec/fml/distribute elena@fml.org"
 </screen>
-elena@fml.org in this argument determins 
+/var/spool/ml/elena/include-ctl file follows:
+<screen>
+"| /usr/local/libexec/fml/commande elena@fml.org"
+</screen>
+/usr/local/libexec/fml/PROGMAR resolves ml_name and ml_domain from 
+the arguments such as elena@fml.org.
+That is, elena@fml.org in this argument determines 
 values of $ml_domain and $ml_name.
+It is enough that ml_name and ml_domain in config.cf is a comment.
+</para>
+
+<para>
+The content of include, include-ctl and aliases are same as &fml4;
+except for the path.
 </para>
 
 </sect1>
diff --git a/fml/doc/en/tutorial/setup/merge.fml4to8.sgml b/fml/doc/en/tutorial/setup/merge.fml4to8.sgml
new file mode 100644
index 00000000..d67ff48d
--- /dev/null
+++ b/fml/doc/en/tutorial/setup/merge.fml4to8.sgml
@@ -0,0 +1,313 @@
+<!--
+   $FML: merge.fml4to8.sgml,v 1.6 2005/06/25 15:11:37 fukachan Exp $
+-->
+
+
+<chapter id="mergeml.fml4to8">
+	<title>
+	Convert &fml4; style ML to &fml8; style ML
+	</title>
+
+<para>
+2004/03: We have implemented a converter which converts ML HOME
+DIRECTORY ($DIR) such as /var/spool/ml/elena ($ml_home_dir in &fml8;)
+from &fml4; style to &fml8; style.
+It is incomplete but is being developed.
+</para>
+
+<para>
+2004/11: 
+<link linkend="mergeml.fml4.overview">
+You can replace fml.pl of &fml4; with fml.pl of &fml8;.
+</link>
+now.
+It means that &fml8; directly emulates &fml4;.
+It enables easy upgrade from &fml4; to &fml8;.
+</para>
+
+
+<sect1 id="mergeml.fml4to8.overview">
+	<title>
+	Overview: &fml4; to &fml8; (1)
+	</title>
+
+<para>
+It is wrong that &fml8; works if &fml8; overwrites &fml4; programs.
+</para>
+
+<para>
+Currently &fml8; can work but it needs automatic conversion in the
+background.
+</para>
+
+<para>
+Firstly you want to upgrade all ML's at the same time from &fml4; to
+&fml8; ?
+It is better to upgrade from one to one ?
+When something fails, you want to downgrade your system if could.
+</para>
+
+<para>
+We want to support that upgrade of each ML. So it is available that
+some ML's are &fml8;, other ML's are &fml4; in one domein.
+Downgrading if needed are supported.
+</para>
+
+<para>
+One example of upgrade operation follows:
+<screen>
+1. install fml8
+
+2. (in the case of postfix) add &fml8; aliases to postfix's alias_maps.
+
+   Example:
+	alias_maps	=	hash:/etc/mail/aliases
+				hash:/var/spool/ml/etc/aliases (fml4)
+				hash:/var/spool/ml/etc/mail/aliases (fml8)
+
+
+3. convert &fml4; ML to &fml8; one.
+
+   fml $ml mergeml fml4's$DIR 
+for example,
+   fml elena mergeml /var/spool/ml/elena
+</screen>
+Apply 3. for ML's which would be converted to &fml8;.
+</para>
+
+<para>
+You can use "makefml mergeml" command of aliases, include files,
+&fml4; configuration files and member lists from &fml4; to &fml8;.
+</para>
+
+<para>
+It is not easy to convert difficult config.ph file. Now we can convert
+simple config.ph to &fml8; config.cf style file automatically. We
+support this simple config.ph is generatd by &fml4;'s "makefml config"
+command.
+</para>
+
+</sect1>
+
+
+<sect1 id="mergeml.fml4.overview">
+	<title>
+	Overview: convert &fml4; to &fml8; (2)
+	</title>
+
+<para>
+2004/11: you can replace &fml4;'s fml.pl with &fml8;'s fml.pl.
+</para>
+
+<para>
+Configure like this.
+<screen>
+% su fml
+% make configure
+% su root
+# make install
+# mv /usr/local/fml/fml.pl /usr/local/fml/fml.pl.orig
+# ln -s /usr/local/libexec/fml/fml.pl   /usr/local/fml/fml.pl
+# ln -s /usr/local/libexec/fml/msend.pl /usr/local/fml/msend.pl
+# ln -s /usr/local/libexec/fml/mead.pl  /usr/local/fml/libexec/mead.pl
+</screen>
+</para>
+
+<para>
+Precisely &fml8; can not read &fml4; configuration file.  If &fml8;'s
+fml.pl cannot find config.cf, it tries to convert config.ph in ML's
+home directory to config.cf, read it and starts to run.
+</para>
+
+<para>
+The conversion is incomplete but &fml8; can convert simple
+configurations manipulated by &fml4; CUI or GUI.
+</para>
+
+</sect1>
+
+
+<sect1 id="mergeml.fml4to8.config.diff">
+	<title>
+	Overview: difference between &fml4; and &fml8;
+	</title>
+
+<para>
+There are several &fml8; variables and functions not related with
+&fml4; since &fml8; is re-designed and re-coded from scratch.
+</para>
+
+<para>
+Also not one to one if the relation found.
+</para>
+
+<para>
+Let's see a few examples below.
+</para>
+
+
+<sect2>
+	<title>
+	Anyone can post
+	</title>
+
+<para>
+Users registered as members can post ML. 
+This default behaviour is common between &fml4; and &fml8;.
+To set "anyone can post", in the case of &fml4;,
+<screen>
+$PERMIT_POST_FROM = "anyone";
+</screen>
+in the case of &fml8;, 
+<screen>
+article_post_restrictions = reject_system_special_accounts
+                            permit_anyone
+                            reject
+</screen>
+.
+</para>
+
+</sect2>
+
+<sect2>
+	<title>
+	Subject tag
+	</title>
+
+<para>
+no subject tag by default.
+This is common between &fml4; and &fml8;
+To set the tag such as '[ML_NAME:00100]', in the case of &fml4;,
+<screen>
+$SUBJECT_TAG_TYPE = '[:]';
+</screen>
+This corresponds to the &fml8; configuration:
+<screen>
+article_header_rewrite_rules = rewrite_article_subject_tag
+
+article_subject_tag           = [$ml_name:%05d]
+</screen>
+</para>
+
+</sect2>
+
+<sect2>
+	<title>
+	Disable specific command in command mail
+	</title>
+
+<para>
+Commands such as members are prohibited in &fml8; by default.
+&fml4; needs the following configurations:
+<screen>
+&amp;DENY_PROCEDURE('member');
+&amp;DENY_PROCEDURE('active');
+&amp;DENY_PROCEDURE('members');
+&amp;DENY_PROCEDURE('actives');
+&amp;DENY_PROCEDURE('status');
+&amp;DENY_PROCEDURE('stat');
+</screen>
+</para>
+
+<para>
+Old &fml4; use no filter by default but &fml8; uses filter by default.
+</para>
+
+<para>
+&fml8; applies confirmation for subscribe, chaddr, unsubscribe
+commands by default.  &fml4; not.  Currently &fml8; always applies
+confirmation, which is not disabled by configuration.
+</para>
+
+</sect2>
+
+</sect1>
+
+
+<sect1 id="mergeml.fml4to8.boot">
+	<title>
+	Implementation: boot process
+	</title>
+
+<para>
+"makefml mergeml" command processes the following steps automatically.
+</para>
+
+<para>
+To clarify details more, explain conversion of aliases and include
+files below.
+</para>
+
+<para>
+Firstly, we need MTA runs &fml4; and &fml4; runs &fml8; too.
+Our purpose is to run &fml8; anyway.
+If &fml8; runs, converter of config.ph runs too.
+</para>
+
+<para>
+Explain more details. Consider
+<link linkend="overview.ml">
+ML driver internal
+</link>
+section.
+</para>
+
+<para>
+For example, when you use postfix, postfix reads aliases and
+recognizes it needs to read include file. By reading include file,
+postfix knows how to call &fml8; process. Finally, postfix runs
+/usr/local/libexec/fml/distribute command.
+</para>
+
+<para>
+Executed distribute command reads config.cf and knows the location of
+member lists and processes et.al.
+</para>
+
+<para>
+That is, when &fml8; starts, 
+the following two phases
+<screen>
+aliases (MTA configuration)
+include 
+</screen>
+ends.
+</para>
+
+<para>
+It is mandatory that no duplication in aliases files.
+For example, 
+if /etc/postfix/main.cf contains the following configuration:
+<screen>
+alias_maps	=	hash:/etc/mail/aliases
+			hash:/var/spool/ml/etc/aliases (fml4)
+			hash:/var/spool/ml/etc/mail/aliases (fml8)
+</screen>
+aliases of &fml4; and &fml8; has no duplication.
+</para>
+
+<para>
+In othe words, in the case of &fml4; process,
+<screen>
+MTA -> fml4's aliases -> fml4's include -> fml4 (fml.pl) runs
+</screen>
+in the case of &fml8; process, 
+<screen>
+MTA -> fml8's aliases -> fml8's include -> fml8 runs
+</screen>
+So we need the following condition:
+<screen>
+remove the ml from fml4's aliases file.
+add the ml to fml8's aliases file.
+</screen>
+</para>
+
+<para>
+If no duplication in aliases, 
+both &fml4; and &fml8; runs on the same host.
+</para>
+
+</sect1>
+
+
+</chapter>
diff --git a/fml/doc/en/tutorial/setup/newml.recipes.sgml b/fml/doc/en/tutorial/setup/newml.recipes.sgml
new file mode 100644
index 00000000..cbb4b55f
--- /dev/null
+++ b/fml/doc/en/tutorial/setup/newml.recipes.sgml
@@ -0,0 +1,85 @@
+<!--
+   $FML$
+   $jaFML: newml.recipes.sgml,v 1.3 2004/10/06 09:07:42 fukachan Exp $
+-->
+
+
+<sect1 id="setup.newml.recipies">
+        <title>
+	Recipes
+        </title>
+
+<qandaset>
+
+
+<!-- Q -->
+<qandaentry>
+
+<question>
+<para>
+specify administrator's mail address in alias file
+when "newml" command runs.
+</para>
+</question>
+
+<answer>
+<para>
+CUI (makefml/fml) creats an alias in "newml".
+<screen>
+${ml_name}-admin: ADDRESS
+</screen>
+where ADDRESS is defined by $newml_command_ml_admin_default_address.
+
+By default, $newml_command_ml_admin_default_address == $fml_owner
+defined in /usr/local/etc/fml/main.cf file.
+
+Specify
+$newml_command_ml_admin_default_address 
+in site_default_config.cf.
+<screen>
+$newml_command_ml_admin_default_address = YOUR_ADDRESS
+</screen>
+
+You can use $ml_name here.
+<screen>
+$newml_command_ml_admin_default_address = $ml_name-owner@$ml_domain
+</screen>
+</para>
+
+</answer>
+
+</qandaentry>
+
+
+<!-- Q -->
+<qandaentry>
+
+<question>
+<para>
+Not create a configuration file for a specific MTA not used.
+</para>
+</question>
+
+<answer>
+<para>
+$newml_command_mta_config_list defines 
+examples of MTA list "newml" command creates.
+Remove the specific MTA from the list.
+</para>
+
+<para>
+For example, you do not need "qmail" configuration example
+<screen>
+newml_command_mta_config_list -= qmail
+</screen>
+&fml8; does not generate ~/.qmail-* files.
+</para>
+
+</answer>
+
+</qandaentry>
+
+
+</qandaset>
+
+</sect1>
diff --git a/fml/doc/en/tutorial/setup/newml.sgml b/fml/doc/en/tutorial/setup/newml.sgml
index 3d415881..2d7d91f0 100644
--- a/fml/doc/en/tutorial/setup/newml.sgml
+++ b/fml/doc/en/tutorial/setup/newml.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML$
+   $FML: newml.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
    $jaFML: newml.sgml,v 1.3 2003/04/15 14:51:44 fukachan Exp $
 -->
 
@@ -12,17 +12,41 @@
 
 <sect1>
 	<title>
-	run "makefml newml" to create an ML
+	run "makefml newml" to create an ML (in the case of default domain)
 	</title>
 
+<caution>
 <para>
-To create an ML, use "makefml" command (CUI).
+The usage of &fml8; makefml is same as &fml4; in the case of default
+domain.  But not in the virtual domain case. See
+<link linkend="setup.newml.nondefault">
+<xref linkend="setup.newml.nondefault">
+</link>
+for the virtual domain case.
+</para>
+</caution>
+
+<para>
+To create an ML, use "makefml" command (CUI) in the same way as &fml4;.
 <screen>
 % su fml
 % makefml newml elena
+   ... snip ...
 </screen>
 </para>
 
+<para>
+In the case of non default domain (virtual domain), 
+run "makefml newdomain" command before run "makefml newml".
+<screen>
+% su root
+# makefml newdomain fml.org /var/spool/virtual/fml.org
+# exit
+% su fml
+% makefml newml elena
+   ... snip ...
+</screen>
+</para>
 
 <para>
 "makefml newml" processes the following steps.
@@ -37,8 +61,8 @@ To create an ML, use "makefml" command (CUI).
 	include
 	include-ctl
 	</screen>
-	at /var/spool/ml/elena.
-	The domai name et.al.  in these files is replaced to proper value.
+	at /var/spool/ml/elena. The domain name et.al. in these files
+	is replaced to proper value.
         </para>
    </listitem>
 
@@ -63,12 +87,6 @@ To create an ML, use "makefml" command (CUI).
 
    <listitem>
         <para>
-	create samples for each MTA.
-        </para>
-   </listitem>
-
-   <listitem>
-        <para>
 	prepare the directory
 	<screen>
 	~fml/public_html/fml/mlarchive/$domain/$ml/
@@ -103,6 +121,81 @@ To create an ML, use "makefml" command (CUI).
 </sect1>
 
 
+<sect1 id="setup.newml.nondefault">
+	<title>
+	run "makefml newml" to create an ML (in the case of non default domain)
+	</title>
+
+<caution>
+<para>
+The usage of makefml differs from &fml4;.
+In the case of &fml8; firstly use "makefml newdomain" command, 
+in the next run "makefml newml" command.
+Also ml_name differs. For virtual domain, use ml_name@ml_domain form.
+</para>
+</caution>
+
+<para>
+In using "makefml newml", the usage is same as &fml4; except for 
+the ml_name. ml_name part is ml_name@ml_domain in the case of &fml8;
+</para>
+
+<para>
+At the first time to use a virtual domain, 
+run "makefml newdomain" before "makefml newml".
+<screen>
+% su root
+# makefml newdomain nuinui.net /var/spool/virtual/nuinui.net
+# exit
+% su fml
+% makefml newml elena@nuinui.net
+</screen>
+After the second time, just use "makefml newml". 
+<screen>
+% su fml
+% makefml newml elena@nuinui.net
+</screen>
+</para>
+
+<para>
+In running "makefml newdomain", 
+specify a pair of domain and directory in ml_home_prefix_maps.
+This command edits /usr/local/etc/fml/ml_home_prefix file to add the
+following line.
+<screen>
+nuinui.net /var/spool/virtual/nuinui.net
+</screen>
+To remove this line, use "makefml rmdomain".
+</para>
+
+<para>
+The usage of "makefml newml" command is same as in the case of default
+domain.
+</para>
+
+<para>
+"makefml newml" creates an example of virtual domain configurations
+for several MTA's such as
+<screen>
+/var/spool/ml/etc/sendmail/virtusertable
+/var/spool/ml/etc/postfix/virtual
+</screen>
+.
+No example for qmail.
+No example for procmail since .procmailrc contains domain.
+</para>
+
+<para>
+See the chapter of
+<link linkend="virtualdomain">
+virtual domain
+</link>
+for more details.
+</para>
+
+</sect1>
+
+
 <!-- MTA config -->
 &sect.setup.postfix;
 &sect.setup.qmail;
@@ -112,4 +205,7 @@ To create an ML, use "makefml" command (CUI).
 &sect.setup.config.cf;
 
 
+<!-- recipies -->
+&sect.setup.newml.recipes;
+
 </chapter>
diff --git a/fml/doc/en/tutorial/setup/procmail.sgml b/fml/doc/en/tutorial/setup/procmail.sgml
index 8f48faff..9e6af891 100644
--- a/fml/doc/en/tutorial/setup/procmail.sgml
+++ b/fml/doc/en/tutorial/setup/procmail.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML$
+   $FML: procmail.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
    $jaFML: procmail.sgml,v 1.3 2003/04/15 14:51:44 fukachan Exp $
 -->
 
@@ -9,18 +9,25 @@
 	</title>
 
 <para>
-When you need to set up a ML on your account, for example virtual
-domain service of ISP, use a mail processor such as procmail.
+When you set up a ML within your account, for example when you are
+using virtual domain service of ISP, you need to use a mail processor
+such as procmail.
 </para>
 
 <para>
-You need to filter messages according to To: or Cc: in the mail header
-and redistribute it.
+To catch up messages to ML's, you need to filter messages according to
+To: or Cc: in the mail header and redistribute it.
 </para>
 
 <para>
-makefml creates/updates ~/.procmailrc sample in newml 
-at /var/spool/ml/etc/procmail/procmailrc.
+&fml8; expects the user uses a filter tool such as procmail in such a
+situation. &fml8; itself does not provide such a tool.
+</para>
+
+<para>
+makefml creates/updates ~/.procmailrc sample in running "makefml
+newml" at /var/spool/ml/etc/procmail/procmailrc. Please use it as a
+sample.
 </para>
 
 
@@ -54,4 +61,19 @@ inbox/.
 
 </sect2>
 
+<sect2>
+	<title>
+	virtual domain case
+	</title>
+
+<para>
+The procmail rules above contains ml_name and ml_domain within it.
+So it does not need special handling for virtual domain.
+</para>
+
+<para>
+MTA configuration is another issue. Please contact administrator on
+it.
+</para>
+
 </sect1>
diff --git a/fml/doc/en/tutorial/setup/qmail.sgml b/fml/doc/en/tutorial/setup/qmail.sgml
index d52ca167..2655a699 100644
--- a/fml/doc/en/tutorial/setup/qmail.sgml
+++ b/fml/doc/en/tutorial/setup/qmail.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML$
+   $FML: qmail.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
    $jaFML: qmail.sgml,v 1.2 2002/07/06 14:55:20 fukachan Exp $
 -->
 
@@ -14,11 +14,8 @@
 ~fml/.qmail-fml:org-elena
 ~fml/.qmail-fml:org-elena-ctl
 </screen>
-Hence, 
-<screen>
-/var/qmail/control/virtualdomains
-</screen>
-is prepared like this, 
+Hence, if /var/qmail/control/virtualdomains contains the following
+definition
 <screen>
 fml.org:fml-fml.org
 </screen>
@@ -33,4 +30,16 @@ ML's uses the whole one domain only for mailing list.
 </para>
 </warning>
 
+<sect2>
+	<title>
+	virtual domain case
+	</title>
+
+<para>
+The logic is same as above. So you need to edit
+/var/qmail/control/virtualdomains to make an ML effective
+automatically when you runs "makefml newml".  This edit needs root
+priviledge. Please contact the administrator on it.
+</para>
+
 </sect1>
diff --git a/fml/doc/en/tutorial/setup/test.sgml b/fml/doc/en/tutorial/setup/test.sgml
index 970e389d..8b37fe3c 100644
--- a/fml/doc/en/tutorial/setup/test.sgml
+++ b/fml/doc/en/tutorial/setup/test.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML$
+   $FML: test.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
    $jaFML: test.sgml,v 1.4 2003/04/15 14:51:44 fukachan Exp $
 -->
 
@@ -31,34 +31,35 @@ the mail server.
 
 <sect1>
 	<title>
-	test of only MTA
+	test of MTA
 	</title>
 
 <para>
-check MTA without fml on ahodori.fml.org.
+Firstly, check MTA without fml on ahodori.fml.org.
 </para>
 
 <para>
-FIrstly, 
-prepare one personal user address such as rudo@fml.org.
+Prepare one personal user address such as rudo@fml.org.
 Usually, just create a user named as "rudo".
 <screen>
 # useradd rudo
 </screen>
+Check you can send a mail to rudo@fml.org on ahodori.fml.org and rudo
+receives the mail.
+<screen>
+% echo test |Mail rudo@fml.org
+</screen>
+If it not works, check MTA configuration.
 </para>
 
 <para>
-You should verify SMTP over network.
+Secondary, verify mail delivery over network.
 Send a mail to rudo@fml.org from other host (not ahodori.fml.org).
 If rudo receives the mail, o.k.
 </para>
 
 <para>
-Secondly check the local delivery.
-send a mail to rudo@fml.org on ahodori.fml.org.
-<screen>
-% echo test |Mail rudo@fml.org
-</screen>
+If both work well, MTA configuration must be ok.
 </para>
 
 </sect1>
@@ -79,21 +80,23 @@ Create elena ML (elena@fml.org) and subscribe rudo@fml.org to elena ML.
 </para>
 
 <para>
-Send a test mail to elena@fml.org from other host (not ahodori.fml.org).
-Verify the header of this test mail should be "From: rudo@fml.org".
+Send a test mail to elena@fml.org from on the host and from other host
+(not ahodori.fml.org).  Verify the header of this test mail should be
+"From: rudo@fml.org" since &fml8; checks the From:.
 </para>
 
+
 <sect2>
 	<title>
-	checks
+	checkpoints
 	</title>
 
 <para>
-If not works well, check the following: 
+If someting not work well, check the following points: 
 <screen>
 check the mail server log (e.g. /var/log/maillog)
 check the fml log (e.g. /var/spool/m/elena/log)
-fml pass the message to MTA ?
+fml can pass the message to MTA ?
 MTA succeeds to deliver it?
 </screen>
 </para>
@@ -127,11 +130,11 @@ It is easy to re-create this mailing list (e.g. test ML).
 % makefml rmml test
 % makefml newml test
 </screen>
-The removed ML home is left as /var/spool/ml/@test.
+The removed ML home is left as /var/spool/ml/@test.$DATE.
 Please remove it since this is a test to avoid the duplication in the
 future.
 <screen>
-% rm -fr /var/spool/ml/@test
+% rm -fr /var/spool/ml/@test.$DATE
 </screen>
 </para>