Typo fixes from Andreas Metzler.

fixes bug 1111

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 98f5949a1abdfbab0e72bc4b8451f38cc212df97..b30b6abda2de61a00dd26ad58ac07474b8a6291f 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -254,7 +254,7 @@ DW/26 Set FD_CLOEXEC on SMTP sockets after forking in the daemon, to ensure
 PP/27 Bugzilla 1047: change the default for system_filter_user to be the Exim
       run-time user, instead of root.
 
 PP/27 Bugzilla 1047: change the default for system_filter_user to be the Exim
       run-time user, instead of root.
 

-PP/28 Add WHITELIST_D_MACROS option to let some macros be overriden by the
+PP/28 Add WHITELIST_D_MACROS option to let some macros be overridden by the

       Exim run-time user without dropping privileges.
 
 DW/29 Remove use of va_copy() which breaks pre-C99 systems. Duplicate the
       Exim run-time user without dropping privileges.
 
 DW/29 Remove use of va_copy() which breaks pre-C99 systems. Duplicate the

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index c205e9c98e88a565d87b480168beccd368841168..09e4dd283e245964be5b2f17763fafd32ddfc5f8 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -72,7 +72,7 @@ Version 4.73
  2. A new pipe transport option, "permit_coredumps", may help with problem
     diagnosis in some scenarios.  Note that Exim is typically installed as
     a setuid binary, which on most OSes will inhibit coredumps by default,
  2. A new pipe transport option, "permit_coredumps", may help with problem
     diagnosis in some scenarios.  Note that Exim is typically installed as
     a setuid binary, which on most OSes will inhibit coredumps by default,

-    so that safety mechanism would have to be overriden for this option to
+    so that safety mechanism would have to be overridden for this option to

     be able to take effect.
 
  3. ClamAV 0.95 is now required for ClamAV support in Exim, unless
     be able to take effect.
 
  3. ClamAV 0.95 is now required for ClamAV support in Exim, unless


@@ -158,7 +158,7 @@ Version 4.73
     forward, we recommend using TRUSTED_CONFIG_LIST with shim configs that
     include the main config.  As a transition mechanism, we are temporarily
     providing a work-around: the new build option WHITELIST_D_MACROS provides
     forward, we recommend using TRUSTED_CONFIG_LIST with shim configs that
     include the main config.  As a transition mechanism, we are temporarily
     providing a work-around: the new build option WHITELIST_D_MACROS provides

-    a colon-separated list of macro names which may be overriden by the Exim
+    a colon-separated list of macro names which may be overridden by the Exim

     run-time user.  The values of these macros are constrained to the regex
     ^[A-Za-z0-9_/.-]*$ (which explicitly does allow for empty values).
 
     run-time user.  The values of these macros are constrained to the regex
     ^[A-Za-z0-9_/.-]*$ (which explicitly does allow for empty values).
 

diff --git a/src/README.UPDATING b/src/README.UPDATING
index 0b70caa2b6be9b6d29e742d19db1aed6f72d0c43..1e08ff5b34c266fe77585f1f24a4c9d0762c49ef 100644 (file)
--- a/src/README.UPDATING
+++ b/src/README.UPDATING
@@ -69,7 +69,7 @@ Exim version 4.73
       the Exim run-time user may safely pass without dropping privileges.
       Because changes to this involve a recompile, this is not the recommended
       approach but may ease transition.  The values of the macros, when
       the Exim run-time user may safely pass without dropping privileges.
       Because changes to this involve a recompile, this is not the recommended
       approach but may ease transition.  The values of the macros, when

-      overriden, are constrained to match this regex: ^[A-Za-z0-9_/.-]*$
+      overridden, are constrained to match this regex: ^[A-Za-z0-9_/.-]*$

 
  * The system_filter_user option now defaults to the Exim run-time user,
    rather than root.  You can still set it explicitly to root and this
 
  * The system_filter_user option now defaults to the Exim run-time user,
    rather than root.  You can still set it explicitly to root and this

diff --git a/src/src/EDITME b/src/src/EDITME
index 833c3f8cac77130f4048bdd8bd9e1368cf507a9e..b0335a963387be2aadc42beeb7956f5d56387b7b 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -528,7 +528,7 @@ FIXED_NEVER_USERS=root
 #
 # As a strictly transient measure to ease migration to 4.73, the
 # WHITELIST_D_MACROS value definies a colon-separated list of macro-names
 #
 # As a strictly transient measure to ease migration to 4.73, the
 # WHITELIST_D_MACROS value definies a colon-separated list of macro-names

-# which are permitted to be overriden from the command-line which will be
+# which are permitted to be overridden from the command-line which will be

 # honoured by the Exim user.  So these are macros that can persist to delivery
 # time.
 # Examples might be -DTLS or -DSPOOL=/some/dir.  The values on the
 # honoured by the Exim user.  So these are macros that can persist to delivery
 # time.
 # Examples might be -DTLS or -DSPOOL=/some/dir.  The values on the

diff --git a/src/src/exim.c b/src/src/exim.c
index 528ffc7c84b65309fb6096aa7becd981306d1739..371bc1025c5c584292aa32bf0c6004c9f945ddbd 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1299,7 +1299,7 @@ for (m = macros; m != NULL; m = m->next)
     return FALSE;
     }
   }
     return FALSE;
     }
   }

