Merge branch 'master_testsuite_faq'

[exim.git] / doc / doc-txt / Exim4.upgrade

diff --git a/doc/doc-txt/Exim4.upgrade b/doc/doc-txt/Exim4.upgrade
index db20d5dd625a00bc88ca06420a81bfc1095e0030..a97d41f8ca7c8f3e365ccb2b44804445b819c7b6 100644 (file)
--- a/doc/doc-txt/Exim4.upgrade
+++ b/doc/doc-txt/Exim4.upgrade
@@ -1,5 +1,3 @@
-$Cambridge: exim/doc/doc-txt/Exim4.upgrade,v 1.1 2004/10/07 15:04:35 ph10 Exp $
-
 Upgrading Exim from Release 3.33 to 4.xx
 ----------------------------------------
 
@@ -1096,7 +1094,7 @@ Authentication
   controlled by ACLs.
 
 . The auth_always_advertise option has been abolished because it depended on
-  auth_hosts and and host_auth_accept_relay, both of which are no more. In its
+  auth_hosts and host_auth_accept_relay, both of which are no more. In its
   place there is a new option called auth_advertise_hosts, whose default value
   is *, meaning "advertise AUTH to all".