White space fix only. Translators can ignore.

Sponsored by:	iXsystems

1 files changed, 95 insertions, 104 deletions

diff --git a/en_US.ISO8859-1/books/handbook/mail/chapter.xml b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
index 6d506a7d08..19a6df3651 100644
--- a/en_US.ISO8859-1/books/handbook/mail/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/mail/chapter.xml
@@ -584,52 +584,51 @@ postmaster@example.com          postmaster@noc.example.net
       </warning>
 
       <para>In order to completely disable
-	<application>Sendmail</application>, add or edit the following lines in
-	<filename>/etc/rc.conf</filename>:</para>
+	<application>Sendmail</application>, add or edit the following
+	lines in <filename>/etc/rc.conf</filename>:</para>
 
       <programlisting>sendmail_enable="NO"
 sendmail_submit_enable="NO"
 sendmail_outbound_enable="NO"
 sendmail_msp_queue_enable="NO"</programlisting>
 
-	<para>To only disable <application>Sendmail</application>'s
-	  incoming mail service, use only this entry in
-	  <filename>/etc/rc.conf</filename>:</para>
+      <para>To only disable <application>Sendmail</application>'s
+	incoming mail service, use only this entry in
+	<filename>/etc/rc.conf</filename>:</para>
 
-	  <programlisting>sendmail_enable="NO"</programlisting>
+      <programlisting>sendmail_enable="NO"</programlisting>
 
-	<para>More information
-	  on <application>Sendmail</application>'s startup options
-	  is available in &man.rc.sendmail.8;.</para>
-      </sect2>
+      <para>More information on <application>Sendmail</application>'s
+	startup options is available in &man.rc.sendmail.8;.</para>
+    </sect2>
 
-      <sect2>
-	<title>Replace the Default <acronym>MTA</acronym></title>
+    <sect2>
+      <title>Replace the Default <acronym>MTA</acronym></title>
 
-	<para>When a new <acronym>MTA</acronym> is installed using the
-	  Ports Collection, its startup script is also installed and
-	  startup instructions are mentioned in its package message.
-	  Before starting the new <acronym>MTA</acronym>, stop the
-	  running <application>Sendmail</application> processes.  This
-	  example stops all of these services, then starts the
-	  <application>Postfix</application> service:</para>
+      <para>When a new <acronym>MTA</acronym> is installed using the
+	Ports Collection, its startup script is also installed and
+	startup instructions are mentioned in its package message.
+	Before starting the new <acronym>MTA</acronym>, stop the
+	running <application>Sendmail</application> processes.  This
+	example stops all of these services, then starts the
+	<application>Postfix</application> service:</para>
 
-	<screen>&prompt.root; <userinput>service sendmail stop</userinput>
+      <screen>&prompt.root; <userinput>service sendmail stop</userinput>
 &prompt.root; <userinput>service postfix start</userinput></screen>
 
-	<para>To start the replacement <acronym>MTA</acronym> at system boot,
-	  add its configuration line to
-	  <filename>/etc/rc.conf</filename>.  This entry enables the
-	  Postfix <acronym>MTA</acronym>:</para>
+      <para>To start the replacement <acronym>MTA</acronym> at system
+	boot, add its configuration line to
+	<filename>/etc/rc.conf</filename>.  This entry enables the
+	Postfix <acronym>MTA</acronym>:</para>
 
       <programlisting>postfix_enable="YES"</programlisting>
 
       <para>Some extra configuration is needed as
-	<application>Sendmail</application> is so ubiquitous that some software assumes
-	it is already installed and configured.  Check
-	<filename>/etc/periodic.conf</filename> and make sure that
-	these values are set to <literal>NO</literal>.  If this file
-	does not exist, create it with these entries:</para>  
+	<application>Sendmail</application> is so ubiquitous that some
+	software assumes it is already installed and configured.
+	Check <filename>/etc/periodic.conf</filename> and make sure
+	that these values are set to <literal>NO</literal>.  If this
+	file does not exist, create it with these entries:</para>
 
       <programlisting>daily_clean_hoststat_enable="NO"
 daily_status_mail_rejects_enable="NO"
@@ -639,20 +638,18 @@ daily_submit_queuerun="NO"</programlisting>
       <para>Some alternative <acronym>MTA</acronym>s provide their own
 	compatible implementations of the
 	<application>Sendmail</application> command-line interface in
-	order to facilitate using them as drop-in
-	replacements for <application>Sendmail</application>.
-	However, some <acronym>MUA</acronym>s may
-	try to execute standard
+	order to facilitate using them as drop-in replacements for
+	<application>Sendmail</application>.  However, some
+	<acronym>MUA</acronym>s may try to execute standard
 	<application>Sendmail</application> binaries instead of the
 	new <acronym>MTA</acronym>'s binaries.  &os; uses
 	<filename>/etc/mail/mailer.conf</filename> to map the expected
-	<application>Sendmail</application> binaries to the location of the new
-	binaries.  More information about this mapping can be found in
-	&man.mailwrapper.8;.</para>
+	<application>Sendmail</application> binaries to the location
+	of the new binaries.  More information about this mapping can
+	be found in &man.mailwrapper.8;.</para>
 
-      <para>The default
-	<filename>/etc/mail/mailer.conf</filename> looks like
-	this:</para>
+      <para>The default <filename>/etc/mail/mailer.conf</filename>
+	looks like this:</para>
 
       <programlisting># $FreeBSD$
 #
@@ -665,11 +662,10 @@ newaliases      /usr/libexec/sendmail/sendmail
 hoststat        /usr/libexec/sendmail/sendmail
 purgestat       /usr/libexec/sendmail/sendmail</programlisting>
 
-      <para>When any of the commands listed on the left are run,
-	the system actually executes the associated command shown on
-	the right.  This system makes it easy to change what
-	binaries are executed when these default
-	binaries are invoked.</para>
+      <para>When any of the commands listed on the left are run, the
+	system actually executes the associated command shown on the
+	right.  This system makes it easy to change what binaries are
+	executed when these default binaries are invoked.</para>
 
       <para>Some <acronym>MTA</acronym>s, when installed using the
 	Ports Collection, will prompt to update this file for the new
@@ -684,62 +680,57 @@ send-mail       /usr/local/sbin/sendmail
 mailq           /usr/local/sbin/sendmail
 newaliases      /usr/local/sbin/sendmail</programlisting>
 
-	  <para>Once everything is configured, it is recommended to
-	    reboot the system.  Rebooting provides the opportunity to ensure that
-	    the system is correctly configured to start the new
-	    <acronym>MTA</acronym> automatically on boot.</para>
-	</sect2>
-      </sect1>
-
-      <sect1 xml:id="mail-trouble">
-	<title>Troubleshooting</title>
-
-	<indexterm>
-	  <primary>email</primary>
-	  <secondary>troubleshooting</secondary>
-	</indexterm>
-
-	<qandaset>
-	  <qandaentry>
-	    <question>
-	      <para>Why do I have to use the FQDN for hosts on my
-		site?</para>
-	    </question>
-
-	    <answer>
-	      <para>The host may actually be in a different domain.
-		For example, in order for a host in <systemitem
-		  class="fqdomainname">foo.bar.edu</systemitem> to
-		reach a host called <systemitem>mumble</systemitem> in
-		the <systemitem
-		  class="fqdomainname">bar.edu</systemitem> domain,
-		refer to it by the Fully-Qualified Domain Name
-		<acronym>FQDN</acronym>, <systemitem
-		  class="fqdomainname">mumble.bar.edu</systemitem>,
-		instead of just
-		<systemitem>mumble</systemitem>.</para>
-
-	      <para>This is because the version of
-		<application>BIND</application><indexterm>
-		<primary>BIND</primary></indexterm> which ships with
-		&os; no longer provides default abbreviations
-		for non-FQDNs other than the local domain.  An
-		unqualified host such as
-		<systemitem>mumble</systemitem> must either be found
-		as <systemitem
-		  class="fqdomainname">mumble.foo.bar.edu</systemitem>,
-		or it will be searched for in the root domain.</para>
-
-	      <para>In older versions of
-		<application>BIND</application>, the search continued
-		across <systemitem
-		  class="fqdomainname">mumble.bar.edu</systemitem>,
-		and <systemitem
-		  class="fqdomainname">mumble.edu</systemitem>.  RFC
-		1535 details why this is considered bad practice or
-		even a security hole.</para>
-
-	      <para>As a good workaround, place the line:</para>
+      <para>Once everything is configured, it is recommended to reboot
+	the system.  Rebooting provides the opportunity to ensure that
+	the system is correctly configured to start the new
+	<acronym>MTA</acronym> automatically on boot.</para>
+    </sect2>
+  </sect1>
+
+  <sect1 xml:id="mail-trouble">
+    <title>Troubleshooting</title>
+
+    <indexterm>
+      <primary>email</primary>
+      <secondary>troubleshooting</secondary>
+    </indexterm>
+
+    <qandaset>
+      <qandaentry>
+	<question>
+	  <para>Why do I have to use the FQDN for hosts on my
+	    site?</para>
+	</question>
+
+	<answer>
+	  <para>The host may actually be in a different domain.  For
+	    example, in order for a host in <systemitem
+	      class="fqdomainname">foo.bar.edu</systemitem> to reach a
+	    host called <systemitem>mumble</systemitem> in the
+	    <systemitem class="fqdomainname">bar.edu</systemitem>
+	    domain, refer to it by the Fully-Qualified Domain Name
+	    <acronym>FQDN</acronym>, <systemitem
+	      class="fqdomainname">mumble.bar.edu</systemitem>,
+	    instead of just <systemitem>mumble</systemitem>.</para>
+
+	  <para>This is because the version of
+	    <application>BIND</application><indexterm>
+	    <primary>BIND</primary></indexterm> which ships with &os;
+	    no longer provides default abbreviations for non-FQDNs
+	    other than the local domain.  An unqualified host such as
+	    <systemitem>mumble</systemitem> must either be found as
+	    <systemitem
+	      class="fqdomainname">mumble.foo.bar.edu</systemitem>, or
+	    it will be searched for in the root domain.</para>
+
+	  <para>In older versions of <application>BIND</application>,
+	    the search continued across <systemitem
+	      class="fqdomainname">mumble.bar.edu</systemitem>, and
+	    <systemitem class="fqdomainname">mumble.edu</systemitem>.
+	    RFC 1535 details why this is considered bad practice or
+	    even a security hole.</para>
+
+	  <para>As a good workaround, place the line:</para>
 
 	  <programlisting>search foo.bar.edu bar.edu</programlisting>
 
@@ -747,9 +738,9 @@ newaliases      /usr/local/sbin/sendmail</programlisting>
 
 	  <programlisting>domain foo.bar.edu</programlisting>
 
-	  <para>into <filename>/etc/resolv.conf</filename>.
-	    However, make sure that the search order does not go
-	    beyond the <quote>boundary between local and public
+	  <para>into <filename>/etc/resolv.conf</filename>.  However,
+	    make sure that the search order does not go beyond the
+	    <quote>boundary between local and public
 	      administration</quote>, as RFC 1535 calls it.</para>
 	</answer>
       </qandaentry>
@@ -1168,7 +1159,7 @@ hostname=_HOSTNAME_</programlisting>
       <acronym>ISP</acronym>'s outgoing mail relay in place of
       <systemitem class="fqdomainname">mail.example.com</systemitem>.
       Some <acronym>ISP</acronym>s call this the <quote>outgoing mail
-      server</quote> or <quote>SMTP server</quote>).</para>
+	server</quote> or <quote>SMTP server</quote>).</para>
 
     <para>Make sure to disable <application>Sendmail</application>,
       including the outgoing mail service.  See <xref