clean up.

10 files changed, 135 insertions, 125 deletions

diff --git a/fml/doc/en/tutorial/setup/apache.sgml b/fml/doc/en/tutorial/setup/apache.sgml
index 728a29d4..cf217055 100644
--- a/fml/doc/en/tutorial/setup/apache.sgml
+++ b/fml/doc/en/tutorial/setup/apache.sgml
@@ -1,11 +1,11 @@
 <!--
-   $FML: apache.sgml,v 1.4 2005/06/25 15:11:36 fukachan Exp $
+   $FML: apache.sgml,v 1.1 2005/07/23 01:57:36 fukachan Exp $
 -->
 
 
 <chapter id="setup.apache">
 	<title>
-	Apache configuration
+	Apache Configuration
 	</title>
 
 
@@ -24,17 +24,17 @@ for the &fml8; CGI internals.
 
 <sect1 id="setup.apache.suexec">
 	<title>
-	Use suexec of apache
+	Use Suexec Of Apache
 	</title>
 
 <para>
 Build apache enabled with suexec. 
-Run configure  by
+Run configure by
 <screen>
 (apache 1.x)
 configure --enable-suexec --suexec-caller=www
 </screen>
-The user "www" can call suexec.
+In this case, the user "www" can call suexec.
 Please prepare a user specific for suexec-ed environment.
 </para>
 
diff --git a/fml/doc/en/tutorial/setup/cgi.sgml b/fml/doc/en/tutorial/setup/cgi.sgml
index 8e051b8e..27c7f5f3 100644
--- a/fml/doc/en/tutorial/setup/cgi.sgml
+++ b/fml/doc/en/tutorial/setup/cgi.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML: cgi.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
+   $FML: cgi.sgml,v 1.2 2005/07/23 01:57:36 fukachan Exp $
    $jaFML: cgi.sgml,v 1.4 2003/04/15 14:51:43 fukachan Exp $
 -->
 
@@ -28,8 +28,8 @@ you use suexec under apache.
 
 <para>
 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.
+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>
 
@@ -43,7 +43,7 @@ configuration for cgi specific reason.
 
 <sect1 id="setupcgi.install">
 	<title>
-	"makefml newml" creates CGI script always.
+	"makefml newml" Creates CGI Script Always
 	</title>
 
 <para>
@@ -58,15 +58,18 @@ In creating elena@fml.org ML, makefml creates the following cgi
 <screen>
 http://lists.fml.org/~fml/cgi-bin/fml/$domain/admin/config.cgi
 
-Example:
+[Example]
 http://lists.fml.org/~fml/cgi-bin/fml/fml.org/admin/config.cgi
 </screen>
 for all ML's of fml.org.
+</para>
+
+<para>
 To control only elena ML, please use 
 <screen>
 http://lists.fml.org/~fml/cgi-bin/fml/$domain/ml-admin/${ml_name}/config.cgi
 
-Example:
+[Example]
 http://lists.fml.org/~fml/cgi-bin/fml/fml.org/ml-admin/elena/config.cgi
 </screen>
 </para>
@@ -80,7 +83,7 @@ http://lists.fml.org/~fml/cgi-bin/fml/fml.org/ml-admin/elena/config.cgi
 
 <sect1 id="setupcgi.htaccess">
 	<title>
-	edit .htaccess
+	Edit .htaccess
 	</title>
 
 <para>
@@ -88,7 +91,7 @@ http://lists.fml.org/~fml/cgi-bin/fml/fml.org/ml-admin/elena/config.cgi
 <screen>
 http://lists.fml.org/~fml/cgi-bin/fml/$domain/.htaccess
 
-Example:
+[Example]
 http://lists.fml.org/~fml/cgi-bin/fml/fml.org/.htaccess
 </screen>
 </para>
@@ -104,7 +107,7 @@ Please edit .htaccess properly.
 </para>
 
 <para>
-Apache dos not support ~user style access by default.
+Apache does not support ~user style access by default.
 Please set up apache to enable it.
 </para>
 
@@ -113,14 +116,14 @@ Please set up apache to enable it.
 
 <sect1 id="setupcgi.admin.cgi.overview">
 	<title>
-	Example: master cgi
+	Example: Master Cgi
 	</title>
 
 <para>
-The role of this cgi is limited makefml (CUI).
+The role of this cgi is same as limited makefml (CUI).
 Though this cgi permits ML creation and destruction,
 all functions makefml has are not supported.