-DEBUG(D_any) debug_printf("macros_trusted overriden to true by whitelisting\n");
+DEBUG(D_any) debug_printf("macros_trusted overridden to true by whitelisting\n");

 return TRUE;
 #endif
 }
 return TRUE;
 #endif
 }

diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index df64294a09f8b5c36a435336531cbc2ddb0f3457..9a9a90c54c09955e0447e3e0e05c406af350ef35 100644 (file)
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -540,7 +540,7 @@ mailing list exim-users@exim.org.
 This program does not perfectly handle messages whose received
 and delivered log lines are in different files, which can happen
 when you have multiple mail servers and a message cannot be
 This program does not perfectly handle messages whose received
 and delivered log lines are in different files, which can happen
 when you have multiple mail servers and a message cannot be

-immeadiately delivered. Fixing this could be tricky...
+immediately delivered. Fixing this could be tricky...

 
 Merging of xls files is not (yet) possible. Be free to implement :)
 
 
 Merging of xls files is not (yet) possible. Be free to implement :)
 

diff --git a/src/src/exipick.src b/src/src/exipick.src
index 33054543fbe03c820696d54bbd4207af64340ec2..ec7f588426ed3fad5bdbb0c032440558f7213859 100644 (file)
--- a/src/src/exipick.src
+++ b/src/src/exipick.src
@@ -1488,7 +1488,7 @@ Boolean variables are checked simply by being true or false.  There is no real o
 
 =item NUMERIC
 
 
 =item NUMERIC
 

-Valid comparisons are <, <=, >, >=, ==, and !=.  Numbers can be integers or floats.  Any number in a test suffixed with d, h, m, s, M, K, or B will be mulitplied by 86400, 3600, 60, 1, 1048576, 1024, or 1 respectively.  Examples of valid numeric tests:
+Valid comparisons are <, <=, >, >=, ==, and !=.  Numbers can be integers or floats.  Any number in a test suffixed with d, h, m, s, M, K, or B will be multiplied by 86400, 3600, 60, 1, 1048576, 1024, or 1 respectively.  Examples of valid numeric tests:

   '$message_age >= 3d'
   '$local_interface == 587'
   '$message_size < 30K'
   '$message_age >= 3d'
   '$local_interface == 587'
   '$message_size < 30K'


@@ -1502,7 +1502,7 @@ The string operators are =, eq, ne, =~, and !~.  With the exception of '=', the
 
 =item NEGATION
 
 
 =item NEGATION
 

-There are many ways to negate tests, each having a reason for existing.  Many tests can be negated using native operators.  For instance, >1 is the opposite of <=1 and eq and ne are opposites.  In addition, each individual test can be negated by adding a ! at the beginning of the test.  For instance, '!$acl_m1 =~ /^DENY$/' is the same as '$acl_m1 !~ /^DENY$/'.  Finally, every test can be specified by using the command line argument --not.  This is functionally equivilant to adding a ! to the beginning of every test.
+There are many ways to negate tests, each having a reason for existing.  Many tests can be negated using native operators.  For instance, >1 is the opposite of <=1 and eq and ne are opposites.  In addition, each individual test can be negated by adding a ! at the beginning of the test.  For instance, '!$acl_m1 =~ /^DENY$/' is the same as '$acl_m1 !~ /^DENY$/'.  Finally, every test can be specified by using the command line argument --not.  This is functionally equivalent to adding a ! to the beginning of every test.

 
 =back
 
 
 =back
 

diff --git a/src/src/osfunctions.h b/src/src/osfunctions.h
index 14111d383b68e3cad8ca336cbd4360a10f3eae2a..1010ff556273d49d8d2d62e72aa91ccfea7c42ca 100644 (file)
--- a/src/src/osfunctions.h
+++ b/src/src/osfunctions.h
@@ -14,7 +14,7 @@ that uses a type that isn't defined for them. */
 extern ip_address_item *os_common_find_running_interfaces(void);
 #endif
 
 extern ip_address_item *os_common_find_running_interfaces(void);
 #endif
 

-/* If these exist as a macro, then they're overriden away from us and we
+/* If these exist as a macro, then they're overridden away from us and we

 rely upon the system headers to provide prototype declarations for us.
 Notably, strsignal() is not in the Single Unix Specification (v3) and
 predicting constness is awkward. */
 rely upon the system headers to provide prototype declarations for us.
 Notably, strsignal() is not in the Single Unix Specification (v3) and
 predicting constness is awkward. */

diff --git a/test/runtest b/test/runtest
index 324049fc06e971e0772afab3827666e8940ccceb..feca75e2eae043b2383881f714cf7b558b6336a9 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -763,7 +763,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^changing group to \d+ failed: Operation not permitted/;
 
     # We invoke Exim with -D, so we hit this new messag as of Exim 4.73:
     next if /^changing group to \d+ failed: Operation not permitted/;
 
     # We invoke Exim with -D, so we hit this new messag as of Exim 4.73:

-    next if /^macros_trusted overriden to true by whitelisting/;
+    next if /^macros_trusted overridden to true by whitelisting/;

 
     # We have to omit the localhost ::1 address so that all is well in
     # the IPv4-only case.
 
     # We have to omit the localhost ::1 address so that all is well in
     # the IPv4-only case.