[deployment-guide/comm-rel: 628/727] Email chapter index fix, FTP section 12.4.1. Starting Multiple Copies of vsftpd modified

[Jaromir Hradilek]

commit 6758c571e6cc73f6d53cefb355352c9538e82053
Author: Martin Prpic <mprpic at redhat.com>
Date:   Wed Sep 8 14:19:55 2010 +0200

    Email chapter index fix, FTP section 12.4.1. Starting Multiple Copies of vsftpd modified

 en-US/Email.xml |    4 ++--
 en-US/FTP.xml   |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/en-US/Email.xml b/en-US/Email.xml
index 0c4a57c..1d9a9b8 100644
--- a/en-US/Email.xml
+++ b/en-US/Email.xml
@@ -108,12 +108,12 @@
         <para>Other free, as well as commercial, IMAP clients and servers are available, many of which extend the IMAP protocol and provide additional functionality.</para>
       </section>
       <section
-        id="s3-email-protocols-dovecot">
+        id="s3-mail-server-dovecot">
         <title>Dovecot</title>
         <indexterm
           significance="normal">
           <primary>email</primary>
-          <secondary>protocols</secondary>
+          <secondary>mail server</secondary>
           <tertiary>Dovecot</tertiary>
         </indexterm>
         <para>The <command>imap-login</command> and <command>pop3-login</command> processes which implement the <systemitem class="protocol">IMAP</systemitem> and <systemitem class="protocol">POP3</systemitem> protocols are spawned by the master <systemitem class="daemon">dovecot</systemitem> daemon included in the <package>dovecot</package> package. The use of <systemitem class="protocol">IMAP</systemitem> and <systemitem class="protocol">POP</systemitem> is configured through the <filename>/etc/dovecot/dovecot.conf</filename> configuration file; by default <command>dovecot</command> runs <systemitem class="protocol">IMAP</systemitem> and <systemitem class="protocol">POP3</systemitem> together with their secure versions using <systemitem class="protocol">SSL</systemitem>. To configure <command>dovecot</command> to use <systemitem class="protocol">POP</systemitem>, complete the following steps:</para>
diff --git a/en-US/FTP.xml b/en-US/FTP.xml
index 2a57394..c327b83 100644
--- a/en-US/FTP.xml
+++ b/en-US/FTP.xml
@@ -290,12 +290,12 @@
         <secondary>multihome configuration</secondary>
       </indexterm>
       <para>Sometimes one computer is used to serve multiple <systemitem class="protocol">FTP</systemitem> domains. This is a technique called <firstterm>multihoming</firstterm>. One way to multihome using <command>vsftpd</command> is by running multiple copies of the daemon, each with its own configuration file.</para>
-      <para>To do this, first assign all relevant <systemitem class="protocol">IP</systemitem> addresses to network devices or alias network devices on the system. Refer to <xref
-          linkend="ch-Network_Configuration"/> for more information about configuring network devices and device aliases. Additional information about network configuration scripts can be found in <xref
-          linkend="ch-Network_Interfaces"/>.</para>
-      <para>Next, the DNS server for the <systemitem class="protocol">FTP</systemitem> domains must be configured to reference the correct machine. For information about BIND and its configuration files, refer to <xref
-          linkend="ch-The_BIND_DNS_Server"/>.</para>
-      <para>For <command>vsftpd</command> to answer requests on different <systemitem class="protocol">IP</systemitem> addresses, multiple copies of the daemon must be running. The first copy must be run using the <command>vsftpd</command> initscripts, as outlined in <xref
+      <para>To do this, first assign all relevant <systemitem class="protocol">IP</systemitem> addresses to network devices or alias network devices on the system. Refer to <xref linkend="ch-Network_Configuration"/> for more information about configuring network devices and device aliases. Additional information about network configuration scripts can be found in <xref linkend="ch-Network_Interfaces"/>.</para>
+      <para>Next, the DNS server for the <systemitem class="protocol">FTP</systemitem> domains must be configured to reference the correct machine. For information about BIND and its configuration files, refer to <xref linkend="ch-The_BIND_DNS_Server"/>.</para>
+      <para>
+      If there is more configuration files present in the <filename>/etc/vsftpd</filename> directory, calling <command>service&#160;vsftpd&#160;start</command> results in the <filename>/etc/rc.d/init.d/vsftpd</filename> initscript starting the same number of processes as the number of configuration files. Each configuration file must have a unique name in the <filename>/etc/vsftpd/</filename> directory and must be readable and writable only by root.
+      </para>
+      <!-- <para>For <command>vsftpd</command> to answer requests on different <systemitem class="protocol">IP</systemitem> addresses, multiple copies of the daemon must be running. The first copy must be run using the <command>vsftpd</command> initscripts, as outlined in <xref
           linkend="s1-ftp-vsftpd-start"/>. This copy uses the standard configuration file, <filename>/etc/vsftpd/vsftpd.conf</filename>.</para>
       <para>Each additional <systemitem class="protocol">FTP</systemitem> site must have a configuration file with a unique name in the <filename>/etc/vsftpd/</filename> directory, such as <filename>/etc/vsftpd/vsftpd-site-2.conf</filename>. Each configuration file must be readable and writable only by root. Within each configuration file for each <systemitem class="protocol">FTP</systemitem> server listening on an <systemitem class="protocol">IPv4</systemitem> network, the following directive must be unique:</para>
       <screen>
@@ -334,7 +334,7 @@
       </itemizedlist>
       <para>For a detailed list of directives available within <command>vsftpd</command>'s configuration file, refer to <xref
           linkend="s1-ftp-vsftpd-conf"/>.</para>
-      <para>To configure any additional servers to start automatically at boot time, add the above command to the end of the <filename>/etc/rc.local</filename> file.</para>
+      <para>To configure any additional servers to start automatically at boot time, add the above command to the end of the <filename>/etc/rc.local</filename> file.</para> -->
     </section>
   </section>
   <section
@@ -373,7 +373,7 @@
     <para>For a complete list of all directives available, refer to the man page for <filename>vsftpd.conf</filename>.</para>
     <important>
       <title>Important</title>
-      <para>For an overview of ways to secure <command>vsftpd</command>, refer to the &MAJOROSVER; <citetitle>Security Guide</citetitle> <!-- TBD6: link to the Security Guide -->.</para>
+      <para>For an overview of ways to secure <command>vsftpd</command>, refer to the &MAJOROSVER; <citetitle>Security Guide</citetitle><!-- TBD6: link to the Security Guide -->.</para>
     </important>
     <para>The following is a list of some of the more important directives within <filename>/etc/vsftpd/vsftpd.conf</filename>. All directives not explicitly found or commented out within <command>vsftpd</command>'s configuration file are set to their default value.</para>
     <section