-The functions is limited.
+The function is limited.
 </para>
 
 <para>
@@ -156,16 +159,16 @@ options Language:    list
 
 <sect1 id="setupcgi.admin.cgi.newml">
 	<title>
-	CGI Example: create an ML
+	CGI Example: Create ML
 	</title>
 
 <para>
 Select newml and push "submit".
-no need to select ML name in this stage.
+No need to select ML name in this stage.
 </para>
 
 <para>
-You find nother menu at the center.
+You find another menu at the center.
 Specify the ML name you create and push "submit" at the center.
 </para>
 
@@ -178,7 +181,7 @@ Specify the ML name you create and push "submit" at the center.
 
 <sect1 id="setupcgi.admin.cgi.subscribe">
 	<title>
-	CGI example: subscribe
+	CGI Example: subscribe
 	</title>
 
 <para>
@@ -199,7 +202,7 @@ Specify the address to subscribe and push "submit" at the center.
 
 <sect1 id="setupcgi.admin.cgi.skin">
 	<title>
-	CGI skin selection
+	CGI Skin Selection
 	</title>	
 
 <para>
diff --git a/fml/doc/en/tutorial/setup/config.cf.sgml b/fml/doc/en/tutorial/setup/config.cf.sgml
index f05bc2ff..8db5ad80 100644
--- a/fml/doc/en/tutorial/setup/config.cf.sgml
+++ b/fml/doc/en/tutorial/setup/config.cf.sgml
@@ -1,11 +1,11 @@
 <!--
-   $FML: config.cf.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
+   $FML: config.cf.sgml,v 1.2 2005/07/23 01:57:36 fukachan Exp $
    $jaFML: config.cf.sgml,v 1.3 2003/04/15 14:51:44 fukachan Exp $
 -->
 
 <sect1 id="setup.config.cf">
 	<title>
-	customize config.cf
+	Customize config.cf
 	</title>
 
 <para>
diff --git a/fml/doc/en/tutorial/setup/merge.fml4to8.sgml b/fml/doc/en/tutorial/setup/merge.fml4to8.sgml
index d67ff48d..8fea16cf 100644
--- a/fml/doc/en/tutorial/setup/merge.fml4to8.sgml
+++ b/fml/doc/en/tutorial/setup/merge.fml4to8.sgml
@@ -1,11 +1,11 @@
 <!--
-   $FML: merge.fml4to8.sgml,v 1.6 2005/06/25 15:11:37 fukachan Exp $
+   $FML: merge.fml4to8.sgml,v 1.1 2005/07/23 01:57:36 fukachan Exp $
 -->
 
 
 <chapter id="mergeml.fml4to8">
 	<title>
-	Convert &fml4; style ML to &fml8; style ML
+	Convert &fml4; Style ML To &fml8; Style ML
 	</title>
 
 <para>
@@ -28,37 +28,33 @@ It enables easy upgrade from &fml4; to &fml8;.
 
 <sect1 id="mergeml.fml4to8.overview">
 	<title>
-	Overview: &fml4; to &fml8; (1)
+	Overview: &fml4; To &fml8; (1)
 	</title>
 
 <para>
-It is wrong that &fml8; works if &fml8; overwrites &fml4; programs.
+It is a little wrong that &fml8; works if &fml8; overwrites &fml4;
+programs. Currently &fml8; can work but it needs automatic conversion
+in the background. Hence, &fml8; modifies &fml4; to emulate &fml4;.
 </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 ?
+Firstly there is a problem. 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.
+We want to support both types. So it is available that some ML's are
+&fml8;, other ML's are &fml4; in one domain
+simultaneously. Downgrading if needed are supported.
 </para>
 
 <para>
 One example of upgrade operation follows:
 <screen>
-1. install fml8
+1. install &fml8;
 
-2. (in the case of postfix) add &fml8; aliases to postfix's alias_maps.
+2. (in the case of Postfix) add &fml8; aliases to postfix's alias_maps.
 
    Example:
 	alias_maps	=	hash:/etc/mail/aliases
@@ -76,15 +72,16 @@ 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;.
+You can use "makefml mergeml" command to convert 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.
+It is not easy to convert difficult &fml4;'s config.ph file. Now we
+can convert simple config.ph to &fml8; config.cf style file
+automatically. We suppose this simple config.ph is generated by
+&fml4;'s "makefml config" command.
 </para>
 
 </sect1>
