Merge lp:~lajjr-deactivatedaccount/serverguide/serverguide-review-14 into lp:~ubuntu-core-doc/serverguide/oneiric

[Joker Wild]

[Connor Imes (ckimes)]

Since this is mostly new strings and bug fixes and the serverguide doesn't have much for translations, I've merged it despite String Freeze. In the future, please don't mark bugs as Fix Committed when a fix is in your branch, it shouldn't be Fix Committed until it is in the source trunk.
Thanks for all your work, Leo.

review: Approve

=== modified file 'serverguide/C/mail.xml'
--- serverguide/C/mail.xml	2011-09-10 19:21:23 +0000
+++ serverguide/C/mail.xml	2011-09-18 18:57:25 +0000
@@ -515,7 +515,7 @@
             <para>
             All the parameters you configure in the user interface are
             stored in
-            <filename>/etc/exim4/update-exim4.conf.conf</filename> file.
+            <filename>/etc/exim4/update-exim4.conf</filename> file.
             If you wish to re-configure, either you re-run the
             configuration wizard or manually edit this file
             using your favorite editor. Once you configure, you can run
@@ -592,6 +592,17 @@
    server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
    .endif
 </programlisting>
+          <para>
+          Additionally, in order for outside mail client to be able to connect to new exim server, new user needs to be added into exim by using the following commands.
+          </para>
+<screen>
+<command>sudo /usr/share/doc/exim4/examples/exim-adduser</command>
+</screen>
+          <para>Users should protect the new exim password files with the following commands.</para>
+<screen>
+<command>sudo chown root:Debian-exim /etc/exim4/passwd</command>
+<command>sudo chmod 640 /etc/exim4/passwd</command>
+</screen>
 	  <para>
 	  Finally, update the Exim4 configuration and restart the service:
 	  </para>
@@ -1351,6 +1362,7 @@
  	     </para>
 <screen>
 <command>sudo adduser clamav amavis</command>
+<command>sudo adduser amavis clamav</command>
 </screen>
 	   </sect3>
 	   <sect3 id="spamassassin-configuration" status="review">
@@ -1436,7 +1448,14 @@
 $myhostname = 'mail.example.com';
 @local_domains_acl = ( "example.com", "example.org" );
 </programlisting>
-          
+
+             <para>If you want to cover multiple domains you can use the following in the<filename>/etc/amavis/conf.d/50-user</filename>
+             </para>
+
+<programlisting>
+@local_domains_acl = qw(.);
+</programlisting>
+
 	     <para>
 	     After configuration <application>Amavisd-new</application> needs to be restarted: 
 	     </para>
@@ -1682,7 +1701,7 @@
 	     </listitem>
 	     <listitem>
 	       <para>
-               <ulink url="http://www.clamav.org/doc/latest/html/">ClamAV Documentation</ulink> and 
+               <ulink url="http://www.clamav.net/doc/latest/html/">ClamAV Documentation</ulink> and 
 	       <ulink url="http://wiki.clamav.net/Main/WebHome">ClamAV Wiki</ulink>
 	       </para>
 	     </listitem>
@@ -1693,7 +1712,7 @@
 	     </listitem>
 	     <listitem>
 	       <para>
-               <ulink url="http://pyzor.sourceforge.net/">Pyzor Homepage</ulink>
+               <ulink url="http://sourceforge.net/apps/trac/pyzor/">Pyzor Homepage</ulink>
 	       </para>
 	       </listitem>
 	     <listitem>