Merge lp:~ablacksheep/serverguide/saucy into lp:~ubuntu-core-doc/serverguide/saucy

[Anders F. U. Kiær]

[Doug Smythies (dsmythies)]

Thanks for jumping in and fixing your own bug report.

The extra line length does cause another more than 50 points warning:

Line 1 of a paragraph overflows the available area by more than 50 points. (See position 9591:419)

during the PDF compile, which is something we have tried to eliminate. However, there are 3 others (had it down to 1 at one point), and the page does print properly, at least for me.

review: Approve

=== modified file 'serverguide/C/mail.xml'
--- serverguide/C/mail.xml	2013-05-13 15:42:29 +0000
+++ serverguide/C/mail.xml	2013-08-30 13:08:36 +0000
@@ -1613,7 +1613,7 @@
         -o smtpd_hard_error_limit=1000
         -o smtpd_client_connection_count_limit=0
         -o smtpd_client_connection_rate_limit=0
-        -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks
+        -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks,no_milters
 </programlisting>
 	     <para>
 	     Also add the following two lines immediately below the <emphasis>"pickup"</emphasis> transport service: