summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Metzler <ametzler@bebt.de>2016-03-05 14:58:21 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2016-03-05 14:58:21 +0000
commit968178ac56100bcd7418b2dfc7e9224f977bb039 (patch)
treeb423c0d116db1bf5af7887f784fb554cc06683a4
parentcb570b5ea1ff234ae16b2c32a236ccd520a80f7a (diff)
downloadexim4-968178ac56100bcd7418b2dfc7e9224f977bb039.tar.gz
typoes
-rw-r--r--doc/doc-docbook/spec.xfpt2
-rw-r--r--src/src/deliver.c6
-rw-r--r--src/src/eximstats.src10
3 files changed, 9 insertions, 9 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index a67f48675..05e65b3e1 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3153,7 +3153,7 @@ settings can be obtained by using &%routers%&, &%transports%&, or
.cindex "environment"
If &%environment%& is given as an argument, the set of environment
-variables is output, line by line. Using the &%-n%& flag supresses the value of the
+variables is output, line by line. Using the &%-n%& flag suppresses the value of the
variables.
.cindex "options" "macro &-- extracting"
diff --git a/src/src/deliver.c b/src/src/deliver.c
index e588ee4a4..9066a14be 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6953,7 +6953,7 @@ if (addr_senddsn)
if (auth_xtextdecode(dsn_envid, &xdec_envid) > 0)
fprintf(f, "Original-Envelope-ID: %s\n", dsn_envid);
else
- fprintf(f, "X-Original-Envelope-ID: error decoding xtext formated ENVID\n");
+ fprintf(f, "X-Original-Envelope-ID: error decoding xtext formatted ENVID\n");
}
fputc('\n', f);
@@ -7339,7 +7339,7 @@ wording. */
if (auth_xtextdecode(dsn_envid, &xdec_envid) > 0)
fprintf(f, "Original-Envelope-ID: %s\n", dsn_envid);
else
- fprintf(f, "X-Original-Envelope-ID: error decoding xtext formated ENVID\n");
+ fprintf(f, "X-Original-Envelope-ID: error decoding xtext formatted ENVID\n");
}
fputc('\n', f);
@@ -7872,7 +7872,7 @@ else if (addr_defer != (address_item *)(+1))
if (auth_xtextdecode(dsn_envid, &xdec_envid) > 0)
fprintf(f,"Original-Envelope-ID: %s\n", dsn_envid);
else
- fprintf(f,"X-Original-Envelope-ID: error decoding xtext formated ENVID\n");
+ fprintf(f,"X-Original-Envelope-ID: error decoding xtext formatted ENVID\n");
}
fputc('\n', f);
diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index 4370b4eab..2369ec38a 100644
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -757,7 +757,7 @@ sub volume_rounded {
}
else {
# We don't want any rounding to be done.
- # and we don't need broken formated output which on one hand avoids numbers from
+ # and we don't need broken formatted output which on one hand avoids numbers from
# being interpreted as string by Spreadsheed Calculators, on the other hand
# breaks if more than 4 digits! -> flexible length instead of fixed length
# Format the return value at the output routine! -fh
@@ -871,10 +871,10 @@ $p;
# Eg 3h20m5s => 12005
#######################################################################
sub unformat_time {
- my($formated_time) = pop @_;
+ my($formatted_time) = pop @_;
my $time = 0;
- while ($formated_time =~ s/^(\d+)([wdhms]?)//) {
+ while ($formatted_time =~ s/^(\d+)([wdhms]?)//) {
$time += $1 if ($2 eq '' || $2 eq 's');
$time += $1 * 60 if ($2 eq 'm');
$time += $1 * 60 * 60 if ($2 eq 'h');
@@ -3360,8 +3360,8 @@ sub parse_old_eximstat_reports {
my $previous_seconds_on_queue = 0;
if (/^\s*(Under|Over|)\s+(\d+[smhdw])\s+(\d+)/) {
print STDERR "Parsing $_" if $debug;
- my($modifier,$formated_time,$count) = ($1,$2,$3);
- my $seconds = unformat_time($formated_time);
+ my($modifier,$formatted_time,$count) = ($1,$2,$3);
+ my $seconds = unformat_time($formatted_time);
my $time_on_queue = ($seconds + $previous_seconds_on_queue) / 2;
$previous_seconds_on_queue = $seconds;
$time_on_queue = $seconds * 2 if ($modifier eq 'Over');