diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/README.UPDATING | 2 | ||||
| -rw-r--r-- | src/exim_monitor/em_main.c | 2 | ||||
| -rw-r--r-- | src/src/EDITME | 2 | ||||
| -rw-r--r-- | src/src/exim.c | 2 | ||||
| -rw-r--r-- | src/src/eximstats.src | 2 | ||||
| -rw-r--r-- | src/src/exipick.src | 4 | ||||
| -rw-r--r-- | src/src/osfunctions.h | 2 | ||||
| -rw-r--r-- | src/src/version.h | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/README.UPDATING b/src/README.UPDATING index 0b70caa2b..1e08ff5b3 100644 --- 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 - 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 diff --git a/src/exim_monitor/em_main.c b/src/exim_monitor/em_main.c index 187dba3b0..4692fa744 100644 --- a/src/exim_monitor/em_main.c +++ b/src/exim_monitor/em_main.c @@ -168,7 +168,7 @@ Returns: nothing */ void -log_write(unsigned int selector, int flags, char *format, ...) +log_write(unsigned int selector, int flags, const char *format, ...) { va_list ap; va_start(ap, format); diff --git a/src/src/EDITME b/src/src/EDITME index 833c3f8ca..b0335a963 100644 --- 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 -# 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 diff --git a/src/src/exim.c b/src/src/exim.c index 528ffc7c8..371bc1025 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -1299,7 +1299,7 @@ for (m = macros; m != NULL; m = m->next) 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 } diff --git a/src/src/eximstats.src b/src/src/eximstats.src index df64294a0..9a9a90c54 100644 --- 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 -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 :) diff --git a/src/src/exipick.src b/src/src/exipick.src index 33054543f..ec7f58842 100644 --- 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 -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' @@ -1502,7 +1502,7 @@ The string operators are =, eq, ne, =~, and !~. With the exception of '=', the =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 diff --git a/src/src/osfunctions.h b/src/src/osfunctions.h index 14111d383..1010ff556 100644 --- 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 -/* 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. */ diff --git a/src/src/version.h b/src/src/version.h index b84d108c3..6c1cc556f 100644 --- a/src/src/version.h +++ b/src/src/version.h @@ -6,7 +6,7 @@ /* See the file NOTICE for conditions of use and distribution. */ /* This is bumped by the Exim Maintainers, the release engineer: */ -#define EXIM_RELEASE_VERSION_STR "4.75" +#define EXIM_RELEASE_VERSION_STR "4.76" /* If you apply extensive local patches, consider putting -foo into here */ #define EXIM_VARIANT_VERSION "" |