@@ -92,7 +89,7 @@ command.
 
 <sect1 id="mergeml.fml4.overview">
 	<title>
-	Overview: convert &fml4; to &fml8; (2)
+	Overview: Convert &fml4; To &fml8; (2)
 	</title>
 
 <para>
@@ -102,10 +99,15 @@ command.
 <para>
 Configure like this.
 <screen>
+[1. Install &fml8;]
+
 % su fml
-% make configure
+% sh configure
 % su root
 # make install
+
+[2. Emulate &fml4;]
+
 # 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
@@ -116,7 +118,7 @@ Configure like this.
 <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.
+home directory to &fml8; config.cf, read it and starts to run.
 </para>
 
 <para>
@@ -129,7 +131,7 @@ configurations manipulated by &fml4; CUI or GUI.
 
 <sect1 id="mergeml.fml4to8.config.diff">
 	<title>
-	Overview: difference between &fml4; and &fml8;
+	Overview: Difference Between &fml4; and &fml8;
 	</title>
 
 <para>
@@ -138,7 +140,7 @@ There are several &fml8; variables and functions not related with
 </para>
 
 <para>
-Also not one to one if the relation found.
+Also not one to one even if the relation found.
 </para>
 
 <para>
@@ -148,11 +150,11 @@ Let's see a few examples below.
 
 <sect2>
 	<title>
-	Anyone can post
+	Anyone Can Post
 	</title>
 
 <para>
-Users registered as members can post ML. 
+Users registered as members can post ML by default.  
 This default behaviour is common between &fml4; and &fml8;.
 To set "anyone can post", in the case of &fml4;,
 <screen>
@@ -171,34 +173,35 @@ article_post_restrictions = reject_system_special_accounts
 
 <sect2>
 	<title>
-	Subject tag
+	Subject Tag
 	</title>
 
 <para>
-no subject tag by default.
+No subject tag defined 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:
+This corresponds to the following &fml8; configuration:
 <screen>
 article_header_rewrite_rules = rewrite_article_subject_tag
 
 article_subject_tag           = [$ml_name:%05d]
 </screen>
+&fml8; configuration concepts are more orthogonal.
 </para>
 
 </sect2>
 
 <sect2>
 	<title>
-	Disable specific command in command mail
+	Disable Specific Command In Command Mail
 	</title>
 
 <para>
-Commands such as members are prohibited in &fml8; by default.
-&fml4; needs the following configurations:
+Commands such as "members" are prohibited in &fml8; by default.
+&fml4; needs the following configurations to disable dangerous commands:
 <screen>
 &amp;DENY_PROCEDURE('member');
 &amp;DENY_PROCEDURE('active');
@@ -215,8 +218,8 @@ Old &fml4; use no filter by default but &fml8; uses filter by default.
 
 <para>
 &fml8; applies confirmation for subscribe, chaddr, unsubscribe
-commands by default.  &fml4; not.  Currently &fml8; always applies
-confirmation, which is not disabled by configuration.
+commands by default. &fml4; not. Currently &fml8; always applies
+confirmation, which can not be disabled by configuration.
 </para>
 
 </sect2>
@@ -226,7 +229,7 @@ confirmation, which is not disabled by configuration.
 
 <sect1 id="mergeml.fml4to8.boot">
 	<title>
-	Implementation: boot process
+	Discussion
 	</title>
 
 <para>
@@ -239,9 +242,9 @@ 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.
+So, we need MTA runs &fml4; and &fml4; runs &fml8;.
 </para>
 
 <para>
@@ -253,9 +256,9 @@ section.
 </para>
 
 <para>
-For example, when you use postfix, postfix reads aliases and
+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
+Postfix knows how to call &fml8; process. Finally, postfix runs
 /usr/local/libexec/fml/distribute command.
 </para>
 
@@ -265,7 +268,7 @@ member lists and processes et.al.
 </para>
 
 <para>
-That is, when &fml8; starts, 
+That is, when &fml8; process starts, 
 the following two phases
 <screen>
 aliases (MTA configuration)
@@ -283,7 +286,7 @@ 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.
+aliases of &fml4; and &fml8; should not have duplication.
 </para>
 
 <para>
diff --git a/fml/doc/en/tutorial/setup/newml.recipes.sgml b/fml/doc/en/tutorial/setup/newml.recipes.sgml
index cbb4b55f..7204c4ee 100644
--- a/fml/doc/en/tutorial/setup/newml.recipes.sgml
+++ b/fml/doc/en/tutorial/setup/newml.recipes.sgml
@@ -1,5 +1,5 @@
 <!--
-   $FML$
+   $FML: newml.recipes.sgml,v 1.1 2005/07/23 01:57:36 fukachan Exp $
    $jaFML: newml.recipes.sgml,v 1.3 2004/10/06 09:07:42 fukachan Exp $
 -->
 
@@ -17,7 +17,7 @@
 
 <question>
 <para>
-specify administrator's mail address in alias file
+Specify administrator's mail address in alias file
 when "newml" command runs.
 </para>
 </question>
@@ -33,7 +33,7 @@ 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
+To change the value, specify
 $newml_command_ml_admin_default_address 
 in site_default_config.cf.
 <screen>
@@ -62,9 +62,9 @@ Not create a configuration file for a specific MTA not used.
 
 <answer>
 <para>
-$newml_command_mta_config_list defines 
-examples of MTA list "newml" command creates.
-Remove the specific MTA from the list.
+$newml_command_mta_config_list defines list of MTA.
+"makefml newml" command creates examples of the specified MTA's.
+Remove the specific MTA from the list to disable example creation.
 </para>
 
 <para>
diff --git a/fml/doc/en/tutorial/setup/newml.sgml b/fml/doc/en/tutorial/setup/newml.sgml
index 2d7d91f0..99e9eb25 100644
--- a/fml/doc/en/tutorial/setup/newml.sgml
+++ b/fml/doc/en/tutorial/setup/newml.sgml
@@ -1,24 +1,24 @@
 <!--
-   $FML: newml.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
+   $FML: newml.sgml,v 1.2 2005/07/23 01:57:37 fukachan Exp $
    $jaFML: newml.sgml,v 1.3 2003/04/15 14:51:44 fukachan Exp $
 -->
 
 
 <chapter id="setup.newml">
 	<title>
-	Create ML on UNIX
+	Create ML On Unix
 	</title>
 
 
 <sect1>
 	<title>
-	run "makefml newml" to create an ML (in the case of default domain)
+	Run "makefml newml" To Create An ML (In The Case Of Default Domain)
 	</title>
 
 <caution>
 <para>
 The usage of &fml8; makefml is same as &fml4; in the case of default
-domain.  But not in the virtual domain case. See
+domain.  But differs in the virtual domain case. See
 <link linkend="setup.newml.nondefault">
 <xref linkend="setup.newml.nondefault">
 </link>
@@ -37,7 +37,7 @@ To create an ML, use "makefml" command (CUI) in the same way as &fml4;.
 
 <para>
 In the case of non default domain (virtual domain), 
-run "makefml newdomain" command before run "makefml newml".
+run "makefml newdomain" command before running "makefml newml".
 <screen>
 % su root
 # makefml newdomain fml.org /var/spool/virtual/fml.org
@@ -55,7 +55,7 @@ run "makefml newdomain" command before run "makefml newml".
 
    <listitem>
         <para>
-	create files such as
+	Create files such as
 	<screen>
 	config.cf
 	include
@@ -68,26 +68,26 @@ run "makefml newdomain" command before run "makefml newml".
 
    <listitem>
         <para>
-	add elena ML entry into /var/spool/ml/etc/mail/aliases.
-	run postalias to rebuild /var/spool/ml/etc/mail/aliases.db.
+	Add elena ML entry into /var/spool/ml/etc/mail/aliases.
+	Run postalias to rebuild /var/spool/ml/etc/mail/aliases.db.
         </para>
    </listitem>
 
    <listitem>
         <para>
-	create ~fml/.qmail-* files for qmail.
+	Create ~fml/.qmail-* files for qmail.
         </para>
    </listitem>
 
    <listitem>
         <para>
-	update procmailrc as a sample.
+	Update procmailrc as a sample.
         </para>
    </listitem>
 
    <listitem>
         <para>
-	prepare the directory
+	Prepare the directory
 	<screen>
 	~fml/public_html/fml/mlarchive/$domain/$ml/
 	</screen>
@@ -103,7 +103,7 @@ run "makefml newdomain" command before run "makefml newml".
 
    <listitem>
         <para>
-	prepare CGI (GUI). set up 
+	Prepare CGI (GUI). Set up 
 	<screen>
 	~fml/public_html/cgi-bin/fml/$domain/admin/config.cgi
 	</screen>
@@ -123,7 +123,7 @@ run "makefml newdomain" command before run "makefml newml".
 
 <sect1 id="setup.newml.nondefault">
 	<title>
-	run "makefml newml" to create an ML (in the case of non default domain)
+	Run "makefml newml" To Create An ML (In The Case Of Virtual Domain)
 	</title>
 
 <caution>
@@ -181,7 +181,7 @@ for several MTA's such as
 /var/spool/ml/etc/postfix/virtual
 </screen>
 .
-No example for qmail.
+No example for qmail (not needed).
 No example for procmail since .procmailrc contains domain.
 </para>
 
diff --git a/fml/doc/en/tutorial/setup/postfix.sgml b/fml/doc/en/tutorial/setup/postfix.sgml
index 7b80d257..88de2969 100644
--- a/fml/doc/en/tutorial/setup/postfix.sgml
+++ b/fml/doc/en/tutorial/setup/postfix.sgml
@@ -1,18 +1,17 @@
 <!--
-   $FML$
+   $FML: postfix.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
    $jaFML: postfix.sgml,v 1.3 2003/04/15 14:51:44 fukachan Exp $
 -->
 
 <sect1 id="setup.postfix.aliases">
 	<title>
-	MTA configuration (postfix)
+	MTA Configuration (postfix)
 	</title>
 
 <important>
 <para>
-If $alias_maps of postfix is properly set up,
-makefml automatically prepare fml and postfix configuration 
-for the new ML.
+If $alias_maps of Postfix is properly set up, "makefml newml"
+automatically prepares fml and postfix configuration for the new ML.
 </para>
 
 <para>
@@ -26,16 +25,16 @@ for the detail of postfix configuration.
 
 
 <para>
-makefml do not update system aliases (e.g. /etc/mail/aliases), but
+"makefml" does not update system aliases (e.g. /etc/mail/aliases), but
 updates only alias file $ml_home_prefix/etc/mail/aliases file, which
 is used only for fml.
-makefml rebuilds aliases.db automatically, too.
+"makefml" rebuilds $ml_home_prefix/etc/mail/aliases.db automatically, too.
 </para>
 
 
 <sect2>
 	<title>
-	NOTE: format of /var/spool/ml/etc/mail/aliases
+	NOTE: Format Of /var/spool/ml/etc/mail/aliases
 	</title>
 
 <para>
diff --git a/fml/doc/en/tutorial/setup/procmail.sgml b/fml/doc/en/tutorial/setup/procmail.sgml
index 9e6af891..c95fbf30 100644
--- a/fml/doc/en/tutorial/setup/procmail.sgml
+++ b/fml/doc/en/tutorial/setup/procmail.sgml
@@ -1,39 +1,39 @@
 <!--
-   $FML: procmail.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
+   $FML: procmail.sgml,v 1.2 2005/07/23 01:57:37 fukachan Exp $
    $jaFML: procmail.sgml,v 1.3 2003/04/15 14:51:44 fukachan Exp $
 -->
 
 <sect1 id="setup.procmail">
 	<title>
-	I want to use ML by my account.
+	I Want To Use ML By My Account.
 	</title>
 
 <para>
-When you set up a ML within your account, for example when you are
+When you set up an 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>
 To catch up messages to ML's, you need to filter messages according to
-To: or Cc: in the mail header and redistribute it.
+To: or Cc: in the mail header.
 </para>
 
 <para>
 &fml8; expects the user uses a filter tool such as procmail in such a
-situation. &fml8; itself does not provide such a tool.
+situation. &fml8; distribution 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
+When running "makefml newml", "makefml" creates/updates ~/.procmailrc
+sample at /var/spool/ml/etc/procmail/procmailrc. Please use it as a
 sample.
 </para>
 
 
 <sect2 id="setup.procmailrc">
 	<title>
-	~/.procmailrc example
+	~/.procmailrc Example
 	</title>
 
 <para>
@@ -63,12 +63,13 @@ inbox/.
 
 <sect2>
 	<title>
-	virtual domain case
+	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.
+It is same for both default domain and virtual domain.
 </para>
 
 <para>
diff --git a/fml/doc/en/tutorial/setup/qmail.sgml b/fml/doc/en/tutorial/setup/qmail.sgml
index 2655a699..74486520 100644
--- a/fml/doc/en/tutorial/setup/qmail.sgml
+++ b/fml/doc/en/tutorial/setup/qmail.sgml
@@ -1,18 +1,21 @@
 <!--
-   $FML: qmail.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
+   $FML: qmail.sgml,v 1.2 2005/07/23 01:57:37 fukachan Exp $
    $jaFML: qmail.sgml,v 1.2 2002/07/06 14:55:20 fukachan Exp $
 -->
 
 <sect1 id="setup.qmail.aliases">
 	<title>
-	MTA configuration (qmail)
+	MTA Configuration (qmail)
 	</title>
 
 <para>
 "makefml newml" creates the following files for qmail:
 <screen>
 ~fml/.qmail-fml:org-elena
+~fml/.qmail-fml:org-elena-admin
 ~fml/.qmail-fml:org-elena-ctl
+~fml/.qmail-fml:org-elena-default
+~fml/.qmail-fml:org-elena-request
 </screen>
 Hence, if /var/qmail/control/virtualdomains contains the following
 definition
@@ -32,7 +35,7 @@ ML's uses the whole one domain only for mailing list.
 
 <sect2>
 	<title>
-	virtual domain case
+	Virtual Domain
 	</title>
 
 <para>
diff --git a/fml/doc/en/tutorial/setup/test.sgml b/fml/doc/en/tutorial/setup/test.sgml
index 8b37fe3c..83f24d64 100644
--- a/fml/doc/en/tutorial/setup/test.sgml
+++ b/fml/doc/en/tutorial/setup/test.sgml
@@ -1,22 +1,22 @@
 <!--
-   $FML: test.sgml,v 1.1 2003/07/25 17:05:47 fukachan Exp $
+   $FML: test.sgml,v 1.2 2005/07/23 01:57:37 fukachan Exp $
    $jaFML: test.sgml,v 1.4 2003/04/15 14:51:44 fukachan Exp $
 -->
 
 <chapter id="test">
 	<title>
-	test
+	Test
 	</title>
 
 
 <sect1>
 	<title>
-	before test
+	Before Test
 	</title>
 
 <warning>
 <para>
-set up MTA properly before test of fml.
+Set up MTA properly before test of fml.
 </para>
 </warning>
 
@@ -31,7 +31,7 @@ the mail server.
 
 <sect1>
 	<title>
-	test of MTA
+	Test Of MTA
 	</title>
 
 <para>
@@ -50,12 +50,13 @@ receives the mail.
 % echo test |Mail rudo@fml.org
 </screen>
 If it not works, check MTA configuration.
+See /var/log/maillog et.al to track errors.
 </para>
 
 <para>
 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.
+If rudo receives the mail, MTA is o.k.
 </para>
 
 <para>
@@ -67,7 +68,7 @@ If both work well, MTA configuration must be ok.
 
 <sect1>
 	<title>
-	send a mail to ML
+	Send A Mail To ML
 	</title>
 
 <para>
@@ -82,22 +83,22 @@ Create elena ML (elena@fml.org) and subscribe rudo@fml.org to elena ML.
 <para>
 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:.
+"From: rudo@fml.org" since &fml8; checks the From: header field.
 </para>
 
 
 <sect2>
 	<title>
-	checkpoints
+	Checkpoints
 	</title>
 
 <para>
-If someting not work well, check the following points: 
+If something 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 can pass the message to MTA ?
-MTA succeeds to deliver it?
+fml can pass the message to MTA ? (e.g. /var/spool/m/elena/log)
+MTA succeeds to deliver it? (e.g. /var/log/maillog)
 </screen>
 </para>
 
@@ -108,11 +109,11 @@ MTA succeeds to deliver it?
 
 <sect1>
 	<title>
-	test of fml8 itself.
+	Test Of &fml8; Itself.
 	</title>
 
 <para>
-not yet implemented.
+*** not yet implemented ***.
 </para>
 
 </sect1>
@@ -120,7 +121,7 @@ not yet implemented.
 
 <sect1>
 	<title>
-	reset after test.
+	Reset After Test.
 	</title>
 
 <para>
@@ -130,11 +131,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.$DATE.
+The removed ML home is left as /var/spool/ml/@test.$DATE.$SEQUENCE.
 Please remove it since this is a test to avoid the duplication in the
 future.
 <screen>
-% rm -fr /var/spool/ml/@test.$DATE
+% rm -fr /var/spool/ml/@test.$DATE.*
 </screen>
 </para>