214 spelling fixes

diff --git a/doc/doc-docbook/HowItWorks.txt b/doc/doc-docbook/HowItWorks.txt
index c5e328a09408245f464bd531e29a211ac22969f4..9fd197cac9070863e51916426781f9425a8238be 100644 (file)
--- a/doc/doc-docbook/HowItWorks.txt
+++ b/doc/doc-docbook/HowItWorks.txt
@@ -150,7 +150,7 @@ at the time of writing):
 
 . w3m 0.5.2
 
 
 . w3m 0.5.2
 

-  This is a text-oriented web brower. It is used to produce the ASCII form of
+  This is a text-oriented web browser. It is used to produce the ASCII form of

   the Exim documentation (spec.txt) from a specially-created HTML format. It
   seems to do a better job than lynx.
 
   the Exim documentation (spec.txt) from a specially-created HTML format. It
   seems to do a better job than lynx.
 

diff --git a/doc/doc-docbook/Makefile b/doc/doc-docbook/Makefile
index f456f80c929c08bb75d69143bb8b9d89c80d3fed..d835db9edfa961036999ed9a6b80148c61ff96e3 100644 (file)
--- a/doc/doc-docbook/Makefile
+++ b/doc/doc-docbook/Makefile
@@ -23,7 +23,7 @@ exim.8:       spec.xml x2man
 
 ########################################################################
 
 
 ########################################################################
 

-# .PHONY doesn't work here, because it forces a rebuild of all dependend
+# .PHONY doesn't work here, because it forces a rebuild of all dependent

 # targets, always. It sets the internal timestamp of its target to
 # now().
 # But it may happen that local_params does not change
 # targets, always. It sets the internal timestamp of its target to
 # now().
 # But it may happen that local_params does not change

diff --git a/doc/doc-docbook/Tidytxt b/doc/doc-docbook/Tidytxt
index cfa692272bb047f2208e1a4e726f65900fb02d61..296cdad6a78e5a91ec65726cea17232207cb8ba0 100755 (executable)
--- a/doc/doc-docbook/Tidytxt
+++ b/doc/doc-docbook/Tidytxt
@@ -7,7 +7,7 @@ use Getopt::Long;
 
 # For now we can't rely on a perl >= 5.14 on
 # the build sites, thus we throw away all unicode
 
 # For now we can't rely on a perl >= 5.14 on
 # the build sites, thus we throw away all unicode

-# awarness and do the matching byte by byte
+# awareness and do the matching byte by byte

 binmode STDIN;
 binmode STDOUT;
 
 binmode STDIN;
 binmode STDOUT;
 

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index a4aaa5429a1a283551f58ddf6b40cfa9390dc25b..db4c6e2a2ab4d565df8977459d5a1cd3ddc8ffe3 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -4480,7 +4480,7 @@ will specify a queue to operate on.
 For example:
 .code
 exim -bp -qGquarantine
 For example:
 .code
 exim -bp -qGquarantine

-mailq -qGquarantime
+mailq -qGquarantine

 exim -qGoffpeak -Rf @special.domain.example
 .endd
 
 exim -qGoffpeak -Rf @special.domain.example
 .endd
 


@@ -7110,7 +7110,7 @@ Retries for the dnsdb lookup can be controlled by a retry modifier.
 The form if &"retry_VAL"& where VAL is an integer.
 The default count is set by the main configuration option &%dns_retry%&.
 
 The form if &"retry_VAL"& where VAL is an integer.
 The default count is set by the main configuration option &%dns_retry%&.
 

-.cindex cacheing "of dns lookup"
+.cindex caching "of dns lookup"

 .cindex TTL "of dns lookup"
 .cindex DNS TTL
 Dnsdb lookup results are cached within a single process (and its children).
 .cindex TTL "of dns lookup"
 .cindex DNS TTL
 Dnsdb lookup results are cached within a single process (and its children).


@@ -9105,7 +9105,7 @@ If the ACL returns defer the result is a forced-fail.  Otherwise the expansion f
 
 .vitem "&*${certextract{*&<&'field'&>&*}{*&<&'certificate'&>&*}&&&
        {*&<&'string2'&>&*}{*&<&'string3'&>&*}}*&"
 
 .vitem "&*${certextract{*&<&'field'&>&*}{*&<&'certificate'&>&*}&&&
        {*&<&'string2'&>&*}{*&<&'string3'&>&*}}*&"

-.cindex "expansion" "extracting cerificate fields"
+.cindex "expansion" "extracting certificate fields"

 .cindex "&%certextract%&" "certificate fields"
 .cindex "certificate" "extracting fields"
 The <&'certificate'&> must be a variable of type certificate.
 .cindex "&%certextract%&" "certificate fields"
 .cindex "certificate" "extracting fields"
 The <&'certificate'&> must be a variable of type certificate.


@@ -12210,7 +12210,7 @@ normally the gid of the Exim user.
 .cindex "uid (user id)" "of originating user"
 .cindex "sender" "uid"
 .vindex "&$caller_uid$&"
 .cindex "uid (user id)" "of originating user"
 .cindex "sender" "uid"
 .vindex "&$caller_uid$&"

-.vindex "&$originaltor_uid$&"
+.vindex "&$originator_uid$&"

 The value of &$caller_uid$& that was set when the message was received. For
 messages received via the command line, this is the uid of the sending user.
 For messages received by SMTP over TCP/IP, this is normally the uid of the Exim
 The value of &$caller_uid$& that was set when the message was received. For
 messages received via the command line, this is the uid of the sending user.
 For messages received by SMTP over TCP/IP, this is normally the uid of the Exim


@@ -12828,7 +12828,7 @@ If TLS has not been negotiated, the value will be 0.
 
 .vitem &$tls_in_ourcert$&
 .vindex "&$tls_in_ourcert$&"
 
 .vitem &$tls_in_ourcert$&
 .vindex "&$tls_in_ourcert$&"

-.cindex certificate veriables
+.cindex certificate variables

 This variable refers to the certificate presented to the peer of an
 inbound connection when the message was received.
 It is only useful as the argument of a
 This variable refers to the certificate presented to the peer of an
 inbound connection when the message was received.
 It is only useful as the argument of a


@@ -13098,7 +13098,7 @@ initial startup, even if &%perl_at_start%& is set.
 .oindex "&%perl_taintmode%&"
 .cindex "Perl" "taintmode"
 To provide more security executing Perl code via the embedded Perl
 .oindex "&%perl_taintmode%&"
 .cindex "Perl" "taintmode"
 To provide more security executing Perl code via the embedded Perl

-interpeter, the &%perl_taintmode%& option can be set. This enables the
+interpreter, the &%perl_taintmode%& option can be set. This enables the

 taint mode of the Perl interpreter. You are encouraged to set this
 option to a true value. To avoid breaking existing installations, it
 defaults to false.
 taint mode of the Perl interpreter. You are encouraged to set this
 option to a true value. To avoid breaking existing installations, it
 defaults to false.


@@ -14406,7 +14406,7 @@ it obviously cannot send an error message of any kind.
 
 There is a slight performance penalty for these checks.
 Versions of Exim preceding 4.88 had these disabled by default;
 
 There is a slight performance penalty for these checks.
 Versions of Exim preceding 4.88 had these disabled by default;

-high-rate intallations confident they will never run out of resources
+high-rate installations confident they will never run out of resources

 may wish to deliberately disable them.
 
 .option chunking_advertise_hosts main "host list&!!" *
 may wish to deliberately disable them.
 
 .option chunking_advertise_hosts main "host list&!!" *


@@ -16714,7 +16714,7 @@ example, instead of &"Administrative prohibition"&, it might give:
 .option smtputf8_advertise_hosts main "host list&!!" *
 .cindex "SMTPUTF8" "advertising"
 When Exim is built with support for internationalised mail names,
 .option smtputf8_advertise_hosts main "host list&!!" *
 .cindex "SMTPUTF8" "advertising"
 When Exim is built with support for internationalised mail names,

-the availability therof is advertised in
+the availability thereof is advertised in

 response to EHLO only to those client hosts that match this option. See
 chapter &<<CHAPi18n>>& for details of Exim's support for internationalisation.
 
 response to EHLO only to those client hosts that match this option. See
 chapter &<<CHAPi18n>>& for details of Exim's support for internationalisation.
 


@@ -21007,7 +21007,7 @@ The control does not apply to shadow transports.
 
 .cindex "hints database" "transport concurrency control"
 Exim implements this control by means of a hints database in which a record is
 
 .cindex "hints database" "transport concurrency control"
 Exim implements this control by means of a hints database in which a record is

-incremented whenever a transport process is beaing created. The record
+incremented whenever a transport process is being created. The record

 is decremented and possibly removed when the process terminates.
 Obviously there is scope for
 records to get left lying around if there is a system or program crash. To
 is decremented and possibly removed when the process terminates.
 Obviously there is scope for
 records to get left lying around if there is a system or program crash. To


@@ -23971,7 +23971,7 @@ unauthenticated. See also &%hosts_require_auth%&, and chapter
 .cindex "RFC 3030" "CHUNKING"
 This option provides a list of servers to which, provided they announce
 CHUNKING support, Exim will attempt to use BDAT commands rather than DATA.
 .cindex "RFC 3030" "CHUNKING"
 This option provides a list of servers to which, provided they announce
 CHUNKING support, Exim will attempt to use BDAT commands rather than DATA.

-BDAT will not be used in conjuction with a transport filter.
+BDAT will not be used in conjunction with a transport filter.

 
 .option hosts_try_fastopen smtp "host list!!" unset
 .cindex "fast open, TCP" "enabling, in client"
 
 .option hosts_try_fastopen smtp "host list!!" unset
 .cindex "fast open, TCP" "enabling, in client"


@@ -27536,7 +27536,7 @@ Great care should be taken to deal with matters of case, various injection
 attacks in the string (&`../`& or SQL), and ensuring that a valid filename
 can always be referenced; it is important to remember that &$tls_in_sni$& is
 arbitrary unverified data provided prior to authentication.
 attacks in the string (&`../`& or SQL), and ensuring that a valid filename
 can always be referenced; it is important to remember that &$tls_in_sni$& is
 arbitrary unverified data provided prior to authentication.

-Further, the initial cerificate is loaded before SNI is arrived, so
+Further, the initial certificate is loaded before SNI is arrived, so

 an expansion for &%tls_certificate%& must have a default which is used
 when &$tls_in_sni$& is empty.
 
 an expansion for &%tls_certificate%& must have a default which is used
 when &$tls_in_sni$& is empty.
 


@@ -28913,7 +28913,7 @@ This behaviour can be adjusted by appending the option &*defer=*&<&'value'&>
 to the control; the default value is &"spool"& and the alternate value
 &"pass"& copies an SMTP defer response from the target back to the initiator
 and does not queue the message.
 to the control; the default value is &"spool"& and the alternate value
 &"pass"& copies an SMTP defer response from the target back to the initiator
 and does not queue the message.

-Note that this is independent of any receipient verify conditions in the ACL.
+Note that this is independent of any recipient verify conditions in the ACL.

 
 Delivery in this mode avoids the generation of a bounce mail to a
 (possibly faked)
 
 Delivery in this mode avoids the generation of a bounce mail to a
 (possibly faked)


@@ -29809,7 +29809,7 @@ deny  dnslists = blackholes.mail-abuse.org
 warn  message  = X-Warn: sending host is on dialups list
       dnslists = dialups.mail-abuse.org
 .endd
 warn  message  = X-Warn: sending host is on dialups list
       dnslists = dialups.mail-abuse.org
 .endd

-.cindex cacheing "of dns lookup"
+.cindex caching "of dns lookup"

 .cindex DNS TTL
 DNS list lookups are cached by Exim for the duration of the SMTP session
 (but limited by the DNS return TTL value),
 .cindex DNS TTL
 DNS list lookups are cached by Exim for the duration of the SMTP session
 (but limited by the DNS return TTL value),


@@ -29922,7 +29922,7 @@ multiple DNS records. The inner dnsdb lookup produces a list of MX hosts
 and the outer dnsdb lookup finds the IP addresses for these hosts. The result
 of expanding the condition might be something like this:
 .code
 and the outer dnsdb lookup finds the IP addresses for these hosts. The result
 of expanding the condition might be something like this:
 .code

-dnslists = sbl.spahmaus.org/<|192.168.2.3|192.168.5.6|...
+dnslists = sbl.spamhaus.org/<|192.168.2.3|192.168.5.6|...

 .endd
 Thus, this example checks whether or not the IP addresses of the sender
 domain's mail servers are on the Spamhaus black list.
 .endd
 Thus, this example checks whether or not the IP addresses of the sender
 domain's mail servers are on the Spamhaus black list.


@@ -36046,7 +36046,7 @@ off the &%outgoing_interface%& option.
 .next
 .cindex "log" "outgoing remote port"
 .cindex "port" "logging outgoint remote"
 .next
 .cindex "log" "outgoing remote port"
 .cindex "port" "logging outgoint remote"

-.cindex "TCP/IP" "logging ougtoing remote port"
+.cindex "TCP/IP" "logging outgoing remote port"

 &%outgoing_port%&: The remote port number is added to delivery log lines (those
 containing => tags) following the IP address.
 The local port is also added if &%incoming_interface%& and
 &%outgoing_port%&: The remote port number is added to delivery log lines (those
 containing => tags) following the IP address.
 The local port is also added if &%incoming_interface%& and


@@ -38798,7 +38798,7 @@ can be used to affect that action (more on this below).
 An additional variable, &$event_data$&, is filled with information varying
 with the event type:
 .display
 An additional variable, &$event_data$&, is filled with information varying
 with the event type:
 .display

-&`msg:delivery         `& smtp confirmation mssage
+&`msg:delivery         `& smtp confirmation message

 &`msg:rcpt:host:defer  `& error string
 &`msg:rcpt:defer       `& error string
 &`msg:host:defer       `& error string
 &`msg:rcpt:host:defer  `& error string
 &`msg:rcpt:defer       `& error string
 &`msg:host:defer       `& error string

diff --git a/doc/doc-misc/Ext-maildir++ b/doc/doc-misc/Ext-maildir++
index b2fc580455d3b3bd1f602cce32273716913e5b53..6d821fb4db94ad2fcbd69c50cbba2b3cfd24a126 100644 (file)
--- a/doc/doc-misc/Ext-maildir++
+++ b/doc/doc-misc/Ext-maildir++
@@ -41,7 +41,7 @@ HOWTO.maildirquota
 
    Furthermore, this quota mechanism is not 100% effective. It is
    possible to have a situation where someone may go over quota. This
 
    Furthermore, this quota mechanism is not 100% effective. It is
    possible to have a situation where someone may go over quota. This

-   quota implementation uses a deliverate trade-off. It is necessary to
+   quota implementation uses a deliberate trade-off. It is necessary to

    use some form of locking in order to have a complete bulletproof quota
    enforcement, but maildirs mail stores were explicitly designed to
    avoid any kind of locking. This quota approach does not use locking,
    use some form of locking in order to have a complete bulletproof quota
    enforcement, but maildirs mail stores were explicitly designed to
    avoid any kind of locking. This quota approach does not use locking,

diff --git a/doc/doc-misc/Ext-mbx-locking b/doc/doc-misc/Ext-mbx-locking
index f1b0523f69f35d928ebca7e005df0301c6c801df..9ef684026338f95cff98736d0c4982ec557f05cb 100644 (file)
--- a/doc/doc-misc/Ext-mbx-locking
+++ b/doc/doc-misc/Ext-mbx-locking
@@ -43,7 +43,7 @@ writeable memory between such processes.
 
      A means of communicating this is by use of a file with a mutually
 agreed upon name.  A binary semaphore can be passed by means of the
 
      A means of communicating this is by use of a file with a mutually
 agreed upon name.  A binary semaphore can be passed by means of the

-existance or non-existance of that file, provided that there is an
+existence or non-existence of that file, provided that there is an

 atomic means to create a file if and only if that file does not exist.
 In C terms:
 
 atomic means to create a file if and only if that file does not exist.
 In C terms:
 


@@ -81,7 +81,7 @@ locks held by that process when it terminates.
 exclusive (provided there are no other shared users of the lock) and
 to downgrade an exclusive lock to shared.  It is important that at no
 time is the lock ever removed; a process upgrading to exclusive must
 exclusive (provided there are no other shared users of the lock) and
 to downgrade an exclusive lock to shared.  It is important that at no
 time is the lock ever removed; a process upgrading to exclusive must

-not relenquish its shared lock.
+not relinquish its shared lock.

 
      Most commonly, the resources being locked are files.  Shared
 locks are particularly important with files; multiple simultaneous
 
      Most commonly, the resources being locked are files.  Shared
 locks are particularly important with files; multiple simultaneous

diff --git a/doc/doc-misc/RFC.conform b/doc/doc-misc/RFC.conform
index 91683cf9e4de5b9305913d91638e00ec4beb18f3..1ddd5b33d586ebe9941febe663ab5a6c48726e34 100644 (file)
--- a/doc/doc-misc/RFC.conform
+++ b/doc/doc-misc/RFC.conform
@@ -98,7 +98,7 @@ enclosed in <> characters, so a header such as
 
   From: @a,@b:c@d
 
 
   From: @a,@b:c@d
 

-is syntactally invalid. Exim does not enforce this restriction.
+is syntactically invalid. Exim does not enforce this restriction.

 
 
 1.6 Local parts [3.4.1]
 
 
 1.6 Local parts [3.4.1]


@@ -243,7 +243,7 @@ MTA for the same message.
 [Multihomed host addresses should not be randomized.]
 
 Exim does randomize a list of several addresses for a single host, because
 [Multihomed host addresses should not be randomized.]
 
 Exim does randomize a list of several addresses for a single host, because

-caching in resolvers will defeat the round-robinning that many namerservers
+caching in resolvers will defeat the round-robinning that many nameservers

 use. (Note: this is not the same as randomizing equal-valued MX records. That
 is required by the RFC.)
 
 use. (Note: this is not the same as randomizing equal-valued MX records. That
 is required by the RFC.)
 

diff --git a/doc/doc-misc/TexiNotes b/doc/doc-misc/TexiNotes
index 542f8ed93137a82919564f1e5c3883872bfdc36b..0c056e4d94f065a5481b77d1b98c2773969430b1 100644 (file)
--- a/doc/doc-misc/TexiNotes
+++ b/doc/doc-misc/TexiNotes
@@ -12,7 +12,7 @@ by @@ @{ and @} if required.
 
 @copyright{}   for copyright
 
 
 @copyright{}   for copyright
 

-@minus{}  is a slighly longer minus sign
+@minus{}  is a slightly longer minus sign

 
 Input file ends with .texinfo usually.
 
 
 Input file ends with .texinfo usually.
 

diff --git a/doc/doc-misc/WishList b/doc/doc-misc/WishList
index e266116eabe7ad6b43edb20e395f21389bc8dc14..28ae7332f5a264b824f80414f0ad9fd62426570d 100644 (file)
--- a/doc/doc-misc/WishList
+++ b/doc/doc-misc/WishList
@@ -171,8 +171,8 @@ So the admin can pass back a reason.
 mark david mcCreary
 
 "I use the syntax_errors_to feature to email a copy of the error message.
 mark david mcCreary
 
 "I use the syntax_errors_to feature to email a copy of the error message.

-It would be helpful to have the X-Failed-Receipients header in there,
-identifying which addreses(s) are the problem, so that I don't have to
+It would be helpful to have the X-Failed-Recipients header in there,
+identifying which address(es) are the problem, so that I don't have to

 parse the body of the email message to figure out which addresses."
 ------------------------------------------------------------------------------
 
 parse the body of the email message to figure out which addresses."
 ------------------------------------------------------------------------------
 


@@ -620,7 +620,7 @@ Joachim Wieland
 
 Is this really worth it? A per-transport value is also suggested - that would
 mean remembering the value with each failed address and taking a minimum or
 
 Is this really worth it? A per-transport value is also suggested - that would
 mean remembering the value with each failed address and taking a minimum or

-a maximimum (which?).
+a maximum (which?).

 ------------------------------------------------------------------------------
 
 (24)  21-Feb-02 ?  A way of testing TLS using -bh
 ------------------------------------------------------------------------------
 
 (24)  21-Feb-02 ?  A way of testing TLS using -bh


@@ -815,7 +815,7 @@ logs the IP of the sending host in the => line?" Also requested was amount of
 data transmitted for a non-delivery attempt.
 ------------------------------------------------------------------------------
 
 data transmitted for a non-delivery attempt.
 ------------------------------------------------------------------------------
 

-(69)  03-Jul-02 T  Log selector to log whoson checs
+(69)  03-Jul-02 T  Log selector to log whoson checks

 Matt Bernstein
 
 "I'd quite like a log_selector option which could spot you'd done a whoson
 Matt Bernstein
 
 "I'd quite like a log_selector option which could spot you'd done a whoson


@@ -989,7 +989,7 @@ a list defer.
 Peter A. Savitch
 
 OpenLDAP 2.1 is going to be more popular (2.1.9 is available with many
 Peter A. Savitch
 
 OpenLDAP 2.1 is going to be more popular (2.1.9 is available with many

-bug fixes). TLS-enabled LDAP is an interesting and usefull thing.
+bug fixes). TLS-enabled LDAP is an interesting and useful thing.

 I can try to implement some things and send the patches, like with
 ldapi.
 
 I can try to implement some things and send the patches, like with
 ldapi.
 


@@ -1302,7 +1302,7 @@ option, for use with multiple Exim daemons.
 See also 333.
 ------------------------------------------------------------------------------
 
 See also 333.
 ------------------------------------------------------------------------------
 

-(214) 05-Nov-03 S  Put the wild part of local part prefix/suffx in variables
+(214) 05-Nov-03 S  Put the wild part of local part prefix/suffix in variables

 
 Unfortunately, this isn't quite as trivial as it seems.
 ------------------------------------------------------------------------------
 
 Unfortunately, this isn't quite as trivial as it seems.
 ------------------------------------------------------------------------------


@@ -1608,7 +1608,7 @@ how useful this would actually be in practice.
 
 (292) 13-Aug-04 M Overall timeout for message reception
 
 
 (292) 13-Aug-04 M Overall timeout for message reception
 

-A client could in priciple keep an SMTP connection open for a very long time by
+A client could in principle keep an SMTP connection open for a very long time by

 trickling in data very slowly. Also, after message_size_limit is exceeded, Exim
 continues to swallow the data (though it does not write it to disk) until the
 end is reached. Again, the connection could be held open for a very long time.
 trickling in data very slowly. Also, after message_size_limit is exceeded, Exim
 continues to swallow the data (though it does not write it to disk) until the
 end is reached. Again, the connection could be held open for a very long time.


@@ -2051,8 +2051,8 @@ This is what was suggested:
 This should be very simple to implement and will allow to make
 some experiments and implement custom extensions, i.e. one to
 known if remote client will redirect on 551 or not. Also the acl
 This should be very simple to implement and will allow to make
 some experiments and implement custom extensions, i.e. one to
 known if remote client will redirect on 551 or not. Also the acl

-for unknown smpt command could be used for other purposes, like
-to dectect and react to some kiddies that send things like
+for unknown smtp command could be used for other purposes, like
+to detect and react to some kiddies that send things like

 http://... on the smtp port.
 ------------------------------------------------------------------------------
 --- HWM 355 ------------------------------------------------------------------
 http://... on the smtp port.
 ------------------------------------------------------------------------------
 --- HWM 355 ------------------------------------------------------------------

diff --git a/doc/doc-scripts/f2h b/doc/doc-scripts/f2h
index 6e53480bbc0e702cc45c48e1863859c7442822ea..221a801945da117aeadb2fabee2f9787c3c7bf1b 100755 (executable)
--- a/doc/doc-scripts/f2h
+++ b/doc/doc-scripts/f2h
@@ -83,7 +83,7 @@ return $s;
 
 # We want to read the file paragraph by paragraph; Perl only does this if the
 # separating lines are truly blank. Having been caught by lines containing
 
 # We want to read the file paragraph by paragraph; Perl only does this if the
 # separating lines are truly blank. Having been caught by lines containing

-# whitespace before, do a detrailing pass first.
+# whitespace before, do a de-trailing pass first.

 
 open(IN, "$ARGV[0]") || die "can't open $ARGV[0] (preliminary)\n";
 open(OUT, ">$ARGV[0]-$$") || die "can't open $ARGV[0]-$$\n";
 
 open(IN, "$ARGV[0]") || die "can't open $ARGV[0] (preliminary)\n";
 open(OUT, ">$ARGV[0]-$$") || die "can't open $ARGV[0]-$$\n";


@@ -298,7 +298,7 @@ while ($_ = <IN>)
     next;
     }
 
     next;
     }
 

-  # If a paragraph begins ==> it is a display which must remain verbatin
+  # If a paragraph begins ==> it is a display which must remain verbatim

   # and not be reformatted. The flag gets turned into spaces.
 
   if ($_ =~ /^==>/)
   # and not be reformatted. The flag gets turned into spaces.
 
   if ($_ =~ /^==>/)

diff --git a/doc/doc-scripts/f2txt b/doc/doc-scripts/f2txt
index 4f24f7b3f5cc3dd9328c1239cf0d93946ceb680f..7fb7292a5cbb6b2714b7ca0369a8ce32d85caa5f 100755 (executable)
--- a/doc/doc-scripts/f2txt
+++ b/doc/doc-scripts/f2txt
@@ -55,7 +55,7 @@ return $s;
 
 # We want to read the file paragraph by paragraph; Perl only does this if the
 # separating lines are truly blank. Having been caught by lines containing
 
 # We want to read the file paragraph by paragraph; Perl only does this if the
 # separating lines are truly blank. Having been caught by lines containing

-# whitespace before, do a detrailing pass first.
+# whitespace before, do a de-trailing pass first.

 
 open(IN, "$ARGV[0]") || die "can't open $ARGV[0] (preliminary)\n";
 open(OUT, ">$ARGV[0]-$$") || die "can't open $ARGV[0]-$$\n";
 
 open(IN, "$ARGV[0]") || die "can't open $ARGV[0] (preliminary)\n";
 open(OUT, ">$ARGV[0]-$$") || die "can't open $ARGV[0]-$$\n";


@@ -82,7 +82,7 @@ while ($_ = <IN>)
 
   next if /^\#\#/;
 
 
   next if /^\#\#/;
 

-  # If a paragraph begins ==> it is a display which must remain verbatin
+  # If a paragraph begins ==> it is a display which must remain verbatim

   # and not be reformatted. The flag gets turned into spaces.
 
   if ($_ =~ /^==>/)
   # and not be reformatted. The flag gets turned into spaces.
 
   if ($_ =~ /^==>/)

diff --git a/doc/doc-scripts/fc2k b/doc/doc-scripts/fc2k
index 0b977fc87bfdca2410017e05884e95819434ddc7..a1a3537adb6babf1ad645ee82e4d5b075debc374 100755 (executable)
--- a/doc/doc-scripts/fc2k
+++ b/doc/doc-scripts/fc2k
@@ -213,7 +213,7 @@ while (<IN>)
     # We want to chop excessively long entries on either side. We can't set
     # a fixed length because of the HTML control data. Call a function to
     # add the given length to allow for HTML stuff. This is crude, but it
     # We want to chop excessively long entries on either side. We can't set
     # a fixed length because of the HTML control data. Call a function to
     # add the given length to allow for HTML stuff. This is crude, but it

-    # does roughtly the right thing.
+    # does roughly the right thing.

 
     my($leftlen) = &setlen(70, $pretext);
     my($rightlen) = &setlen(70, $posttext);
 
     my($leftlen) = &setlen(70, $pretext);
     my($rightlen) = &setlen(70, $posttext);

diff --git a/doc/doc-scripts/g2t b/doc/doc-scripts/g2t
index 2f2ac449b2c11f35bd8d82484a99da9ebb504ba7..c840ac64f13da4643f95dde92614874f686fe84a 100755 (executable)
--- a/doc/doc-scripts/g2t
+++ b/doc/doc-scripts/g2t
@@ -725,7 +725,7 @@ while (<>)
       # "-". If we triple it in the menu it gets displayed OK, but building
       # software complains about non-existent cross references etc.
 
       # "-". If we triple it in the menu it gets displayed OK, but building
       # software complains about non-existent cross references etc.
 

-      # I have gone for the horrid kludge of turning it into "-<hyhen>"
+      # I have gone for the horrid kludge of turning it into "-<hyphen>"

       # in the menus and nodes.
 
       # Exim 4 has added --help, which has the same problem.
       # in the menus and nodes.
 
       # Exim 4 has added --help, which has the same problem.

diff --git a/doc/doc-src/ABOUT b/doc/doc-src/ABOUT
index e94c804a6098467b7fbda3266c88b50a48098363..607f385205f75627b051729e42f5208065db5cf5 100644 (file)
--- a/doc/doc-src/ABOUT
+++ b/doc/doc-src/ABOUT
@@ -4,7 +4,7 @@ Exim repository: doc/doc-src
 This directory contains documentation files that are processed in some way in
 order to make the documentation files that form part of Exim distributions. A
 non-standard document processor (SGCAL) was used up to and including release
 This directory contains documentation files that are processed in some way in
 order to make the documentation files that form part of Exim distributions. A
 non-standard document processor (SGCAL) was used up to and including release

-4.50 of Exim to process the sources for the manual and filter docuement.
+4.50 of Exim to process the sources for the manual and filter document.

 Subsequent documentation releases operate using DocBook input, so these files
 are now historical relics. The FAQ source is still (June 2005) current, but may
 be superseded in due course.
 Subsequent documentation releases operate using DocBook input, so these files
 are now historical relics. The FAQ source is still (June 2005) current, but may
 be superseded in due course.

diff --git a/doc/doc-src/FAQ.src b/doc/doc-src/FAQ.src
index 9280e0314e9ba85d43c109b279523fa77a998d74..1d43cbcd251ad1e0191acd428fd7b225db815844 100644 (file)
--- a/doc/doc-src/FAQ.src
+++ b/doc/doc-src/FAQ.src
@@ -912,7 +912,7 @@ A0047: \-bz-\ is a Sendmail option requesting it to create a `configuration free
 
 ==>      /usr/lib/sendmail -bz
 
 
 ==>      /usr/lib/sendmail -bz
 

-       in some start-up script (e.g. \(/etc/init.d/mail)\) immedately before
+       in some start-up script (e.g. \(/etc/init.d/mail)\) immediately before

 
 ==>      /usr/lib/sendmail -bd -q15m
 
 
 ==>      /usr/lib/sendmail -bd -q15m
 


@@ -2117,7 +2117,7 @@ A0301: They mean exactly what they say. Exim expected to route an address to a
        with MX records pointing to \"localhost"\ (or other names with A records
        that specify 127.0.0.1), which causes this behaviour. You can use the
        \ignore_target_hosts\ option to get Exim to ignore these records. The
        with MX records pointing to \"localhost"\ (or other names with A records
        that specify 127.0.0.1), which causes this behaviour. You can use the
        \ignore_target_hosts\ option to get Exim to ignore these records. The

-       default contiguration does this. For more discussion, see Q0319. For
+       default configuration does this. For more discussion, see Q0319. For

        other cases:
 
        (1) If the domain is meant to be handled as a local domain, there
        other cases:
 
        (1) If the domain is meant to be handled as a local domain, there


@@ -3452,7 +3452,7 @@ A0510: \^elspy^\ is a layer of glue code that enables you to write Python code
        to scan email messages at SMTP time. \^elspy^\ also includes a small
        Python library with common mail-scanning tools, including an interface
        to SpamAssassin and a simple but effective virus detector. You can
        to scan email messages at SMTP time. \^elspy^\ also includes a small
        Python library with common mail-scanning tools, including an interface
        to SpamAssassin and a simple but effective virus detector. You can

-       optain \^elspy^\ from \?http://elspy.sourceforge.net/?\.
+       obtain \^elspy^\ from \?http://elspy.sourceforge.net/?\.

 
 
 Q0511: Whenever my system filter uses a \mail\ command to send a message, I get
 
 
 Q0511: Whenever my system filter uses a \mail\ command to send a message, I get


@@ -3543,7 +3543,7 @@ A0601: Whenever Exim does a local delivery, it runs a process under a specific
 ==>      majordomo: |/local/mail/majordomo ...
 
        then Exim has to be told what uid/gid to use for the delivery. This can
 ==>      majordomo: |/local/mail/majordomo ...
 
        then Exim has to be told what uid/gid to use for the delivery. This can

-       be done either on the routerr that handles the address, or on the
+       be done either on the router that handles the address, or on the

        transport that actually does the delivery. If a pipe is going to run a
        setuid program, then it doesn't matter what uid Exim starts it out with,
        and so the most straightforward thing is to put
        transport that actually does the delivery. If a pipe is going to run a
        setuid program, then it doesn't matter what uid Exim starts it out with,
        and so the most straightforward thing is to put


@@ -3617,7 +3617,7 @@ A0603: Q0601 contains background information on this. If you are using, say, an
 
 
 Q0604: I want to use MMDF-style mailboxes. How can I get Exim to append the
 
 
 Q0604: I want to use MMDF-style mailboxes. How can I get Exim to append the

-       ctrl-A characters that separate indvidual emails?
+       ctrl-A characters that separate individual emails?

 
 A0604: Set the \message_suffix\ option in the \%appendfile%\ transport. In fact,
        for MMDF mailboxes you need a prefix as well as a suffix to get it
 
 A0604: Set the \message_suffix\ option in the \%appendfile%\ transport. In fact,
        for MMDF mailboxes you need a prefix as well as a suffix to get it


@@ -3660,7 +3660,7 @@ Q0606: I'm using tmail to do local deliveries, but when I turned on the
        \use_crlf\ option on the \%pipe%\ transport (tmail prefers \"@\r@\n"\
        terminations) message bodies started to vanish.
 
        \use_crlf\ option on the \%pipe%\ transport (tmail prefers \"@\r@\n"\
        terminations) message bodies started to vanish.
 

-A0606: You need to unset the \mesage_prefix\ option, or change it so that its
+A0606: You need to unset the \message_prefix\ option, or change it so that its

        default \"@\n"\ terminator becomes \"@\r@\n"\. For example, the
        transport could be:
 
        default \"@\n"\ terminator becomes \"@\r@\n"\. For example, the
        transport could be:
 


@@ -5038,7 +5038,7 @@ A0806: The value of \$domain$\ is the actual domain that appears in the address.
        but it is important to some people - especially if by some unfortunate
        accident the lowercased word is something indecent.
 
        but it is important to some people - especially if by some unfortunate
        accident the lowercased word is something indecent.
 

-       You can trivally force lower casing by means of the \"${lc:"\ operator.
+       You can trivially force lower casing by means of the \"${lc:"\ operator.

        Instead of \"$domain"\ write \"${lc:$domain}"\.
 
 
        Instead of \"$domain"\ write \"${lc:$domain}"\.
 
 


@@ -5099,7 +5099,7 @@ A0905: You can only do this in a round about way, using filter commands like
 
 ==>      headers add "New-Subject: SPAM: $h_subject:"
          headers remove subject
 
 ==>      headers add "New-Subject: SPAM: $h_subject:"
          headers remove subject

-         neaders add "Subject: $h_new-subject:"
+         headers add "Subject: $h_new-subject:"

          headers remove new-subject
 
        This trick works only in system filters, where the commands are obeyed
          headers remove new-subject
 
        This trick works only in system filters, where the commands are obeyed

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 0222d48e487ccc2927f922c62acf6a6f01b9c206..dba99c2ff897d88bbaf9319fce206e33bb48218f 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -9,7 +9,7 @@ Exim version 4.89
 -------------------
 
 JH/01 Bug 1922: Support IDNA2008.  This has slightly different conversion rules
 -------------------
 
 JH/01 Bug 1922: Support IDNA2008.  This has slightly different conversion rules

-      than -2003 did; needs libidn2 in addition to linidn.
+      than -2003 did; needs libidn2 in addition to libidn.

 
 JH/02 The path option on a pipe transport is now expanded before use.
 
 
 JH/02 The path option on a pipe transport is now expanded before use.
 


@@ -90,7 +90,7 @@ JH/16 DANE: treat a TLSA lookup response having all non-TLSA RRs, the same
       as one having no matching records.  Previously we deferred the message
       that needed the lookup.
 
       as one having no matching records.  Previously we deferred the message
       that needed the lookup.
 

-JH/17 Fakereject: previously logged as a norml message arrival "<="; now
+JH/17 Fakereject: previously logged as a normal message arrival "<="; now

       distinguished as "(=".
 
 JH/18 Bug 1867: make the fail_defer_domains option on a dnslookup router work
       distinguished as "(=".
 
 JH/18 Bug 1867: make the fail_defer_domains option on a dnslookup router work


@@ -101,7 +101,7 @@ JH/19 Bug 1850: support Radius libraries that return REJECT_RC.
 JH/20 Bug 1872: Ensure that acl_smtp_notquit is run when the connection drops
       after the data-go-ahead and data-ack.  Patch from Jason Betts.
 
 JH/20 Bug 1872: Ensure that acl_smtp_notquit is run when the connection drops
       after the data-go-ahead and data-ack.  Patch from Jason Betts.
 

-JH/21 Bug 1846: Send DMARC forensic reports for reject and quaratine results,
+JH/21 Bug 1846: Send DMARC forensic reports for reject and quarantine results,

       even for a "none" policy.  Patch from Tony Meyer.
 
 JH/22 Fix continued use of a connection for further deliveries. If a port was
       even for a "none" policy.  Patch from Tony Meyer.
 
 JH/22 Fix continued use of a connection for further deliveries. If a port was


@@ -214,7 +214,7 @@ JH/05 Downgrade message for a TLS-certificate-based authentication fail from
 HS/02 Add the Exim version string to the process info.  This way exiwhat
       gives some more detail about the running daemon.
 
 HS/02 Add the Exim version string to the process info.  This way exiwhat
       gives some more detail about the running daemon.
 

-JH/06 Bug 1395: time-limit cacheing of DNS lookups, to the TTL value.  This may
+JH/06 Bug 1395: time-limit caching of DNS lookups, to the TTL value.  This may

       matter for fast-change records such as DNSBLs.
 
 JH/07 Bug 1678: Always record an interface option value, if set,  as part of a
       matter for fast-change records such as DNSBLs.
 
 JH/07 Bug 1678: Always record an interface option value, if set,  as part of a


@@ -248,7 +248,7 @@ JH/17 Bug 1713: Fix non-PDKIM_DEBUG build.  Patch from Jasen Betts.
 
 JH/18 Bug 1709: When built with TLS support, the tls_advertise_hosts option now
       defaults to "*" (all hosts).  The variable is now available when not built
 
 JH/18 Bug 1709: When built with TLS support, the tls_advertise_hosts option now
       defaults to "*" (all hosts).  The variable is now available when not built

-      with TLS, default unset, mainly to enable keeping the testuite sane.
+      with TLS, default unset, mainly to enable keeping the testsuite sane.

       If a server certificate is not supplied (via tls_certificate) an error is
       logged, and clients will find TLS connections fail on startup.  Presumably
       they will retry in-clear.
       If a server certificate is not supplied (via tls_certificate) an error is
       logged, and clients will find TLS connections fail on startup.  Presumably
       they will retry in-clear.


@@ -262,7 +262,7 @@ JH/19 Two additional event types: msg:rcpt:defer and msg:rcpt:host:defer. Both
       in transport context, after the attempt, and per-recipient. The latter type
       is per host attempted.  The event data is the error message, and the errno
       information encodes the lookup type (A vs. MX) used for the (first) host,
       in transport context, after the attempt, and per-recipient. The latter type
       is per host attempted.  The event data is the error message, and the errno
       information encodes the lookup type (A vs. MX) used for the (first) host,

-      and the trailing two digits of the smtp 4xx reponse.
+      and the trailing two digits of the smtp 4xx response.

 
 GF/01 Bug 1715: Fix for race condition in exicyclog, where exim could attempt
       to write to mainlog (or rejectlog, paniclog) in the window between file
 
 GF/01 Bug 1715: Fix for race condition in exicyclog, where exim could attempt
       to write to mainlog (or rejectlog, paniclog) in the window between file


@@ -277,7 +277,7 @@ JH/21 Bug 1720: Add support for priority groups and weighted-random proxy
       "pri" and "weight".  Note that the previous implicit priority given by the
       list order is no longer honoured.
 
       "pri" and "weight".  Note that the previous implicit priority given by the
       list order is no longer honoured.
 

-JH/22 Bugs 963, 1721: Fix some corner cases in message body canonicalisation
+JH/22 Bugs 963, 1721: Fix some corner cases in message body canonicalization

       for DKIM processing.
 
 JH/23 Move SOCKS5 support from Experimental to mainline, enabled for a build
       for DKIM processing.
 
 JH/23 Move SOCKS5 support from Experimental to mainline, enabled for a build


@@ -459,13 +459,13 @@ JH/25 Bug 466: Add RFC2322 support for MIME attachment filenames.
 HS/02 Bug 1575: exigrep falls back to autodetection of compressed
       files if ZCAT_COMMAND is not executable.
 
 HS/02 Bug 1575: exigrep falls back to autodetection of compressed
       files if ZCAT_COMMAND is not executable.
 

-JH/26 Bug 1539: Add timout/retry options on dnsdb lookups.
+JH/26 Bug 1539: Add timeout/retry options on dnsdb lookups.

 
 JH/27 Bug 286: Support SOA lookup in dnsdb lookups.
 
 JH/28 Bug 1588: Do not use the A lookup following an AAAA for setting the FQDN.
       Normally benign, it bites when the pair was led to by a CNAME;
 
 JH/27 Bug 286: Support SOA lookup in dnsdb lookups.
 
 JH/28 Bug 1588: Do not use the A lookup following an AAAA for setting the FQDN.
       Normally benign, it bites when the pair was led to by a CNAME;

-      modern usage is to not canoicalize the domain to a CNAME target
+      modern usage is to not canonicalize the domain to a CNAME target

       (and we were inconsistent anyway for A-only vs AAAA+A).
 
 JH/29 Bug 1632: Removed the word "rejected" from line logged for ACL discards.
       (and we were inconsistent anyway for A-only vs AAAA+A).
 
 JH/29 Bug 1632: Removed the word "rejected" from line logged for ACL discards.


@@ -531,7 +531,7 @@ JH/05 Fix results-pipe from transport process.  Several recipients, combined
       with certificate use, exposed issues where response data items split
       over buffer boundaries were not parsed properly.  This eventually
       resulted in duplicates being sent.  This issue only became common enough
       with certificate use, exposed issues where response data items split
       over buffer boundaries were not parsed properly.  This eventually
       resulted in duplicates being sent.  This issue only became common enough

-      to notice due to the introduction of conection certificate information,
+      to notice due to the introduction of connection certificate information,

       the item size being so much larger.  Found and fixed by Wolfgang Breyha.
 
 JH/06 Bug 1533: Fix truncation of items in headers_remove lists.  A fixed
       the item size being so much larger.  Found and fixed by Wolfgang Breyha.
 
 JH/06 Bug 1533: Fix truncation of items in headers_remove lists.  A fixed


@@ -541,7 +541,7 @@ JH/06 Bug 1533: Fix truncation of items in headers_remove lists.  A fixed
 JH/07 Add support for directories of certificates when compiled with a GnuTLS
       version 3.3.6 or later.
 
 JH/07 Add support for directories of certificates when compiled with a GnuTLS
       version 3.3.6 or later.
 

-JH/08 Rename the TPDA expermimental facility to Event Actions.  The #ifdef
+JH/08 Rename the TPDA experimental facility to Event Actions.  The #ifdef

       is EXPERIMENTAL_EVENT, the main-configuration and transport options
       both become "event_action", the variables become $event_name, $event_data
       and $event_defer_errno.  There is a new variable $verify_mode, usable in
       is EXPERIMENTAL_EVENT, the main-configuration and transport options
       both become "event_action", the variables become $event_name, $event_data
       and $event_defer_errno.  There is a new variable $verify_mode, usable in


@@ -579,7 +579,7 @@ TL/07 Bug 1547: Omit RFCs from release. Draft and RFCs have licenses which
 
 JH/15 Updates and fixes to the EXPERIMENTAL_DSN feature.
 
 
 JH/15 Updates and fixes to the EXPERIMENTAL_DSN feature.
 

-JH/16 Fix string representation of time values on 64bit time_t anchitectures.
+JH/16 Fix string representation of time values on 64bit time_t architectures.

       Bug 1561.
 
 JH/17 Fix a null-indirection in certextract expansions when a nondefault
       Bug 1561.
 
 JH/17 Fix a null-indirection in certextract expansions when a nondefault


@@ -593,7 +593,7 @@ TL/01 Bugzilla 1506: Re-add a 'return NULL' to silence complaints from static
       return.
 
 JH/01 Bug 1513: Fix parsing of quoted parameter values in MIME headers.
       return.
 
 JH/01 Bug 1513: Fix parsing of quoted parameter values in MIME headers.

-      This was a regression intruduced in 4.83 by another bugfix.
+      This was a regression introduced in 4.83 by another bugfix.

 
 JH/02 Fix broken compilation when EXPERIMENTAL_DSN is enabled.
 
 
 JH/02 Fix broken compilation when EXPERIMENTAL_DSN is enabled.
 


@@ -924,7 +924,7 @@ JH/14 SMTP PRDR (http://www.eric-a-hall.com/specs/draft-hall-prdr-00.txt).
       advertises the facility.  If the client requests PRDR a new
       acl_data_smtp_prdr ACL is called once for each recipient, after
       the body content is received and before the acl_smtp_data ACL.
       advertises the facility.  If the client requests PRDR a new
       acl_data_smtp_prdr ACL is called once for each recipient, after
       the body content is received and before the acl_smtp_data ACL.

-      The client is controlled by bolth of: a hosts_try_prdr option
+      The client is controlled by both of: a hosts_try_prdr option

       on the smtp transport, and the server advertisement.
       Default client logging of deliveries and rejections involving
       PRDR are flagged with the string "PRDR".
       on the smtp transport, and the server advertisement.
       Default client logging of deliveries and rejections involving
       PRDR are flagged with the string "PRDR".


@@ -952,7 +952,7 @@ PP/20 Added force_command boolean option to pipe transport.
 JH/15 AUTH support on callouts (and hence cutthrough-deliveries).
       Bugzilla 321, 823.
 
 JH/15 AUTH support on callouts (and hence cutthrough-deliveries).
       Bugzilla 321, 823.
 

-TF/04 Added udpsend ACL modifer and hexquote expansion operator
+TF/04 Added udpsend ACL modifier and hexquote expansion operator

 
 PP/21 Fix eximon continuous updating with timestamped log-files.
       Broken in a format-string cleanup in 4.80, missed when I repaired the
 
 PP/21 Fix eximon continuous updating with timestamped log-files.
       Broken in a format-string cleanup in 4.80, missed when I repaired the


@@ -1096,7 +1096,7 @@ PP/15 LDAP: Check for errors of TLS initialisation, to give correct
       diagnostics.
       Report and patch from Dmitry Banschikov.
 
       diagnostics.
       Report and patch from Dmitry Banschikov.
 

-PP/16 Removed "dont_insert_empty_fragments" fron "openssl_options".
+PP/16 Removed "dont_insert_empty_fragments" from "openssl_options".

       Removed SSL_clear() after SSL_new() which led to protocol negotiation
       failures.  We appear to now support TLS1.1+ with Exim.
 
       Removed SSL_clear() after SSL_new() which led to protocol negotiation
       failures.  We appear to now support TLS1.1+ with Exim.
 


@@ -1226,7 +1226,7 @@ TF/04 Improved ratelimit ACL condition.
       has clearer semantics. The /leaky, /strict, and /readonly update modes
       are mutually exclusive. The update mode is no longer included in the
       database key; it just determines when the database is updated. (This
       has clearer semantics. The /leaky, /strict, and /readonly update modes
       are mutually exclusive. The update mode is no longer included in the
       database key; it just determines when the database is updated. (This

-      means that when you upgrde Exim will forget old rate measurements.)
+      means that when you upgrade Exim will forget old rate measurements.)

 
       Exim now checks that the per_* options are used with an update mode that
       makes sense for the current ACL. For example, when Exim is processing a
 
       Exim now checks that the per_* options are used with an update mode that
       makes sense for the current ACL. For example, when Exim is processing a


@@ -1361,7 +1361,7 @@ PP/09 Fix another SIGFPE (x86) in ${eval:...} expansion, this time related to
 Exim version 4.75
 -----------------
 
 Exim version 4.75
 -----------------
 

-NM/01 Workround for PCRE version dependency in version reporting
+NM/01 Workaround for PCRE version dependency in version reporting

       Bugzilla 1073
 
 TF/01 Update valgrind.h and memcheck.h to copies from valgrind-3.6.0.
       Bugzilla 1073
 
 TF/01 Update valgrind.h and memcheck.h to copies from valgrind-3.6.0.


@@ -1431,7 +1431,7 @@ NM/05 Fix to spam.c to accommodate older gcc versions which dislike
       variable declaration deep within a block.  Bug and patch from
       Dennis Davis.
 
       variable declaration deep within a block.  Bug and patch from
       Dennis Davis.
 

-PP/15 lookups-Makefile IRIX compatibilty coercion.
+PP/15 lookups-Makefile IRIX compatibility coercion.

 
 PP/16 Make DISABLE_DKIM build knob functional.
 
 
 PP/16 Make DISABLE_DKIM build knob functional.
 


@@ -1856,7 +1856,7 @@ PH/02 When an IPv6 address is converted to a string for single-key lookup
       colons if the lookup type is iplsearch. This is not incompatible, because
       previously such lookups could never work.
 
       colons if the lookup type is iplsearch. This is not incompatible, because
       previously such lookups could never work.
 

-      The situation is now rather anomolous, since one *can* have colons in
+      The situation is now rather anomalous, since one *can* have colons in

       ordinary lsearch keys. However, making the change in all cases is
       incompatible and would probably break a number of configurations.
 
       ordinary lsearch keys. However, making the change in all cases is
       incompatible and would probably break a number of configurations.
 


@@ -2026,7 +2026,7 @@ PH/19 Change 4.64/PH/36 introduced a bug: when address_retry_include_sender
 PH/20 Added hosts_avoid_pipelining to the smtp transport.
 
 PH/21 Long custom messages for fakedefer and fakereject are now split up
 PH/20 Added hosts_avoid_pipelining to the smtp transport.
 
 PH/21 Long custom messages for fakedefer and fakereject are now split up

-      into multiline reponses in the same way that messages for "deny" and
+      into multiline responses in the same way that messages for "deny" and

       other ACL rejections are.
 
 PH/22 Applied Jori Hamalainen's speed-up changes and typo fixes to exigrep,
       other ACL rejections are.
 
 PH/22 Applied Jori Hamalainen's speed-up changes and typo fixes to exigrep,


@@ -2433,7 +2433,7 @@ PH/36 After a 4xx response to a RCPT error, that address was delayed (in queue
       runs only) independently of the message's sender address. This meant
       that, if the 4xx error was in fact related to the sender, a different
       message to the same recipient with a different sender could confuse
       runs only) independently of the message's sender address. This meant
       that, if the 4xx error was in fact related to the sender, a different
       message to the same recipient with a different sender could confuse

-      things. In particualar, this can happen when sending to a greylisting
+      things. In particular, this can happen when sending to a greylisting

       server, but other circumstances could also provoke similar problems.
       I have changed the default so that the retry time for these errors is now
       based a combination of the sender and recipient addresses. This change
       server, but other circumstances could also provoke similar problems.
       I have changed the default so that the retry time for these errors is now
       based a combination of the sender and recipient addresses. This change


@@ -2502,7 +2502,7 @@ SC/08 Eximstats V1.50
 
 JJ/03 exipick.20061117.2, made header handling as similar to exim as possible
       (added [br]h_ prefixes, implemented RFC2047 decoding.  Fixed
 
 JJ/03 exipick.20061117.2, made header handling as similar to exim as possible
       (added [br]h_ prefixes, implemented RFC2047 decoding.  Fixed

-      whitesspace changes from 4.64-PH/27
+      whitespace changes from 4.64-PH/27

 
 JJ/04 exipick.20061117.2, fixed format and added $message_headers_raw to
       match 4.64-PH/13
 
 JJ/04 exipick.20061117.2, fixed format and added $message_headers_raw to
       match 4.64-PH/13


@@ -2824,7 +2824,7 @@ PH/14 When a uid/gid is specified for the queryprogram router, it cannot be
 
       (a) Failures to set uid/gid, the current directory, or a process leader
           in a subprocess such as that created by queryprogram now generate
 
       (a) Failures to set uid/gid, the current directory, or a process leader
           in a subprocess such as that created by queryprogram now generate

-          suitable debugging ouput when -d is set.
+          suitable debugging output when -d is set.

 
       (b) The queryprogram router detects when it is not running as root,
           outputs suitable debugging information if -d is set, and then runs
 
       (b) The queryprogram router detects when it is not running as root,
           outputs suitable debugging information if -d is set, and then runs


@@ -3184,7 +3184,7 @@ PH/09 Applied a patch from the Sieve maintainer which:
       and most important:
 
       o  fixes a bug in processing the envelope test (when testing
       and most important:
 
       o  fixes a bug in processing the envelope test (when testing

-         multiple envelope elements, the last element determinted the
+         multiple envelope elements, the last element determined the

          result)
 
 PH/10 Exim was violating RFC 3834 ("Recommendations for Automatic Responses to
          result)
 
 PH/10 Exim was violating RFC 3834 ("Recommendations for Automatic Responses to


@@ -3193,7 +3193,7 @@ PH/10 Exim was violating RFC 3834 ("Recommendations for Automatic Responses to
         Auto-submitted: auto-generated
 
       in the messages that it generates (bounce messages and others, such as
         Auto-submitted: auto-generated
 
       in the messages that it generates (bounce messages and others, such as

-      warnings). In the case of bounce messages for non-SMTP mesages, there was
+      warnings). In the case of bounce messages for non-SMTP messages, there was

       also a typo: it was using "Auto_submitted" (underscore instead of
       hyphen). Since every message generated by Exim is necessarily in response
       to another message, thes have all been changed to:
       also a typo: it was using "Auto_submitted" (underscore instead of
       hyphen). Since every message generated by Exim is necessarily in response
       to another message, thes have all been changed to:


@@ -3558,7 +3558,7 @@ TK/03 Merged latest SRS patch from Miles Wilton.
 PH/05 There's a shambles in IRIX6 - it defines EX_OK in unistd.h which conflicts
       with the definition in sysexits.h (which is #included earlier).
       Fortunately, Exim does not actually use EX_OK. The code used to try to
 PH/05 There's a shambles in IRIX6 - it defines EX_OK in unistd.h which conflicts
       with the definition in sysexits.h (which is #included earlier).
       Fortunately, Exim does not actually use EX_OK. The code used to try to

-      preserve the sysexits.h value, by assumimg that macro definitions were
+      preserve the sysexits.h value, by assuming that macro definitions were

       scanned for macro replacements. I have been disabused of this notion,
       so now the code just undefines EX_OK before #including unistd.h.
 
       scanned for macro replacements. I have been disabused of this notion,
       so now the code just undefines EX_OK before #including unistd.h.
 


@@ -3578,7 +3578,7 @@ PH/07 Added "fullpostmaster" verify option, which does a check to <postmaster>
 SC/01 Eximstats: added -xls and the ability to specify output files
      (patch written by Frank Heydlauf).
 
 SC/01 Eximstats: added -xls and the ability to specify output files
      (patch written by Frank Heydlauf).
 

-SC/02 Eximstats: use FileHandles for outputing results.
+SC/02 Eximstats: use FileHandles for outputting results.

 
 SC/03 Eximstats: allow any combination of xls, txt, and html output.
 
 
 SC/03 Eximstats: allow any combination of xls, txt, and html output.
 


@@ -5603,7 +5603,7 @@ Exim version 4.31
 58. When a "warn" ACL statement has a log_message modifier, the message is
     remembered, and not repeated. This is to avoid a lot of repetition when a
     message has many recipients that cause the same warning to be written.
 58. When a "warn" ACL statement has a log_message modifier, the message is
     remembered, and not repeated. This is to avoid a lot of repetition when a
     message has many recipients that cause the same warning to be written.

-    Howewer, Exim was preserving the list of already written lines for an
+    However, Exim was preserving the list of already written lines for an

     entire SMTP session, which doesn't seem right. The memory is now reset if a
     new message is started.
 
     entire SMTP session, which doesn't seem right. The memory is now reset if a
     new message is started.
 


@@ -5693,7 +5693,7 @@ Exim version 4.31
     the list was checked. (An example that provoked this was putting <; in the
     middle of a list instead of at the start.) If this happened during a DATA
     ACL check, a -D file could be left lying around. This kind of configuration
     the list was checked. (An example that provoked this was putting <; in the
     middle of a list instead of at the start.) If this happened during a DATA
     ACL check, a -D file could be left lying around. This kind of configuration

-    error no longer causes Exim to die; instead it causes a defer errror. The
+    error no longer causes Exim to die; instead it causes a defer error. The

     incident is still logged to the main and panic logs.
 
 74. Buglet left over from Exim 3 conversion. The message "too many messages
     incident is still logged to the main and panic logs.
 
 74. Buglet left over from Exim 3 conversion. The message "too many messages


@@ -5757,7 +5757,7 @@ Exim version 4.30
     systems (e.g. Solaris), it also passes back the IP address string as the
     "host name". However, on others (e.g. Linux), it passes back an empty
     string. Exim wasn't checking for this, and was changing the host name to an
     systems (e.g. Solaris), it also passes back the IP address string as the
     "host name". However, on others (e.g. Linux), it passes back an empty
     string. Exim wasn't checking for this, and was changing the host name to an

-    empty string, assuming it had been canonicized.
+    empty string, assuming it had been canonicalized.

 
  5. Although rare, it is permitted to have more than one PTR record for a given
     IP address. I thought that gethostbyaddr() or getipnodebyaddr() always gave
 
  5. Although rare, it is permitted to have more than one PTR record for a given
     IP address. I thought that gethostbyaddr() or getipnodebyaddr() always gave


@@ -5809,7 +5809,7 @@ Exim version 4.30
 
 13. The install script calls Exim with "-C /dev/null" in order to find the
     version number. If ALT_CONFIG_PREFIX was set, this caused an error message
 
 13. The install script calls Exim with "-C /dev/null" in order to find the
     version number. If ALT_CONFIG_PREFIX was set, this caused an error message

-    to be output. Howeve, since Exim outputs its version number before the
+    to be output. However, since Exim outputs its version number before the

     error, it didn't break the script. It just looked ugly. I fixed this by
     always allowing "-C /dev/null" if the caller is root.
 
     error, it didn't break the script. It just looked ugly. I fixed this by
     always allowing "-C /dev/null" if the caller is root.
 


@@ -5890,7 +5890,7 @@ Exim version 4.30
 
 34. Testing for a connection timeout using "timeout_connect" in the retry rules
     did not work. The code looks as if it has *never* worked, though it appears
 
 34. Testing for a connection timeout using "timeout_connect" in the retry rules
     did not work. The code looks as if it has *never* worked, though it appears

-    to have been documented since at least releast 1.62. I have made it work.
+    to have been documented since at least release 1.62. I have made it work.

 
 35. The "timeout_DNS" error in retry rules, also documented since at least
     1.62, also never worked. As it isn't clear exactly what this means, and
 
 35. The "timeout_DNS" error in retry rules, also documented since at least
     1.62, also never worked. As it isn't clear exactly what this means, and


@@ -6335,7 +6335,7 @@ Exim version 4.21
 16. Check for letters, digits, hyphens, and dots in the names of dnslist
     domains, and warn by logging if others are found.
 
 16. Check for letters, digits, hyphens, and dots in the names of dnslist
     domains, and warn by logging if others are found.
 

-17. At least on BSD, alignment is not guarenteed for the array of ifreq's
+17. At least on BSD, alignment is not guaranteed for the array of ifreq's

     returned from GIFCONF when Exim is trying to find the list of interfaces on
     a host. The code in os.c has been modified to copy each ifreq to an aligned
     structure in all cases.
     returned from GIFCONF when Exim is trying to find the list of interfaces on
     a host. The code in os.c has been modified to copy each ifreq to an aligned
     structure in all cases.


@@ -6369,7 +6369,7 @@ Exim version 4.21
 24. Ignore Sendmail's -Ooption=value command line item.
 
 25. When execve() failed while trying to run a command in a pipe transport,
 24. Ignore Sendmail's -Ooption=value command line item.
 
 25. When execve() failed while trying to run a command in a pipe transport,

-    Exim was returning EX_UNAVAILBLE (69) from the subprocess. However, this
+    Exim was returning EX_UNAVAILABLE (69) from the subprocess. However, this

     could be confused with a return value of 69 from the command itself. This
     has been changed to 127, the value the shell returns if it is asked to run
     a non-existent command. The wording for the related log line suggests a
     could be confused with a return value of 69 from the command itself. This
     has been changed to 127, the value the shell returns if it is asked to run
     a non-existent command. The wording for the related log line suggests a


@@ -6482,7 +6482,7 @@ Exim version 4.21
 
 47. Change 50 for 4.20 was a heap of junk. I don't know what I was thinking
     when I implemented it. It didn't allow for the fact that some option values
 
 47. Change 50 for 4.20 was a heap of junk. I don't know what I was thinking
     when I implemented it. It didn't allow for the fact that some option values

-    may legitimatetly be negative (e.g. size_addition), and it didn't even do
+    may legitimately be negative (e.g. size_addition), and it didn't even do

     the right test for positive values.
 
 48. Domain names in DNS records are case-independent. Exim always looks them up
     the right test for positive values.
 
 48. Domain names in DNS records are case-independent. Exim always looks them up

diff --git a/doc/doc-txt/ChangeLog.0 b/doc/doc-txt/ChangeLog.0
index b83e43c611c49c87ff49520c227183c5ba5b3508..9c3972268e5188665cd4e8dedd4bedd362c2f9af 100644 (file)
--- a/doc/doc-txt/ChangeLog.0
+++ b/doc/doc-txt/ChangeLog.0
@@ -33,7 +33,7 @@ Exim version 4.20
         "standard" one afterwards.
 
     (d) The setting of the SIGTERM handler while reading SMTP commands was done
         "standard" one afterwards.
 
     (d) The setting of the SIGTERM handler while reading SMTP commands was done

-        somwhat untidily. I have re-arranged the code.
+        somewhat untidily. I have re-arranged the code.

 
  4. If the building process was interrupted during the MakeLinks script, a
     subsequent run of 'make' gave misleading errors. I've made it a bit more
 
  4. If the building process was interrupted during the MakeLinks script, a
     subsequent run of 'make' gave misleading errors. I've made it a bit more


@@ -268,7 +268,7 @@ Exim version 4.20
     use in the forthcoming Sieve addition to Exim.
 
 56. The behaviour of -t in the presence of Resent- headers has been changed,
     use in the forthcoming Sieve addition to Exim.
 
 56. The behaviour of -t in the presence of Resent- headers has been changed,

-    for compability with Sendmail and other MTAs. Previously, Exim gave an
+    for compatibility with Sendmail and other MTAs. Previously, Exim gave an

     error, because it is not clear from RFC 2822 how this might be handled. It
     turns out that MUAs don't seem to follow what RFC 2822 says, and any MUA
     that uses -t with Resent- ensures that there is only one set of Resent-
     error, because it is not clear from RFC 2822 how this might be handled. It
     turns out that MUAs don't seem to follow what RFC 2822 says, and any MUA
     that uses -t with Resent- ensures that there is only one set of Resent-


@@ -464,7 +464,7 @@ Exim version 4.14
     was also null (empty passwords are permitted), there was an infinite loop.
     An empty user name is not now passed to PAM; authentication is forcibly
     failed instead. Also, if the end of the list of strings is reached, an
     was also null (empty passwords are permitted), there was an infinite loop.
     An empty user name is not now passed to PAM; authentication is forcibly
     failed instead. Also, if the end of the list of strings is reached, an

-    empty string is passed back just once; a subequent call for data provokes
+    empty string is passed back just once; a subsequent call for data provokes

     an error response.
 
 39. If a reverse DNS lookup yields an empty string, treat it as if the lookup
     an error response.
 
 39. If a reverse DNS lookup yields an empty string, treat it as if the lookup


@@ -587,7 +587,7 @@ Exim version 4.14
 
 69. The "more" and "unseen" generic router options can now be expanded strings.
 
 
 69. The "more" and "unseen" generic router options can now be expanded strings.
 

-70. The "once_repeat" option in the autoreply tranport is now an expanded
+70. The "once_repeat" option in the autoreply transport is now an expanded

     string.
 
 71. If maildir_format is set on an appendfile transport that is referenced from
     string.
 
 71. If maildir_format is set on an appendfile transport that is referenced from


@@ -596,7 +596,7 @@ Exim version 4.14
 
 72. Fixed three bugs in ${readsocket:
       (i) If the operation failed, and a failure string was given, "}}" was
 
 72. Fixed three bugs in ${readsocket:
       (i) If the operation failed, and a failure string was given, "}}" was

-          erroroneously added to it.
+          erroneously added to it.

      (ii) If the operation succeeded, but a failure string was present, "}" was
           added to the expanded data.
     (iii) The alarm for the timeout was set with signal() instead of with
      (ii) If the operation succeeded, but a failure string was present, "}" was
           added to the expanded data.
     (iii) The alarm for the timeout was set with signal() instead of with


@@ -701,7 +701,7 @@ Exim version 4.12
  4. Change 4.11/30 below overlooked the case when an address gets a 4xx
     response from a server. Because this isn't a host problem, the host does
     not get delayed, and it gets tried every time the address is OK'd for
  4. Change 4.11/30 below overlooked the case when an address gets a 4xx
     response from a server. Because this isn't a host problem, the host does
     not get delayed, and it gets tried every time the address is OK'd for

-    routing, with the same reponse. However, if hosts_max_try is set, because
+    routing, with the same response. However, if hosts_max_try is set, because

     not all the hosts were tried, the address does not time out. I've changed
     things so that if there is a 4xx response to a RCPT command, the host in
     question does not count towards hosts_max_try if the message is older than
     not all the hosts were tried, the address does not time out. I've changed
     things so that if there is a 4xx response to a RCPT command, the host in
     question does not count towards hosts_max_try if the message is older than


@@ -1245,10 +1245,10 @@ Exim version 4.11
     observed that getipnodebyname() gives HOST_NOT_FOUND for names for which a
     DNS lookup gives TRY_AGAIN. See also change 125 below.
 
     observed that getipnodebyname() gives HOST_NOT_FOUND for names for which a
     DNS lookup gives TRY_AGAIN. See also change 125 below.
 

-90. Minor rewording of ACL error for attemted header check after RCPT.
+90. Minor rewording of ACL error for attempted header check after RCPT.

 
 91. When USE_GDBM was set, exim_dbmbuild wasn't working properly (still assumed
 
 91. When USE_GDBM was set, exim_dbmbuild wasn't working properly (still assumed

-    NDBM compatibilify interface); similarly in dbmdb lookups when ownership
+    NDBM compatible interface); similarly in dbmdb lookups when ownership

     was being tested.
 
 92. If a Reply-To: header contained newlines and was used to generate
     was being tested.
 
 92. If a Reply-To: header contained newlines and was used to generate


@@ -2017,7 +2017,7 @@ Exim version 4.03
     SMTP connection, a pipe file descriptor was accidentally left open. This
     meant that if there was a long chain of such processes, the number of open
     file descriptors increased by one for each process, and if there were
     SMTP connection, a pipe file descriptor was accidentally left open. This
     meant that if there was a long chain of such processes, the number of open
     file descriptors increased by one for each process, and if there were

-    sufficent, the limit of open descriptors could be reached, causing various
+    sufficient, the limit of open descriptors could be reached, causing various

     problems.
 
  8. When an address was being checked with -bt and the routing involved an
     problems.
 
  8. When an address was being checked with -bt and the routing involved an

diff --git a/doc/doc-txt/Exim3.upgrade b/doc/doc-txt/Exim3.upgrade
index 5c5024a31bb37fada971cb02761dcb6869a6b494..4ab94c4e9733d7362ea85f1fbc19cceed61ecf6a 100644 (file)
--- a/doc/doc-txt/Exim3.upgrade
+++ b/doc/doc-txt/Exim3.upgrade
@@ -115,7 +115,7 @@ always been set up specifically, as described in the manual.
 
 5. The way in which Exim scans its queue when split_spool_directory is set has
 changed, but this shouldn't make any noticeable difference. See doc/NewStuff
 
 5. The way in which Exim scans its queue when split_spool_directory is set has
 changed, but this shouldn't make any noticeable difference. See doc/NewStuff

-for defails.
+for details.

 
 
 Upgrading from release 3.03
 
 
 Upgrading from release 3.03

diff --git a/doc/doc-txt/Exim4.upgrade b/doc/doc-txt/Exim4.upgrade
index a97d41f8ca7c8f3e365ccb2b44804445b819c7b6..528d94d9c30aa15b909cdac8f76e16ec65814a14 100644 (file)
--- a/doc/doc-txt/Exim4.upgrade
+++ b/doc/doc-txt/Exim4.upgrade
@@ -802,7 +802,7 @@ The smtp transport
 . The authenticate_hosts option has been renamed as hosts_try_auth. A new
   option called hosts_require_auth has been added; if authentication fails for
   one of these hosts, Exim does _not_ try to send unauthenticated. It defers
 . The authenticate_hosts option has been renamed as hosts_try_auth. A new
   option called hosts_require_auth has been added; if authentication fails for
   one of these hosts, Exim does _not_ try to send unauthenticated. It defers

-  instead. The deferal error is detectable in the retry rules, so this can be
+  instead. The deferral error is detectable in the retry rules, so this can be

   turned into a hard failure if required.
 
 
   turned into a hard failure if required.
 
 


@@ -1206,7 +1206,7 @@ and the bounce.
 
 The logging options that have been abolished are: log_all_parents,
 log_arguments, log_incoming_port, log_interface, log_ip_options,
 
 The logging options that have been abolished are: log_all_parents,
 log_arguments, log_incoming_port, log_interface, log_ip_options,

-log_level, log_queue_run_level, log_received_sender, log_received_rceipients,
+log_level, log_queue_run_level, log_received_sender, log_received_recipients,

 log_rewrites, log_sender_on_delivery, log_smtp_confirmation,
 log_smtp_connections, log_smtp_syntax_errors, log_subject, tls_log_cipher,
 tls_log_peerdn.
 log_rewrites, log_sender_on_delivery, log_smtp_confirmation,
 log_smtp_connections, log_smtp_syntax_errors, log_subject, tls_log_cipher,
 tls_log_peerdn.


@@ -1323,7 +1323,7 @@ String Expansion
 
 . There's a new expansion feature for running commands:
 
 
 . There's a new expansion feature for running commands:
 

-    ${run{comand args}{yes}{no}}
+    ${run{command args}{yes}{no}}

 
   Like all the other conditional items, the {yes} and {no} strings are
   optional. Omitting both is equivalent to {$value}. The standard output of the
 
   Like all the other conditional items, the {yes} and {no} strings are
   optional. Omitting both is equivalent to {$value}. The standard output of the

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 603351dc889a07e9de7b6d242e083924cdf34a0c..dd70201e5e22a01b7b995725b6c63722a33c7dbb 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -213,7 +213,7 @@ Version 4.83
 12. OCSP stapling is now supported by default.
 
 13. If built with the EXPERIMENTAL_DSN feature enabled, Exim will output
 12. OCSP stapling is now supported by default.
 
 13. If built with the EXPERIMENTAL_DSN feature enabled, Exim will output

-    Delivery Status Notification messages in MIME format, and negociate
+    Delivery Status Notification messages in MIME format, and negotiate

     DSN features per RFC 3461.
 
 
     DSN features per RFC 3461.
 
 


@@ -268,20 +268,20 @@ Version 4.82
     ignored.
 
  7. New cutthrough routing feature.  Requested by a "control = cutthrough_delivery"
     ignored.
 
  7. New cutthrough routing feature.  Requested by a "control = cutthrough_delivery"

-    ACL modifier; works for single-recipient mails which are recieved on and
+    ACL modifier; works for single-recipient mails which are received on and

     deliverable via SMTP.  Using the connection made for a recipient verify,
     if requested before the verify, or a new one made for the purpose while
     the inbound connection is still active.  The bulk of the mail item is copied
     direct from the inbound socket to the outbound (as well as the spool file).
     When the source notifies the end of data, the data acceptance by the destination
     deliverable via SMTP.  Using the connection made for a recipient verify,
     if requested before the verify, or a new one made for the purpose while
     the inbound connection is still active.  The bulk of the mail item is copied
     direct from the inbound socket to the outbound (as well as the spool file).
     When the source notifies the end of data, the data acceptance by the destination

-    is negociated before the acceptance is sent to the source.  If the destination
+    is negotiated before the acceptance is sent to the source.  If the destination

     does not accept the mail item, for example due to content-scanning, the item
     is not accepted from the source and therefore there is no need to generate
     a bounce mail.  This is of benefit when providing a secondary-MX service.
     The downside is that delays are under the control of the ultimate destination
     system not your own.
 
     does not accept the mail item, for example due to content-scanning, the item
     is not accepted from the source and therefore there is no need to generate
     a bounce mail.  This is of benefit when providing a secondary-MX service.
     The downside is that delays are under the control of the ultimate destination
     system not your own.
 

-    The Recieved-by: header on items delivered by cutthrough is generated
+    The Received-by: header on items delivered by cutthrough is generated

     early in reception rather than at the end; this will affect any timestamp
     included.  The log line showing delivery is recorded before that showing
     reception; it uses a new ">>" tag instead of "=>".
     early in reception rather than at the end; this will affect any timestamp
     included.  The log line showing delivery is recorded before that showing
     reception; it uses a new ">>" tag instead of "=>".


@@ -366,7 +366,7 @@ Version 4.82
     provided to the authentication method which failed.  It is available
     for use in subsequent ACL processing (typically quit or notquit ACLs).
 
     provided to the authentication method which failed.  It is available
     for use in subsequent ACL processing (typically quit or notquit ACLs).
 

-23. New ACL modifer "udpsend" can construct a UDP packet to send to a given
+23. New ACL modifier "udpsend" can construct a UDP packet to send to a given

     UDP host and port.
 
 24. New ${hexquote:..string..} expansion operator converts non-printable
     UDP host and port.
 
 24. New ${hexquote:..string..} expansion operator converts non-printable

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index dc16b6dee0f99b5b62e754c07bda1c156440177e..fc528518d0d72ce8ad74b56b3829c9bccf6a0903 100644 (file)
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -54,7 +54,7 @@ acl_not_smtp_mime                    string*         unset         main
 acl_smtp_auth                        string*         unset         main              4.00
 acl_smtp_connect                     string*         unset         main              4.11
 acl_smtp_data                        string*         unset         main              4.00
 acl_smtp_auth                        string*         unset         main              4.00
 acl_smtp_connect                     string*         unset         main              4.11
 acl_smtp_data                        string*         unset         main              4.00

-acl_smtp_data_prdr                   string*         unset         main              4.82 with expreimental_prdr
+acl_smtp_data_prdr                   string*         unset         main              4.82 with experimental_prdr

 acl_smtp_dkim                        string*         unset         main              4.70 unless disable_dkim
 acl_smtp_etrn                        string*         unset         main              4.00
 acl_smtp_expn                        string*         unset         main              4.00
 acl_smtp_dkim                        string*         unset         main              4.70 unless disable_dkim
 acl_smtp_etrn                        string*         unset         main              4.00
 acl_smtp_expn                        string*         unset         main              4.00


@@ -870,7 +870,7 @@ EXIM_MONITOR                 optional     set to eximon.bin to compile
 EXIM_PERL                    optional
 EXIM_USER                    mandatory    user to use for Exim
 EXIWHAT_EGREP_ARG            system**     to find Exim processes from ps
 EXIM_PERL                    optional
 EXIM_USER                    mandatory    user to use for Exim
 EXIWHAT_EGREP_ARG            system**     to find Exim processes from ps

-EXIWHAT_KILL_SIGNAL          system**     -SIGUSER1 or numerical equivalent
+EXIWHAT_KILL_SIGNAL          system**     -SIGUSR1 or numerical equivalent

 EXIWHAT_MULTIKILL_CMD        system**
 EXIWHAT_MULTIKILL_ARG        system**
 EXIWHAT_PS_ARG               system**     to list all processes
 EXIWHAT_MULTIKILL_CMD        system**
 EXIWHAT_MULTIKILL_ARG        system**
 EXIWHAT_PS_ARG               system**     to list all processes

diff --git a/doc/doc-txt/README.SIEVE b/doc/doc-txt/README.SIEVE
index 9b22745eaf3f600ee72b56661c281f796f3a50cc..d36998fe732ead1de187e2cfaaa22d9b50ebfa63 100644 (file)
--- a/doc/doc-txt/README.SIEVE
+++ b/doc/doc-txt/README.SIEVE
@@ -274,7 +274,7 @@ The draft does not specify how strings using MIME entities are used
 to compose messages.  As a result, different implementations generate
 different mails.  The Exim Sieve implementation splits the reason into
 header and body.  It adds the header to the mail header and uses the body
 to compose messages.  As a result, different implementations generate
 different mails.  The Exim Sieve implementation splits the reason into
 header and body.  It adds the header to the mail header and uses the body

-as mail body.  Be aware, that other imlementations compose a multipart
+as mail body.  Be aware, that other implementations compose a multipart

 structure with the reason as only part.  Both conform to the specification
 (or lack thereof).
 
 structure with the reason as only part.  Both conform to the specification
 (or lack thereof).
 

diff --git a/doc/doc-txt/dbm.discuss.txt b/doc/doc-txt/dbm.discuss.txt
index e82987b5ff9665eba3eedd4980f26caf175adb91..4de57735ecf17e3600db5f7767e6bba2642c1dab 100644 (file)
--- a/doc/doc-txt/dbm.discuss.txt
+++ b/doc/doc-txt/dbm.discuss.txt
@@ -157,7 +157,7 @@ This dbm library can be called by Exim in one of two ways: via the ndbm
 compatibility interface, or via its own native interface. There are two
 advantages to doing the latter: (1) you don't run the risk of Exim's seeing the
 "wrong" version of the ndbm.h header, as described above, and (2) the
 compatibility interface, or via its own native interface. There are two
 advantages to doing the latter: (1) you don't run the risk of Exim's seeing the
 "wrong" version of the ndbm.h header, as described above, and (2) the

-performace is better. It is therefore recommended that you set USE_DB=yes in an
+performance is better. It is therefore recommended that you set USE_DB=yes in an

 appropriate Local/Makefile-xxx file. (If you are compiling for just one OS, it
 can go in Local/Makefile itself.)
 
 appropriate Local/Makefile-xxx file. (If you are compiling for just one OS, it
 can go in Local/Makefile itself.)
 

diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt
index 5213d8be46f3c5577cca13c1884321121e0dc2e8..2a1901ade14cde281670bc4c28081c4954646eb2 100644 (file)
--- a/doc/doc-txt/experimental-spec.txt
+++ b/doc/doc-txt/experimental-spec.txt
@@ -6,7 +6,7 @@ about experimental  features, all  of which  are unstable and
 liable to incompatible change.
 
 
 liable to incompatible change.
 
 

-Brightmail AntiSpam (BMI) suppport
+Brightmail AntiSpam (BMI) support

 --------------------------------------------------------------
 
 Brightmail  AntiSpam  is  a  commercial  package.  Please  see
 --------------------------------------------------------------
 
 Brightmail  AntiSpam  is  a  commercial  package.  Please  see


@@ -42,7 +42,7 @@ These four steps are explained in more details below.
 1) Adding support for BMI at compile time
 
   To compile with BMI support,  you need to link Exim  against
 1) Adding support for BMI at compile time
 
   To compile with BMI support,  you need to link Exim  against

-  the   Brighmail  client   SDK,  consisting   of  a   library
+  the  Brightmail  client   SDK,  consisting   of  a   library

   (libbmiclient_single.so)  and  a  header  file  (bmi_api.h).
   You'll also need to explicitly set a flag in the Makefile to
   include BMI support in the Exim binary. Both can be achieved
   (libbmiclient_single.so)  and  a  header  file  (bmi_api.h).
   You'll also need to explicitly set a flag in the Makefile to
   include BMI support in the Exim binary. Both can be achieved


@@ -550,7 +550,7 @@ Then set something like
 mout-xforward.gmx.net           82.165.159.12
 mout.gmx.net                    212.227.15.16
 
 mout-xforward.gmx.net           82.165.159.12
 mout.gmx.net                    212.227.15.16
 

-Use a reasonable IP. eg. one the sending cluster acutally uses.
+Use a reasonable IP. eg. one the sending cluster actually uses.

 
 DMARC Support
 --------------------------------------------------------------
 
 DMARC Support
 --------------------------------------------------------------


@@ -894,7 +894,7 @@ DANE will only be usable if the target host has DNSSEC-secured
 MX, A and TLSA records.
 
 A TLSA lookup will be done if either of the above options match
 MX, A and TLSA records.
 
 A TLSA lookup will be done if either of the above options match

-and the host-lookup succeded using dnssec.
+and the host-lookup succeeded using dnssec.

 If a TLSA lookup is done and succeeds, a DANE-verified TLS connection
 will be required for the host.  If it does not, the host will not
 be used; there is no fallback to non-DANE or non-TLS.
 If a TLSA lookup is done and succeeds, a DANE-verified TLS connection
 will be required for the host.  If it does not, the host will not
 be used; there is no fallback to non-DANE or non-TLS.


@@ -960,7 +960,7 @@ The reporting MTA detailed diagnostic.
 Example:
   X-Exim-Diagnostic: X-str; SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 Rationale:
 Example:
   X-Exim-Diagnostic: X-str; SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 Rationale:

-  This string somtimes give extra information over the
+  This string sometimes give extra information over the

   existing (already available) Diagnostic-Code field.
 
 
   existing (already available) Diagnostic-Code field.
 
 


@@ -970,7 +970,7 @@ Note that non-RFC-documented field names and data types are used.
 LMDB Lookup support
 -------------------
 LMDB is an ultra-fast, ultra-compact, crash-proof key-value embedded data store.
 LMDB Lookup support
 -------------------
 LMDB is an ultra-fast, ultra-compact, crash-proof key-value embedded data store.

-It is modeled loosely on the BerkeleyDB API. You shoul read about the feature
+It is modeled loosely on the BerkeleyDB API. You should read about the feature

 set as well as operation modes at https://symas.com/products/lightning-memory-mapped-database/
 
 LMDB single key lookup support is provided by linking to the LMDB C library.
 set as well as operation modes at https://symas.com/products/lightning-memory-mapped-database/
 
 LMDB single key lookup support is provided by linking to the LMDB C library.

diff --git a/doc/doc-txt/openssl.txt b/doc/doc-txt/openssl.txt
index 6e6db9f69cefec0966d50986bcbc6bd357860ef4..fc2aab0649eebc0cb09e97111de14a5fdb2473b1 100644 (file)
--- a/doc/doc-txt/openssl.txt
+++ b/doc/doc-txt/openssl.txt
@@ -77,7 +77,7 @@ To look at the libraries _probably_ found by the linker, use:
     ldd $(which exim)          # most platforms
     otool -L $(which exim)     # MacOS
 
     ldd $(which exim)          # most platforms
     otool -L $(which exim)     # MacOS
 

-although that does not correclty handle restrictions imposed upon
+although that does not correctly handle restrictions imposed upon

 executables which are setuid.
 
 If the `chrpath` package is installed, then:
 executables which are setuid.
 
 If the `chrpath` package is installed, then:

diff --git a/src/Makefile b/src/Makefile
index ccaca1c13ca8a71f8d57904885d11e6cb073c7fd..2a100bbddede0862ca3ec1597df5fb5d4f841aba 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -35,7 +35,7 @@ all: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
 
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS)
 
 

-# This pair for the convinience of of the Debian maintainers
+# This pair for the convenience of of the Debian maintainers

 exim: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) exim
 utils: Local/Makefile configure
 exim: Local/Makefile configure
        @cd build-$(buildname); $(MAKE) SHELL=$(SHELL) $(MFLAGS) exim
 utils: Local/Makefile configure

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index b9eaabaa6f79b8a09bc76b66f10359be7aee55a1..da5778d127b2c04a9a274708ba6e8906102b48fc 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -1,7 +1,7 @@
 # This file is the basis of the main makefile for Exim and friends. The
 # makefile at the top level arranges to build the main makefile by calling
 # scripts/Configure-Makefile from within the build directory. This
 # This file is the basis of the main makefile for Exim and friends. The
 # makefile at the top level arranges to build the main makefile by calling
 # scripts/Configure-Makefile from within the build directory. This

-# concatentates the configuration settings from Local/Makefile and other,
+# concatenates the configuration settings from Local/Makefile and other,

 # optional, Local/* files at the front of this file, to create Makefile in the
 # build directory.
 #
 # optional, Local/* files at the front of this file, to create Makefile in the
 # build directory.
 #


@@ -474,7 +474,7 @@ eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
 
 
 # Compile step for most of the exim modules. HDRS is a list of headers
 
 
 # Compile step for most of the exim modules. HDRS is a list of headers

-# which cause everthing to be rebuilt. PHDRS is the same, for the use
+# which cause everything to be rebuilt. PHDRS is the same, for the use

 # of routers, transports, and authenticators. I can't find a way of doing this
 # in one. This list is overkill, but it doesn't really take much time to
 # rebuild Exim on a modern computer.
 # of routers, transports, and authenticators. I can't find a way of doing this
 # in one. This list is overkill, but it doesn't really take much time to
 # rebuild Exim on a modern computer.

diff --git a/src/OS/Makefile-CYGWIN b/src/OS/Makefile-CYGWIN
index cda5d26cc84ec83d2b2a4567ffdccac27e72ceaf..006e9feff3e8826423791ee9007311d2ac5ce845 100644 (file)
--- a/src/OS/Makefile-CYGWIN
+++ b/src/OS/Makefile-CYGWIN
@@ -26,7 +26,7 @@ LIBS_EXIM +=../Local/exim_res.o
 
 
 ##################################################
 
 
 ##################################################

-# The following is normaly set in local/Makefile.
+# The following is normally set in local/Makefile.

 # Makefile.cygwin provides defaults with which the
 # precompiled version is built
 ##################################################
 # Makefile.cygwin provides defaults with which the
 # precompiled version is built
 ##################################################

diff --git a/src/OS/Makefile-Default b/src/OS/Makefile-Default
index a0d9afa956dc05cae74cd0751fdf0e40a68a4650..b3990fe84c09665361a00461b5ae88046e10c5a8 100644 (file)
--- a/src/OS/Makefile-Default
+++ b/src/OS/Makefile-Default
@@ -286,7 +286,7 @@ LOCAL_SCAN_SOURCE=src/local_scan.c
 
 #############################################################################
 # The following definitions are relevant only when compiling the Exim monitor
 
 #############################################################################
 # The following definitions are relevant only when compiling the Exim monitor

-# program, which requires an X11 display. See the varible EXIM_MONITOR in
+# program, which requires an X11 display. See the variable EXIM_MONITOR in

 # src/EDITME for how to suppress this compilation.
 
 # X11 contains the location of the X11 libraries and include files.
 # src/EDITME for how to suppress this compilation.
 
 # X11 contains the location of the X11 libraries and include files.

diff --git a/src/OS/Makefile-FreeBSD b/src/OS/Makefile-FreeBSD
index ebb116bf2af5b8d6c1960d1bdcc328700bb5380e..92d349d331f79d019992e6e150e57b154f4f6e7b 100644 (file)
--- a/src/OS/Makefile-FreeBSD
+++ b/src/OS/Makefile-FreeBSD
@@ -11,7 +11,7 @@ HAVE_SA_LEN=YES
 # crypt() is in a separate library
 LIBS=-lcrypt -lm -lutil
 
 # crypt() is in a separate library
 LIBS=-lcrypt -lm -lutil
 

-# Dynamicly loaded modules need to be built with -fPIC
+# Dynamically loaded modules need to be built with -fPIC

 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 
 # FreeBSD always ships with Berkeley DB
 CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
 
 # FreeBSD always ships with Berkeley DB

diff --git a/src/OS/os.c-cygwin b/src/OS/os.c-cygwin
index d7645fdbeb96ded443316e69dccb2650ac89c16a..c9464aae26013a6af0ba9c05a2a4976fff417a57 100644 (file)
--- a/src/OS/os.c-cygwin
+++ b/src/OS/os.c-cygwin
@@ -190,7 +190,7 @@ void cygwin_premain2(int argc, char ** argv, struct per_process * ptr)
        and to avoid exec that cause loss of privilege
      If not privileged and unable to chown,
        we set the exim uid to our uid.
        and to avoid exec that cause loss of privilege
      If not privileged and unable to chown,
        we set the exim uid to our uid.

-     If unprivileged and /var/spool/exim is writable and not runing as listening daemon, 
+     If unprivileged and /var/spool/exim is writable and not running as listening daemon, 

        we fake all subsequent setuid. */
 
   /* Get the system and admins uid from their sids */
        we fake all subsequent setuid. */
 
   /* Get the system and admins uid from their sids */

diff --git a/src/README.DSN b/src/README.DSN
index 68d16415cee4198d575f996a9e5629f2c92ac7b5..d700dd04234a8e8e5f9f317f0ccce58d759c8e6b 100644 (file)
--- a/src/README.DSN
+++ b/src/README.DSN
@@ -113,7 +113,7 @@ ChangeLog
 
                 *) dsn_process switch removed
                   *) every router "processes" DSN by default
 
                 *) dsn_process switch removed
                   *) every router "processes" DSN by default

-                  *) there is no possibilty to "gag" DSN anymore since this violates RFC
+                  *) there is no possibility to "gag" DSN anymore since this violates RFC

                 *) dsn_lasthop switch added for routers
                   *) if dsn_lasthop is set by a router it is handled as relaying to a
                      non DSN aware relay. success mails are sent if Exim successfully 
                 *) dsn_lasthop switch added for routers
                   *) if dsn_lasthop is set by a router it is handled as relaying to a
                      non DSN aware relay. success mails are sent if Exim successfully 

diff --git a/src/README.UPDATING b/src/README.UPDATING
index 7ed0ffc0a14d3b0f1899f255be106856ec02ecab..ef07d653395a3224cb69772a06e742edaf142bcd 100644 (file)
--- a/src/README.UPDATING
+++ b/src/README.UPDATING
@@ -551,7 +551,7 @@ Version 4.23
 3. Version 4.23 saves the contents of the ACL variables with the message, so
    that they can be used later. If one of these variables contains a newline,
    there will be a newline character in the spool that will not be interpreted
 3. Version 4.23 saves the contents of the ACL variables with the message, so
    that they can be used later. If one of these variables contains a newline,
    there will be a newline character in the spool that will not be interpreted

-   correctely by a previous version of Exim. (Exim ignores keyed spool file
+   correctly by a previous version of Exim. (Exim ignores keyed spool file

    items that it doesn't understand - precisely for this kind of problem - but
    it expects them all to be on one line.)
 
    items that it doesn't understand - precisely for this kind of problem - but
    it expects them all to be on one line.)
 

diff --git a/src/exim_monitor/em_StripChart.c b/src/exim_monitor/em_StripChart.c
index 2409c40c228dd59e360280631948869a417890c3..3b94c22319d5149899e4e440891766118291c70b 100644 (file)
--- a/src/exim_monitor/em_StripChart.c
+++ b/src/exim_monitor/em_StripChart.c
@@ -210,7 +210,7 @@ static void Destroy (gw)
 }
 
 /*
 }
 
 /*

- * NOTE: This function really needs to recieve graphics exposure
+ * NOTE: This function really needs to receive graphics exposure

  *       events, but since this is not easily supported until R4 I am
  *       going to hold off until then.
  */
  *       events, but since this is not easily supported until R4 I am
  *       going to hold off until then.
  */

diff --git a/src/exim_monitor/em_TextPop.c b/src/exim_monitor/em_TextPop.c
index 03f97da52c4abb713681b52ff1985d87e2bcb998..7e8a2eba14489b80501f511667600a02132d9b9e 100644 (file)
--- a/src/exim_monitor/em_TextPop.c
+++ b/src/exim_monitor/em_TextPop.c
@@ -47,7 +47,7 @@ SOFTWARE.
  * used by all more than one of these dialogs.
  *
  * The following functions are the only non-static ones defined
  * used by all more than one of these dialogs.
  *
  * The following functions are the only non-static ones defined

- * in this module.  They are located at the begining of the
+ * in this module.  They are located at the beginning of the

  * section that contains this dialog box that uses them.
  *
  * void _XawTextInsertFileAction(w, event, params, num_params);
  * section that contains this dialog box that uses them.
  *
  * void _XawTextInsertFileAction(w, event, params, num_params);


@@ -127,7 +127,7 @@ static char search_text_trans[] =
  *
  * Note:
  *
  *
  * Note:
  *

- * If the search was sucessful and the argument popdown is passed to
+ * If the search was successful and the argument popdown is passed to

  * this action routine then the widget will automatically popdown the
  * search widget.
  */
  * this action routine then the widget will automatically popdown the
  * search widget.
  */


@@ -171,7 +171,7 @@ Cardinal * num_params;
   PopdownSearch(w, (XtPointer) tw->text.search, NULL);
 }
 
   PopdownSearch(w, (XtPointer) tw->text.search, NULL);
 }
 

-/*     Function Name: PopdownSeach
+/*     Function Name: PopdownSearch

  *     Description: Pops down the search widget and resets it.
  *     Arguments: w - *** NOT USED ***.
  *                 closure - a pointer to the search structure.
  *     Description: Pops down the search widget and resets it.
  *     Arguments: w - *** NOT USED ***.
  *                 closure - a pointer to the search structure.


@@ -223,7 +223,7 @@ XtPointer call_data;
  * The parameter list contains one or two entries that may be the following.
  *
  * First Entry:   The first entry is the direction to search by default.
  * The parameter list contains one or two entries that may be the following.
  *
  * First Entry:   The first entry is the direction to search by default.

- *                This arguement must be specified and may have a value of
+ *                This argument must be specified and may have a value of

  *                "left" or "right".
  *
  * Second Entry:  This entry is optional and contains the value of the default
  *                "left" or "right".
  *
  * Second Entry:  This entry is optional and contains the value of the default


@@ -448,8 +448,8 @@ char * ptr;
 
 /*     Function Name: DoSearch
  *     Description: Performs a search.
 
 /*     Function Name: DoSearch
  *     Description: Performs a search.

- *     Arguments: search - the serach structure.
- *     Returns: TRUE if sucessful.
+ *     Arguments: search - the search structure.
+ *     Returns: TRUE if successful.

  */
 
 /* ARGSUSED */
  */
 
 /* ARGSUSED */


@@ -628,7 +628,7 @@ XEvent *event;
  *
  * NOTE:
  *
  *
  * NOTE:
  *

- * The function argument is passed the following arguements.
+ * The function argument is passed the following arguments.

  *
  * form - the from widget that is the dialog.
  * ptr - the initial string for the dialog's text widget.
  *
  * form - the from widget that is the dialog.
  * ptr - the initial string for the dialog's text widget.

diff --git a/src/exim_monitor/em_strip.c b/src/exim_monitor/em_strip.c
index f0ad3abbbca89715b0d516b874e85228221debcc..2a5f0b84e72969bab41d9dd0b4453e2c8034ac55 100644 (file)
--- a/src/exim_monitor/em_strip.c
+++ b/src/exim_monitor/em_strip.c
@@ -21,7 +21,7 @@ static int     size_first_time = 1;          /* and another */
 static int     stripchart_count = 0;         /* count stripcharts created */
 static int    *stripchart_delay;             /* vector of delay counts */
 static Widget *stripchart_label;             /* vector of label widgets */
 static int     stripchart_count = 0;         /* count stripcharts created */
 static int    *stripchart_delay;             /* vector of delay counts */
 static Widget *stripchart_label;             /* vector of label widgets */

-static int    *stripchart_last_total;        /* vector of prevous values */
+static int    *stripchart_last_total;        /* vector of previous values */

 static int    *stripchart_max;               /* vector of maxima */
 static int    *stripchart_middelay;          /* vector of */
 static int    *stripchart_midmax;            /* vector of */
 static int    *stripchart_max;               /* vector of maxima */
 static int    *stripchart_middelay;          /* vector of */
 static int    *stripchart_midmax;            /* vector of */

diff --git a/src/src/EDITME b/src/src/EDITME
index c8547cd4ab904e36481e6bf6bcd8f25900d62aec..15932691e383a9ce8ea7a6497979032a454cb6c3 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -597,7 +597,7 @@ FIXED_NEVER_USERS=root
 # That shim can set macros before .include'ing your main configuration file.
 #
 # As a strictly transient measure to ease migration to 4.73, the
 # That shim can set macros before .include'ing your main configuration file.
 #
 # As a strictly transient measure to ease migration to 4.73, the

-# WHITELIST_D_MACROS value definies a colon-separated list of macro-names
+# WHITELIST_D_MACROS value defines a colon-separated list of macro-names

 # 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.
 # 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.

diff --git a/src/src/acl.c b/src/src/acl.c
index 1ac2bee23452cf61c66aaae510408276a0b1c11a..64b310968cf93adc8f24b4ec291247d9aad405b3 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1201,7 +1201,7 @@ an odd configuration - why didn't the SRV record have a weight of 1 instead?)
 Arguments:
   dnsa       the DNS answer block
   dnss       a DNS scan block for us to use
 Arguments:
   dnsa       the DNS answer block
   dnss       a DNS scan block for us to use

-  reset      option specifing what portion to scan, as described above
+  reset      option specifying what portion to scan, as described above

   target     the target hostname to use for matching RR names
 
 Returns:     CSA_OK             successfully authorized
   target     the target hostname to use for matching RR names
 
 Returns:     CSA_OK             successfully authorized


@@ -2240,7 +2240,7 @@ while ((ss = string_nextinlist(&arg, &sep, big_buffer, big_buffer_size))
   else if (strcmpic(ss, US"per_byte") == 0)
     {
     /* If we have not yet received the message data and there was no SIZE
   else if (strcmpic(ss, US"per_byte") == 0)
     {
     /* If we have not yet received the message data and there was no SIZE

-    declaration on the MAIL comand, then it's safe to just use a value of
+    declaration on the MAIL command, then it's safe to just use a value of

     zero and let the recorded rate decay as if nothing happened. */
     RATE_SET(mode, PER_MAIL);
     if (where > ACL_WHERE_NOTSMTP) badacl = TRUE;
     zero and let the recorded rate decay as if nothing happened. */
     RATE_SET(mode, PER_MAIL);
     if (where > ACL_WHERE_NOTSMTP) badacl = TRUE;


@@ -2606,7 +2606,7 @@ else
   size of the event per the period size, ignoring the lack of events outside
   the current period and regardless of where the event falls in the period. So,
   if the interval was so long that the calculated rate is unhelpfully small, we
   size of the event per the period size, ignoring the lack of events outside
   the current period and regardless of where the event falls in the period. So,
   if the interval was so long that the calculated rate is unhelpfully small, we

-  re-intialize the rate. In the absence of higher-rate bursts, the condition
+  re-initialize the rate. In the absence of higher-rate bursts, the condition

   below is true if the interval is greater than the period. */
 
   if (dbd->rate < count) dbd->rate = count;
   below is true if the interval is greater than the period. */
 
   if (dbd->rate < count) dbd->rate = count;


@@ -3279,12 +3279,12 @@ for (; cb != NULL; cb = cb->next)
     #ifdef EXPERIMENTAL_DCC
     case ACLC_DCC:
       {
     #ifdef EXPERIMENTAL_DCC
     case ACLC_DCC:
       {

-      /* Seperate the regular expression and any optional parameters. */
+      /* Separate the regular expression and any optional parameters. */

       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
       /* Run the dcc backend. */
       rc = dcc_process(&ss);
       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
       /* Run the dcc backend. */
       rc = dcc_process(&ss);

-      /* Modify return code based upon the existance of options. */
+      /* Modify return code based upon the existence of options. */

       while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)
           rc = FAIL;   /* FAIL so that the message is passed to the next ACL */
       while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)))
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)
           rc = FAIL;   /* FAIL so that the message is passed to the next ACL */


@@ -3585,12 +3585,12 @@ for (; cb != NULL; cb = cb->next)
     #ifdef WITH_CONTENT_SCAN
     case ACLC_SPAM:
       {
     #ifdef WITH_CONTENT_SCAN
     case ACLC_SPAM:
       {

-      /* Seperate the regular expression and any optional parameters. */
+      /* Separate the regular expression and any optional parameters. */

       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
       /* Run the spam backend. */
       rc = spam(CUSS &ss);
       const uschar * list = arg;
       uschar *ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size);
       /* Run the spam backend. */
       rc = spam(CUSS &ss);

-      /* Modify return code based upon the existance of options. */
+      /* Modify return code based upon the existence of options. */

       while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
             != NULL) {
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)
       while ((ss = string_nextinlist(&list, &sep, big_buffer, big_buffer_size))
             != NULL) {
         if (strcmpic(ss, US"defer_ok") == 0 && rc == DEFER)


@@ -4147,7 +4147,7 @@ HDEBUG(D_acl) debug_printf("end of %s: implicit DENY\n", acl_name);
 return FAIL;
 
 badquit:
 return FAIL;
 
 badquit:

-  *log_msgptr = string_sprintf("QUIT or not-QUIT teplevel ACL may not fail "
+  *log_msgptr = string_sprintf("QUIT or not-QUIT toplevel ACL may not fail "

     "('%s' verb used incorrectly)", verbs[acl->verb]);
   return ERROR;
 }
     "('%s' verb used incorrectly)", verbs[acl->verb]);
   return ERROR;
 }

diff --git a/src/src/auths/cram_md5.c b/src/src/auths/cram_md5.c
index 3be00082df2d27861898835bcdeb2eb3d9fdf8da..1ae38a9a63b9301e6a8fb84072b8239dc1d81503 100644 (file)
--- a/src/src/auths/cram_md5.c
+++ b/src/src/auths/cram_md5.c
@@ -38,7 +38,7 @@ address can appear in the tables drtables.c. */
 int auth_cram_md5_options_count =
   sizeof(auth_cram_md5_options)/sizeof(optionlist);
 
 int auth_cram_md5_options_count =
   sizeof(auth_cram_md5_options)/sizeof(optionlist);
 

-/* Default private options block for the contidion authentication method. */
+/* Default private options block for the condition authentication method. */

 
 auth_cram_md5_options_block auth_cram_md5_option_defaults = {
   NULL,             /* server_secret */
 
 auth_cram_md5_options_block auth_cram_md5_option_defaults = {
   NULL,             /* server_secret */


@@ -73,7 +73,7 @@ if (ob->client_secret != NULL)
 
 
 /*************************************************
 
 
 /*************************************************

-*      Peform the CRAM-MD5 algorithm             *
+*      Perform the CRAM-MD5 algorithm            *

 *************************************************/
 
 /* The CRAM-MD5 algorithm is described in RFC 2195. It computes
 *************************************************/
 
 /* The CRAM-MD5 algorithm is described in RFC 2195. It computes


@@ -261,7 +261,7 @@ int i;
 uschar digest[16];
 
 /* If expansion of either the secret or the user name failed, return CANCELLED
 uschar digest[16];
 
 /* If expansion of either the secret or the user name failed, return CANCELLED

-or ERROR, as approriate. */
+or ERROR, as appropriate. */

 
 if (!secret || !name)
   {
 
 if (!secret || !name)
   {

diff --git a/src/src/auths/gsasl_exim.c b/src/src/auths/gsasl_exim.c
index 87be9b5e1d8c4422c628eff4b77af3b88be9e830..77db2e7757563173210a72bcb6573f950f870867 100644 (file)
--- a/src/src/auths/gsasl_exim.c
+++ b/src/src/auths/gsasl_exim.c
@@ -275,7 +275,7 @@ auth_gsasl_server(auth_instance *ablock, uschar *initial_data)
     /* Some auth mechanisms can ensure that both sides are talking withing the
     same security context; for TLS, this means that even if a bad certificate
     has been accepted, they remain MitM-proof because both sides must be within
     /* Some auth mechanisms can ensure that both sides are talking withing the
     same security context; for TLS, this means that even if a bad certificate
     has been accepted, they remain MitM-proof because both sides must be within

-    the same negotiated session; if someone is terminating one sesson and
+    the same negotiated session; if someone is terminating one session and

     proxying data on within a second, authentication will fail.
 
     We might not have this available, depending upon TLS implementation,
     proxying data on within a second, authentication will fail.
 
     We might not have this available, depending upon TLS implementation,

diff --git a/src/src/auths/plaintext.c b/src/src/auths/plaintext.c
index aec079e6715632c95e7b70ea2444993af9132401..161aab6c05cbdb7b3ca70c580d7e9ed85a71370f 100644 (file)
--- a/src/src/auths/plaintext.c
+++ b/src/src/auths/plaintext.c
@@ -221,7 +221,7 @@ while ((s = string_nextinlist(&text, &sep, big_buffer, big_buffer_size)) != NULL
     }
 
   /* The first string is attached to the AUTH command; others are sent
     }
 
   /* The first string is attached to the AUTH command; others are sent

-  unembelished. */
+  unembellished. */

 
   if (first)
     {
 
   if (first)
     {

diff --git a/src/src/auths/spa.c b/src/src/auths/spa.c
index 0bf7b042894dbee9da6ebf20452669017f40c2bf..4d435a411cd03338269bf87ea4e0d46614bf407f 100644 (file)
--- a/src/src/auths/spa.c
+++ b/src/src/auths/spa.c
@@ -61,7 +61,7 @@ address can appear in the tables drtables.c. */
 int auth_spa_options_count =
   sizeof(auth_spa_options)/sizeof(optionlist);
 
 int auth_spa_options_count =
   sizeof(auth_spa_options)/sizeof(optionlist);
 

-/* Default private options block for the contidion authentication method. */
+/* Default private options block for the condition authentication method. */

 
 auth_spa_options_block auth_spa_option_defaults = {
   NULL,              /* spa_password */
 
 auth_spa_options_block auth_spa_option_defaults = {
   NULL,              /* spa_password */

diff --git a/src/src/child.c b/src/src/child.c
index 7f5b909299dd792dd723ef76141865130e773b6d..de12c44b58aa7afc522415e480883c27bfc026ae 100644 (file)
--- a/src/src/child.c
+++ b/src/src/child.c
@@ -222,7 +222,7 @@ pid = fork();
 
 /* Child process: make the reading end of the pipe into the standard input and
 close the writing end. If debugging, pass debug_fd as stderr. Then re-exec
 
 /* Child process: make the reading end of the pipe into the standard input and
 close the writing end. If debugging, pass debug_fd as stderr. Then re-exec

-Exim with appropriat options. In the test harness, use -odi unless queue_only
+Exim with appropriate options. In the test harness, use -odi unless queue_only

 is set, so that the bounce is fully delivered before returning. Failure is
 signalled with EX_EXECFAILED (specified by CEE_EXEC_EXIT), but this shouldn't
 occur. */
 is set, so that the bounce is fully delivered before returning. Failure is
 signalled with EX_EXECFAILED (specified by CEE_EXEC_EXIT), but this shouldn't
 occur. */

diff --git a/src/src/configure.default b/src/src/configure.default
index 985f1d0d834d1bd1e71d5d0fd3aacba40c66de52..a294dc3e603f652743fc8bd5bdfd70515071b4ff 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -334,7 +334,7 @@ timeout_frozen_after = 7d
 # libraries that Exim uses (e.g. LDAP) depend on specific environment settings.
 # There are two lists: keep_environment for the variables we trust, and
 # add_environment for variables we want to set to a specific value.
 # libraries that Exim uses (e.g. LDAP) depend on specific environment settings.
 # There are two lists: keep_environment for the variables we trust, and
 # add_environment for variables we want to set to a specific value.

-# Note that TZ is handled separateley by the timezone runtime option
+# Note that TZ is handled separately by the timezone runtime option

 # and TIMEZONE_DEFAULT buildtime option.
 
 # keep_environment = ^LDAP
 # and TIMEZONE_DEFAULT buildtime option.
 
 # keep_environment = ^LDAP

diff --git a/src/src/daemon.c b/src/src/daemon.c
index 34786837a67e1d0117e176e5a2bca4aa65bedd62..d799ea4e85a0b54ba008495af8c398878bf34fc9 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -19,7 +19,7 @@ typedef struct smtp_slot {
 } smtp_slot;
 
 /* An empty slot for initializing (Standard C does not allow constructor
 } smtp_slot;
 
 /* An empty slot for initializing (Standard C does not allow constructor

-expressions in assigments except as initializers in declarations). */
+expressions in assignments except as initializers in declarations). */

 
 static smtp_slot empty_smtp_slot = { 0, NULL };
 
 
 static smtp_slot empty_smtp_slot = { 0, NULL };
 


@@ -1117,7 +1117,7 @@ if (daemon_listen && !inetd_wait_mode)
     }
 
   /* Create a list of default SMTP ports, to be used if local_interfaces
     }
 
   /* Create a list of default SMTP ports, to be used if local_interfaces

-  contains entries without explict ports. First count the number of ports, then
+  contains entries without explicit ports. First count the number of ports, then

   build a translated list in a vector. */
 
   list = daemon_smtp_port;
   build a translated list in a vector. */
 
   list = daemon_smtp_port;

diff --git a/src/src/dane-openssl.c b/src/src/dane-openssl.c
index 62778d18f5924c053aa2a1d1ac59e267a00a5945..aa4760b94f55849152cedd2328d1cf5f98f2f4be 100644 (file)
--- a/src/src/dane-openssl.c
+++ b/src/src/dane-openssl.c
@@ -529,7 +529,7 @@ if (dane->depth < 0)
 
 /*
  * If the TA certificate is self-issued, or need not be, use it directly.
 
 /*
  * If the TA certificate is self-issued, or need not be, use it directly.

- * Otherwise, synthesize requisuite ancestors.
+ * Otherwise, synthesize requisite ancestors.

  */
 if (  !wrap_to_root
    || X509_check_issued(tacert, tacert) == X509_V_OK)
  */
 if (  !wrap_to_root
    || X509_check_issued(tacert, tacert) == X509_V_OK)

diff --git a/src/src/dane.c b/src/src/dane.c
index 99ca7d02a6e7b4c4cbc73de8d4806edb5b2b4cfc..137c7541831a4cedf3d74a2c85755548881405a5 100644 (file)
--- a/src/src/dane.c
+++ b/src/src/dane.c
@@ -35,7 +35,7 @@ static void dummy(int x) { dummy(x-1); }
 
 /* DNSSEC support is also required */
 # ifndef RES_USE_DNSSEC
 
 /* DNSSEC support is also required */
 # ifndef RES_USE_DNSSEC

-#  error DANE support requires that the DNS reolver library supports DNSSEC
+#  error DANE support requires that the DNS resolver library supports DNSSEC

 # endif
 
 # ifdef USE_GNUTLS
 # endif
 
 # ifdef USE_GNUTLS

diff --git a/src/src/dbstuff.h b/src/src/dbstuff.h
index 93c715ac2f27f33568870f57875777c43500c600..576941b61276c2e1a91620b5d3b19e9166734bf9 100644 (file)
--- a/src/src/dbstuff.h
+++ b/src/src/dbstuff.h
@@ -582,7 +582,7 @@ done.
 Originally, there was only one structure, used for both types. However, it got
 expanded for domain records, so it got split. To make it possible for Exim to
 handle the old type of record, we retain the old definition. The different
 Originally, there was only one structure, used for both types. However, it got
 expanded for domain records, so it got split. To make it possible for Exim to
 handle the old type of record, we retain the old definition. The different

-kinds of record can be distinguised by their different lengths. */
+kinds of record can be distinguished by their different lengths. */

 
 typedef struct {
   time_t time_stamp;
 
 typedef struct {
   time_t time_stamp;

diff --git a/src/src/dcc.c b/src/src/dcc.c
index 1841e733d161cd54303fea462ea9b7932a5801f7..fcdc5a89725143587756b30aba5a3a400ea2d255 100644 (file)
--- a/src/src/dcc.c
+++ b/src/src/dcc.c
@@ -297,7 +297,7 @@ dcc_process(uschar **listptr)
     }
   }
 
     }
   }
 

-  /* a blank line seperates header from body */
+  /* a blank line separates header from body */

   Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1);
   flushbuffer(sockfd, sendbuf);
   DEBUG(D_acl)
   Ustrncat(sendbuf, "\n", sizeof(sendbuf)-Ustrlen(sendbuf)-1);
   flushbuffer(sockfd, sendbuf);
   DEBUG(D_acl)

diff --git a/src/src/debug.c b/src/src/debug.c
index 8bf4aedd9e2c7b79fb99b83af7c5827460cdc92a..cc60b44a6378e620bb9350177c32787b75ea2735 100644 (file)
--- a/src/src/debug.c
+++ b/src/src/debug.c
@@ -30,7 +30,7 @@ static uschar tree_printline[tree_printlinesize];
 
 Arguments:
   p          tree node
 
 Arguments:
   p          tree node

-  pos        amount of indenting & vertical bars to pring
+  pos        amount of indenting & vertical bars to print

   barswitch  if TRUE print | at the pos value
 
 Returns:     nothing
   barswitch  if TRUE print | at the pos value
 
 Returns:     nothing

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 9fe74df7c858f4a547baa92eed70e6eea4c28171..85208457fc6e5edb2a05c9e9a512e6c064a61782 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -944,7 +944,7 @@ for (topaddr = addr; topaddr->parent; topaddr = topaddr->parent) ;
 /* We start with just the local part for pipe, file, and reply deliveries, and
 for successful local deliveries from routers that have the log_as_local flag
 set. File deliveries from filters can be specified as non-absolute paths in
 /* We start with just the local part for pipe, file, and reply deliveries, and
 for successful local deliveries from routers that have the log_as_local flag
 set. File deliveries from filters can be specified as non-absolute paths in

-cases where the transport is goin to complete the path. If there is an error
+cases where the transport is going to complete the path. If there is an error

 before this happens (expansion failure) the local part will not be updated, and
 so won't necessarily look like a path. Add extra text for this case. */
 
 before this happens (expansion failure) the local part will not be updated, and
 so won't necessarily look like a path. Add extra text for this case. */
 


@@ -3542,7 +3542,7 @@ while (!done)
       {
 #ifdef SUPPORT_SOCKS
       case '2':        /* proxy information; must arrive before A0 and applies to that addr XXX oops*/
       {
 #ifdef SUPPORT_SOCKS
       case '2':        /* proxy information; must arrive before A0 and applies to that addr XXX oops*/

-       proxy_session = TRUE;   /*XXX shouod this be cleared somewhere? */
+       proxy_session = TRUE;   /*XXX should this be cleared somewhere? */

        if (*ptr == 0)
          ptr++;
        else
        if (*ptr == 0)
          ptr++;
        else


@@ -4569,7 +4569,7 @@ for (delivery_count = 0; addr_remote; delivery_count++)
     }
 
   /* Now fork a subprocess to do the remote delivery, but before doing so,
     }
 
   /* Now fork a subprocess to do the remote delivery, but before doing so,

-  ensure that any cached resourses are released so as not to interfere with
+  ensure that any cached resources are released so as not to interfere with

   what happens in the subprocess. */
 
   search_tidyup();
   what happens in the subprocess. */
 
   search_tidyup();


@@ -7347,7 +7347,7 @@ while (addr_failed)
   /* Otherwise, handle the sending of a message. Find the error address for
   the first address, then send a message that includes all failed addresses
   that have the same error address. Note the bounce_recipient is a global so
   /* Otherwise, handle the sending of a message. Find the error address for
   the first address, then send a message that includes all failed addresses
   that have the same error address. Note the bounce_recipient is a global so

-  that it can be accesssed by $bounce_recipient while creating a customized
+  that it can be accessed by $bounce_recipient while creating a customized

   error message. */
 
   else
   error message. */
 
   else


@@ -8301,7 +8301,7 @@ if (remove_journal)
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s: %s", fname,
       strerror(errno));
 
     log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s: %s", fname,
       strerror(errno));
 

-  /* Move the message off the spool if reqested */
+  /* Move the message off the spool if requested */

 
 #ifdef SUPPORT_MOVE_FROZEN_MESSAGES
   if (deliver_freeze && move_frozen_messages)
 
 #ifdef SUPPORT_MOVE_FROZEN_MESSAGES
   if (deliver_freeze && move_frozen_messages)

diff --git a/src/src/dkim.c b/src/src/dkim.c
index a2574c15b7e9b59e80a72b723642ff0ef35208d3..cc103c2898a61fe8a7c327b6844e39b85572ff66 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -129,7 +129,7 @@ dkim_signatures = NULL;
 
 /* If we have arrived here with dkim_collect_input == FALSE, it
 means there was a processing error somewhere along the way.
 
 /* If we have arrived here with dkim_collect_input == FALSE, it
 means there was a processing error somewhere along the way.

-Log the incident and disable futher verification. */
+Log the incident and disable further verification. */

 
 if (!dkim_collect_input)
   {
 
 if (!dkim_collect_input)
   {

diff --git a/src/src/dns.c b/src/src/dns.c
index fc0ffb2baa59e2b1e09582b2c24943da5cd0d82a..bc9d895025fd5788dcccbb267f6425a34dd8810b 100644 (file)
--- a/src/src/dns.c
+++ b/src/src/dns.c
@@ -326,7 +326,7 @@ The result is in static storage which must be copied if it is to be preserved.
 Arguments:
   dnsa      pointer to dns answer block
   dnss      pointer to dns scan block
 Arguments:
   dnsa      pointer to dns answer block
   dnss      pointer to dns scan block

-  reset     option specifing what portion to scan, as described above
+  reset     option specifying what portion to scan, as described above

 
 Returns:    next dns record, or NULL when no more
 */
 
 Returns:    next dns record, or NULL when no more
 */


@@ -451,9 +451,9 @@ null_return:
 
 
 /* Extract the AUTHORITY information from the answer. If the answer isn't
 
 
 /* Extract the AUTHORITY information from the answer. If the answer isn't

-authoritive (AA not set), we do not extract anything.
+authoritative (AA not set), we do not extract anything.

 
 

-The AUTHORITIVE section contains NS records if the name in question was found,
+The AUTHORITY section contains NS records if the name in question was found,

 it contains a SOA record otherwise. (This is just from experience and some
 tests, is there some spec?)
 
 it contains a SOA record otherwise. (This is just from experience and some
 tests, is there some spec?)
 


@@ -486,7 +486,7 @@ return NULL;
 
 /* We do not perform DNSSEC work ourselves; if the administrator has installed
 a verifying resolver which sets AD as appropriate, though, we'll use that.
 
 /* We do not perform DNSSEC work ourselves; if the administrator has installed
 a verifying resolver which sets AD as appropriate, though, we'll use that.

-(AD = Authentic Data, AA = Authoritive Answer)
+(AD = Authentic Data, AA = Authoritative Answer)

 
 Argument:   pointer to dns answer block
 Returns:    bool indicating presence of AD bit
 
 Argument:   pointer to dns answer block
 Returns:    bool indicating presence of AD bit


@@ -506,7 +506,7 @@ const uschar * trusted;
 
 if (h->ad) return TRUE;
 
 
 if (h->ad) return TRUE;
 

-/* If the resolver we ask is authoritive for the domain in question, it
+/* If the resolver we ask is authoritative for the domain in question, it

 * may not set the AD but the AA bit. If we explicitly trust
 * the resolver for that domain (via a domainlist in dns_trust_aa),
 * we return TRUE to indicate a secure answer.
 * may not set the AD but the AA bit. If we explicitly trust
 * the resolver for that domain (via a domainlist in dns_trust_aa),
 * we return TRUE to indicate a secure answer.


@@ -542,7 +542,7 @@ h->aa = h->ad = 0;
 /************************************************
  *     Check whether the AA bit is set         *
  *     We need this to warn if we requested AD *
 /************************************************
  *     Check whether the AA bit is set         *
  *     We need this to warn if we requested AD *

- *     from an authoritive server              *
+ *     from an authoritative server            *

  ************************************************/
 
 BOOL
  ************************************************/
 
 BOOL


@@ -626,7 +626,7 @@ return rc;
 
 /* Call the resolver to look up the given domain name, using the given type,
 and check the result. The error code TRY_AGAIN is documented as meaning "non-
 
 /* Call the resolver to look up the given domain name, using the given type,
 and check the result. The error code TRY_AGAIN is documented as meaning "non-

-Authoritive Host not found, or SERVERFAIL". Sometimes there are badly set
+Authoritative Host not found, or SERVERFAIL". Sometimes there are badly set

 up nameservers that produce this error continually, so there is the option of
 providing a list of domains for which this is treated as a non-existent
 host.
 up nameservers that produce this error continually, so there is the option of
 providing a list of domains for which this is treated as a non-existent
 host.


@@ -694,7 +694,7 @@ if ((previous = tree_search(tree_dns_fails, node_name)))
   }
 #endif
 
   }
 #endif
 

-/* If configured, check the hygene of the name passed to lookup. Otherwise,
+/* If configured, check the hygiene of the name passed to lookup. Otherwise,

 although DNS lookups may give REFUSED at the lower level, some resolvers
 turn this into TRY_AGAIN, which is silly. Give a NOMATCH return, since such
 domains cannot be in the DNS. The check is now done by a regular expression;
 although DNS lookups may give REFUSED at the lower level, some resolvers
 turn this into TRY_AGAIN, which is silly. Give a NOMATCH return, since such
 domains cannot be in the DNS. The check is now done by a regular expression;

diff --git a/src/src/drtables.c b/src/src/drtables.c
index a3fa328b909d430bd65af8d088337b126abec628..3e1c5e626be352617a4e1f0885cca4fc36db2adb 100644 (file)
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -21,7 +21,7 @@ int lookup_list_count = 0;
 
 static int lookup_list_init_done = 0;
 
 
 static int lookup_list_init_done = 0;
 

-/* Table of information about all possible authentication mechamisms. All
+/* Table of information about all possible authentication mechanisms. All

 entries are always present if any mechanism is declared, but the functions are
 set to NULL for those that are not compiled into the binary. */
 
 entries are always present if any mechanism is declared, but the functions are
 set to NULL for those that are not compiled into the binary. */
 

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index bb994d7697f35ead2e493a354677eba7aeb24c37..05193971dac66babbe350d3397da8d5bf1adf259 100644 (file)
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -174,7 +174,7 @@ sub detect_compressor_capable
     {
     if ($filename =~ /\.(?:$ext)$/)
       {
     {
     if ($filename =~ /\.(?:$ext)$/)
       {

-      # Just die if compressor not found; if this occurrs in the middle of
+      # Just die if compressor not found; if this occurs in the middle of

       # two valid files with a lot of matches, error could easily be missed.
       die("Didn't find $ext decompressor for $filename\n")
         if ($compressors->{$ext}->{bin} eq '');
       # two valid files with a lot of matches, error could easily be missed.
       die("Didn't find $ext decompressor for $filename\n")
         if ($compressors->{$ext}->{bin} eq '');

diff --git a/src/src/exim.c b/src/src/exim.c
index e63997030346acf0773ebf11282eba86c49d3500..5e11559adb042ff9c1da0365e291ffad89c5b9e1 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -365,7 +365,7 @@ return 0;
 /* Exim uses a time + a pid to generate a unique identifier in two places: its
 message IDs, and in file names for maildir deliveries. Because some OS now
 re-use pids within the same second, sub-second times are now being used.
 /* Exim uses a time + a pid to generate a unique identifier in two places: its
 message IDs, and in file names for maildir deliveries. Because some OS now
 re-use pids within the same second, sub-second times are now being used.

-However, for absolute certaintly, we must ensure the clock has ticked before
+However, for absolute certainty, we must ensure the clock has ticked before

 allowing the relevant process to complete. At the time of implementation of
 this code (February 2003), the speed of processors is such that the clock will
 invariably have ticked already by the time a process has done its job. This
 allowing the relevant process to complete. At the time of implementation of
 this code (February 2003), the speed of processors is such that the clock will
 invariably have ticked already by the time a process has done its job. This


@@ -1331,7 +1331,7 @@ static void
 exim_usage(uschar *progname)
 {
 
 exim_usage(uschar *progname)
 {
 

-/* Handle specific program invocation varients */
+/* Handle specific program invocation variants */

 if (Ustrcmp(progname, US"-mailq") == 0)
   {
   fprintf(stderr,
 if (Ustrcmp(progname, US"-mailq") == 0)
   {
   fprintf(stderr,


@@ -1900,7 +1900,7 @@ for (i = 1; i < argc; i++)
     break;
     }
 
     break;
     }
 

-  /* An option consistion of -- terminates the options */
+  /* An option consisting of -- terminates the options */

 
   if (Ustrcmp(arg, "--") == 0)
     {
 
   if (Ustrcmp(arg, "--") == 0)
     {


@@ -5087,7 +5087,7 @@ if (host_checking)
       verify_get_ident(1413);
     }
 
       verify_get_ident(1413);
     }
 

-  /* In case the given address is a non-canonical IPv6 address, canonicize
+  /* In case the given address is a non-canonical IPv6 address, canonicalize

   it. The code works for both IPv4 and IPv6, as it happens. */
 
   size = host_aton(sender_host_address, x);
   it. The code works for both IPv4 and IPv6, as it happens. */
 
   size = host_aton(sender_host_address, x);


@@ -5336,7 +5336,7 @@ February 2003: That's *still* not the end of the story. There are now versions
 of Linux (where SIG_IGN does work) that are picky. If, having set SIG_IGN, a
 process then calls waitpid(), a grumble is written to the system log, because
 this is logically inconsistent. In other words, it doesn't like the paranoia.
 of Linux (where SIG_IGN does work) that are picky. If, having set SIG_IGN, a
 process then calls waitpid(), a grumble is written to the system log, because
 this is logically inconsistent. In other words, it doesn't like the paranoia.

-As a consequenc of this, the waitpid() below is now excluded if we are sure
+As a consequence of this, the waitpid() below is now excluded if we are sure

 that SIG_IGN works. */
 
 if (!synchronous_delivery)
 that SIG_IGN works. */
 
 if (!synchronous_delivery)


@@ -5556,7 +5556,7 @@ while (more)
 
     if (!receive_timeout)
       {
 
     if (!receive_timeout)
       {

-      struct timeval t = { 30*60, 0 }; /* 30 minutess */
+      struct timeval t = { 30*60, 0 }; /* 30 minutes */

       fd_set r;
 
       FD_ZERO(&r); FD_SET(0, &r);
       fd_set r;
 
       FD_ZERO(&r); FD_SET(0, &r);

diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index e6485fffc49aae49db1cb843e922c6bc9fa0702f..7f220a20102b80028f4141720ed4d6d3e13b1479 100644 (file)
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -73,7 +73,7 @@
 # 2001-10-21  Removed -domain flag and added -bydomain, -byhost, and -byemail.
 #             We now generate our main parsing subroutine as an eval statement
 #             which improves performance dramatically when not all the results
 # 2001-10-21  Removed -domain flag and added -bydomain, -byhost, and -byemail.
 #             We now generate our main parsing subroutine as an eval statement
 #             which improves performance dramatically when not all the results

-#             are required. We also cache the last timestamp to time convertion.
+#             are required. We also cache the last timestamp to time conversion.

 #
 #             NOTE: 'Top 50 destinations by (message count|volume)' lines are
 #             now 'Top N (host|email|domain) destinations by (message count|volume)'
 #
 #             NOTE: 'Top 50 destinations by (message count|volume)' lines are
 #             now 'Top N (host|email|domain) destinations by (message count|volume)'


@@ -142,7 +142,7 @@
 #             in HTML output. Also added code to convert them back with -merge.
 #             Fixed timestamp offsets to convert to seconds rather than minutes.
 #             Updated -merge to work with output files using timezones.
 #             in HTML output. Also added code to convert them back with -merge.
 #             Fixed timestamp offsets to convert to seconds rather than minutes.
 #             Updated -merge to work with output files using timezones.

-#             Added cacheing to speed up the calculation of timezone offsets.
+#             Added caching to speed up the calculation of timezone offsets.

 #
 # 2003-02-07  V1.25 Steve Campbell
 #             Optimised the usage of mktime() in the seconds subroutine.
 #
 # 2003-02-07  V1.25 Steve Campbell
 #             Optimised the usage of mktime() in the seconds subroutine.


@@ -162,7 +162,7 @@
 #             Bernard Massot.
 #
 # 2003-06-03  V1.28 John Newman
 #             Bernard Massot.
 #
 # 2003-06-03  V1.28 John Newman

-#             Added in the ability to skip over the parsing and evaulation of
+#             Added in the ability to skip over the parsing and evaluation of

 #             specific transports as passed to eximstats via the new "-nt/.../"
 #             command line argument.  This new switch allows the viewing of
 #             not more accurate statistics but more applicable statistics when
 #             specific transports as passed to eximstats via the new "-nt/.../"
 #             command line argument.  This new switch allows the viewing of
 #             not more accurate statistics but more applicable statistics when


@@ -200,7 +200,7 @@
 #             Added -xls and the ability to specify output files.
 #
 # 2005-04-29  V1.38 Steve Campbell
 #             Added -xls and the ability to specify output files.
 #
 # 2005-04-29  V1.38 Steve Campbell

-#             Use FileHandles for outputing results.
+#             Use FileHandles for outputting results.

 #             Allow any combination of xls, txt, and html output.
 #             Fixed display of large numbers with -nvr option
 #             Fixed merging of reports with empty tables.
 #             Allow any combination of xls, txt, and html output.
 #             Fixed display of large numbers with -nvr option
 #             Fixed merging of reports with empty tables.


@@ -598,9 +598,9 @@ $WEEK   =  7 * $DAY;
 use vars qw($total_received_data  $total_received_data_gigs  $total_received_count);
 use vars qw($total_delivered_data $total_delivered_data_gigs $total_delivered_messages $total_delivered_addresses);
 use vars qw(%timestamp2time);                   #Hash of timestamp => time.
 use vars qw($total_received_data  $total_received_data_gigs  $total_received_count);
 use vars qw($total_delivered_data $total_delivered_data_gigs $total_delivered_messages $total_delivered_addresses);
 use vars qw(%timestamp2time);                   #Hash of timestamp => time.

-use vars qw($last_timestamp $last_time);        #The last time convertion done.
-use vars qw($last_date $date_seconds);          #The last date convertion done.
-use vars qw($last_offset $offset_seconds);      #The last time offset convertion done.
+use vars qw($last_timestamp $last_time);        #The last time conversion done.
+use vars qw($last_date $date_seconds);          #The last date conversion done.
+use vars qw($last_offset $offset_seconds);      #The last time offset conversion done.

 use vars qw($localtime_offset);
 use vars qw($i);                                #General loop counter.
 use vars qw($debug);                            #Debug mode?
 use vars qw($localtime_offset);
 use vars qw($i);                                #General loop counter.
 use vars qw($debug);                            #Debug mode?


@@ -614,7 +614,7 @@ use vars qw(%ham_count_by_ip %spam_count_by_ip);
 use vars qw(%rejected_count_by_ip %rejected_count_by_reason);
 use vars qw(%temporarily_rejected_count_by_ip %temporarily_rejected_count_by_reason);
 
 use vars qw(%rejected_count_by_ip %rejected_count_by_reason);
 use vars qw(%temporarily_rejected_count_by_ip %temporarily_rejected_count_by_reason);
 

-#For use in Speadsheed::WriteExcel
+#For use in Spreadsheet::WriteExcel

 use vars qw($workbook $ws_global $ws_relayed $ws_errors);
 use vars qw($row $col $row_hist $col_hist);
 use vars qw($run_hist);
 use vars qw($workbook $ws_global $ws_relayed $ws_errors);
 use vars qw($row $col $row_hist $col_hist);
 use vars qw($run_hist);


@@ -758,7 +758,7 @@ sub volume_rounded {
   else {
     # We don't want any rounding to be done.
     # and we don't need broken formatted output which on one hand avoids numbers from
   else {
     # We don't want any rounding to be done.
     # 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
+    # being interpreted as string by Spreadsheet 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
     #$rounded = sprintf("%d", ($g * $gig) + $x);
     # breaks if more than 4 digits! -> flexible length instead of fixed length
     # Format the return value at the output routine! -fh
     #$rounded = sprintf("%d", ($g * $gig) + $x);


@@ -928,7 +928,7 @@ sub seconds {
   }
   my $time = $date_seconds + ($5 * 3600) + ($6 * 60) + $7;
 
   }
   my $time = $date_seconds + ($5 * 3600) + ($6 * 60) + $7;
 

-  # SC. Use cacheing. Also note we want seconds not minutes.
+  # SC. Use caching. Also note we want seconds not minutes.

   #my($this_offset) = ($10 * 60 + $11) * ($9 . "1") if defined $8;
   if (defined $8 && ($8 ne $last_offset)) {
     $last_offset = $8;
   #my($this_offset) = ($10 * 60 + $11) * ($9 . "1") if defined $8;
   if (defined $8 && ($8 ne $last_offset)) {
     $last_offset = $8;


@@ -1650,7 +1650,7 @@ sub top_n_sort {
 
     # Create a dummy hash entry for the key if required.
     # Note that setting the dummy_hash value sets it for both href2 &
 
     # Create a dummy hash entry for the key if required.
     # Note that setting the dummy_hash value sets it for both href2 &

-    # href3. Also note that currently we are guarenteed to have a real
+    # href3. Also note that currently we are guaranteed to have a real

     # value for href3 if a real value for href2 exists so don't need to
     # test for it as well.
     $dummy_hash{$key} = 0 unless exists $href2->{$key};
     # value for href3 if a real value for href2 exists so don't need to
     # test for it as well.
     $dummy_hash{$key} = 0 unless exists $href2->{$key};


@@ -2729,7 +2729,7 @@ sub print_grandtotals {
       if ($messages > 0) {
         @content = ($total_aref->[0], '', $messages, '');
 
       if ($messages > 0) {
         @content = ($total_aref->[0], '', $messages, '');
 

-        #Count the number of distict IPs for the Hosts column.
+        #Count the number of distinct IPs for the Hosts column.

         push(@content,scalar(keys %{$total_aref->[1]})) if $do_sender{Host};
 
         #These rows do not have entries for the following columns (if specified)
         push(@content,scalar(keys %{$total_aref->[1]})) if $do_sender{Host};
 
         #These rows do not have entries for the following columns (if specified)


@@ -3676,7 +3676,7 @@ sub update_relayed {
 #
 #  add_to_totals(\%totals,\@keys,$values);
 #
 #
 #  add_to_totals(\%totals,\@keys,$values);
 #

-# Given a line of space seperated values, add them into the provided hash using @keys
+# Given a line of space separated values, add them into the provided hash using @keys

 # as the hash keys.
 #
 # If the value contains a '%', then the value is set rather than added. Otherwise, we
 # as the hash keys.
 #
 # If the value contains a '%', then the value is set rather than added. Otherwise, we


@@ -3706,7 +3706,7 @@ sub add_to_totals {
 #
 #  line_to_hash(\%hash,\@keys,$line);
 #
 #
 #  line_to_hash(\%hash,\@keys,$line);
 #

-# Given a line of space seperated values, set them into the provided hash
+# Given a line of space separated values, set them into the provided hash

 # using @keys as the hash keys.
 #######################################################################
 sub line_to_hash {
 # using @keys as the hash keys.
 #######################################################################
 sub line_to_hash {


@@ -3772,7 +3772,7 @@ sub html2txt {
 # until we've got all of the argument.
 #
 # This isn't perfect as all white space gets reduced to one space,
 # until we've got all of the argument.
 #
 # This isn't perfect as all white space gets reduced to one space,

-# but it's as good as we can get! If it's esential that spacing
+# but it's as good as we can get! If it's essential that spacing

 # be preserved precisely, then you get that by not using shell
 # variables.
 #######################################################################
 # be preserved precisely, then you get that by not using shell
 # variables.
 #######################################################################


@@ -3814,7 +3814,7 @@ sub set_worksheet_line {
 #######################################################################
 # @rcpt_times = parse_time_list($string);
 #
 #######################################################################
 # @rcpt_times = parse_time_list($string);
 #

-# Parse a comma seperated list of time values in seconds given by
+# Parse a comma separated list of time values in seconds given by

 # the user and fill an array.
 #
 # Return a default list if $string is undefined.
 # the user and fill an array.
 #
 # Return a default list if $string is undefined.

diff --git a/src/src/exipick.src b/src/src/exipick.src
index bdeba95fc66488c66fe23f3c92741ebdd7ba965e..1672c7fe6bdde81613d69ef61fe1008c848df00c 100644 (file)
--- a/src/src/exipick.src
+++ b/src/src/exipick.src
@@ -81,7 +81,7 @@ GetOptions(
   'show-tests'  => \$G::show_tests  # display tests as applied to each message
 ) || exit(1);
 
   'show-tests'  => \$G::show_tests  # display tests as applied to each message
 ) || exit(1);
 

-# if both freeze and thaw specified, only thaw as it is less desctructive
+# if both freeze and thaw specified, only thaw as it is less destructive

 $G::freeze = undef               if ($G::freeze && $G::thaw);
 freeze_start()                   if ($G::freeze);
 thaw_start()                     if ($G::thaw);
 $G::freeze = undef               if ($G::freeze && $G::thaw);
 freeze_start()                   if ($G::freeze);
 thaw_start()                     if ($G::thaw);


@@ -761,7 +761,7 @@ sub _decode_2047 {
               $i += 2;
             }
           }
               $i += 2;
             }
           }

-          elsif ($ow[$i] =~ /\s/) { # whitspace is illegal
+          elsif ($ow[$i] =~ /\s/) { # whitespace is illegal

             $e = 1;
             last;
           }
             $e = 1;
             last;
           }


@@ -1391,7 +1391,7 @@ Display only the message IDs (exiqgrep)
 
 =item --input-dir <inputname>
 
 
 =item --input-dir <inputname>
 

-Set the name of the directory under the spool directory.  By defaut this is "input".  If this starts with '/', the value of --spool is ignored.  See also --finput.
+Set the name of the directory under the spool directory.  By default this is "input".  If this starts with '/', the value of --spool is ignored.  See also --finput.

 
 =item -l
 
 
 =item -l
 

diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index 2c52f137fc9a3d3f60b0928df5d683fdd68705ed..ae617c4e1c16330ab77edb48e06dcf82e8e55dfd 100644 (file)
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -87,7 +87,7 @@ EOF
 }
 
 sub collect() {
 }
 
 sub collect() {

-       open(QUEUE,"$exim $eargs |") or die("Error openning pipe: $!\n");
+       open(QUEUE,"$exim $eargs |") or die("Error opening pipe: $!\n");

        while(<QUEUE>) {
                chomp();
                my $line = $_;
        while(<QUEUE>) {
                chomp();
                my $line = $_;

diff --git a/src/src/exiqsumm.src b/src/src/exiqsumm.src
index fc5ad26bb56009e6f2484402f842221ec21dede6..7d2a933f6fc08be30141730ddbc9ef7bed3b1e34 100644 (file)
--- a/src/src/exiqsumm.src
+++ b/src/src/exiqsumm.src
@@ -27,7 +27,7 @@
 #   typo. Fix provided by Chris Liddiard.
 # November 2006 by Jori Hamalainen
 #   Added feature to separate frozen and bounced messages from queue
 #   typo. Fix provided by Chris Liddiard.
 # November 2006 by Jori Hamalainen
 #   Added feature to separate frozen and bounced messages from queue

-#   Adedd feature to list queue per source - destination pair
+#   Added feature to list queue per source - destination pair

 #   Changed regexps to compile once to very minor speed optimization
 #   Short circuit for empty lines
 #
 #   Changed regexps to compile once to very minor speed optimization
 #   Short circuit for empty lines
 #

diff --git a/src/src/expand.c b/src/src/expand.c
index cfde23610acafb6d200cfd3934179e802f45ac67..a1e351cbd88f7751bd311bd42f732e8c31f4fe92 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -46,7 +46,7 @@ the first 8 characters of the password using a 20-round version of crypt
 (standard crypt does 25 rounds).  It then crypts the next 8 characters,
 or an empty block if the password is less than 9 characters, using a
 20-round version of crypt and the same salt as was used for the first
 (standard crypt does 25 rounds).  It then crypts the next 8 characters,
 or an empty block if the password is less than 9 characters, using a
 20-round version of crypt and the same salt as was used for the first

-block.  Charaters after the first 16 are ignored.  It always generates
+block.  Characters after the first 16 are ignored.  It always generates

 a 16-byte hash, which is expressed together with the salt as a string
 of 24 base 64 digits.  Here are some links to peruse:
 
 a 16-byte hash, which is expressed together with the salt as a string
 of 24 base 64 digits.  Here are some links to peruse:
 


@@ -1589,7 +1589,7 @@ for (i = 0; i < 2; i++)
 
         size += ilen + comma + 1;  /* +1 for the newline */
 
 
         size += ilen + comma + 1;  /* +1 for the newline */
 

-        /* Second pass - concatentate the data, up to a maximum. Note that
+        /* Second pass - concatenate the data, up to a maximum. Note that

         the loop stops when size hits the limit. */
 
         if (i != 0)
         the loop stops when size hits the limit. */
 
         if (i != 0)


@@ -3635,7 +3635,7 @@ if (*error == NULL)
     /* SIGFPE both on div/mod by zero and on INT_MIN / -1, which would give
      * a value of INT_MAX+1. Note that INT_MIN * -1 gives INT_MIN for me, which
      * is a bug somewhere in [gcc 4.2.1, FreeBSD, amd64].  In fact, -N*-M where
     /* SIGFPE both on div/mod by zero and on INT_MIN / -1, which would give
      * a value of INT_MAX+1. Note that INT_MIN * -1 gives INT_MIN for me, which
      * is a bug somewhere in [gcc 4.2.1, FreeBSD, amd64].  In fact, -N*-M where

-     * -N*M is INT_MIN will yielf INT_MIN.
+     * -N*M is INT_MIN will yield INT_MIN.

      * Since we don't support floating point, this is somewhat simpler.
      * Ideally, we'd return an error, but since we overflow for all other
      * arithmetic, consistency suggests otherwise, but what's the correct value
      * Since we don't support floating point, this is somewhat simpler.
      * Ideally, we'd return an error, but since we overflow for all other
      * arithmetic, consistency suggests otherwise, but what's the correct value


@@ -3813,7 +3813,7 @@ them here in detail any more.
 We use an internal routine recursively to handle embedded substrings. The
 external function follows. The yield is NULL if the expansion failed, and there
 are two cases: if something collapsed syntactically, or if "fail" was given
 We use an internal routine recursively to handle embedded substrings. The
 external function follows. The yield is NULL if the expansion failed, and there
 are two cases: if something collapsed syntactically, or if "fail" was given

-as the action on a lookup failure. These can be distinguised by looking at the
+as the action on a lookup failure. These can be distinguished by looking at the

 variable expand_string_forcedfail, which is TRUE in the latter case.
 
 The skipping flag is set true when expanding a substring that isn't actually
 variable expand_string_forcedfail, which is TRUE in the latter case.
 
 The skipping flag is set true when expanding a substring that isn't actually


@@ -5386,7 +5386,7 @@ while (*s != 0)
 
       /* While skipping we cannot rely on the data for expansions being
       available (eg. $item) hence cannot decide on numeric vs. keyed.
 
       /* While skipping we cannot rely on the data for expansions being
       available (eg. $item) hence cannot decide on numeric vs. keyed.

-      Read a maximum of 5 arguments (inclding the yes/no) */
+      Read a maximum of 5 arguments (including the yes/no) */

 
       if (skipping)
        {
 
       if (skipping)
        {

diff --git a/src/src/filter.c b/src/src/filter.c
index 59ab3192f5f7b71a9297499fe056bcd1a0f3ac2b..a5c3b5dfaaf50155189842c7c52edee42aa8233a 100644 (file)
--- a/src/src/filter.c
+++ b/src/src/filter.c
@@ -740,7 +740,7 @@ return nextsigchar(ptr, TRUE);
 
 
 /*************************************************
 
 
 /*************************************************

-*             Ouput the current indent           *
+*             Output the current indent          *

 *************************************************/
 
 static void
 *************************************************/
 
 static void


@@ -1370,7 +1370,7 @@ return yield;
 *              Read a list of commands           *
 *************************************************/
 
 *              Read a list of commands           *
 *************************************************/
 

-/* If condional is TRUE, the list must be terminated
+/* If conditional is TRUE, the list must be terminated

 by the words "else" or "endif".
 
 Arguments:
 by the words "else" or "endif".
 
 Arguments:

diff --git a/src/src/globals.c b/src/src/globals.c
index 55d9e98ae58003527d38f059e50ffbf5e476fd76..90e46dff5a4987a08b3d465040f36f7d8f55f7b2 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -701,7 +701,7 @@ uschar *errors_reply_to        = NULL;
 int     errors_sender_rc       = EXIT_FAILURE;
 #ifndef DISABLE_EVENT
 uschar *event_action             = NULL;       /* expansion for delivery events */
 int     errors_sender_rc       = EXIT_FAILURE;
 #ifndef DISABLE_EVENT
 uschar *event_action             = NULL;       /* expansion for delivery events */

-uschar *event_data               = NULL;       /* auxilary data variable for event */
+uschar *event_data               = NULL;       /* auxiliary data variable for event */

 int     event_defer_errno        = 0;
 const uschar *event_name         = NULL;       /* event name variable */
 #endif
 int     event_defer_errno        = 0;
 const uschar *event_name         = NULL;       /* event name variable */
 #endif

diff --git a/src/src/globals.h b/src/src/globals.h
index 6e6a5c2245613a6f574b7f180b9d5b026002ec9e..6cd43c08e9f3d3fc1a79cc648f4a21a200564b79 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -298,7 +298,7 @@ extern uschar *csa_status;             /* Client SMTP Authorization result */
 
 typedef struct {
   unsigned     delivery:1;             /* When to attempt */
 
 typedef struct {
   unsigned     delivery:1;             /* When to attempt */

-  unsigned     defer_pass:1;           /* Pass 4xx to caller rather than spoolling */
+  unsigned     defer_pass:1;           /* Pass 4xx to caller rather than spooling */

   int          fd;                     /* Open connection */
   int          nrcpt;                  /* Count of addresses */
   uschar *     interface;              /* (address of) */
   int          fd;                     /* Open connection */
   int          nrcpt;                  /* Count of addresses */
   uschar *     interface;              /* (address of) */


@@ -683,7 +683,7 @@ extern BOOL    queue_only_override;    /* Allow override from command line */
 extern BOOL    queue_only_policy;      /* ACL or local_scan wants queue_only */
 extern BOOL    queue_run_in_order;     /* As opposed to random */
 extern uschar *queue_run_max;          /* Max queue runners */
 extern BOOL    queue_only_policy;      /* ACL or local_scan wants queue_only */
 extern BOOL    queue_run_in_order;     /* As opposed to random */
 extern uschar *queue_run_max;          /* Max queue runners */

-extern BOOL    queue_smtp;             /* Disable all immediate STMP (-odqs)*/
+extern BOOL    queue_smtp;             /* Disable all immediate SMTP (-odqs)*/

 extern uschar *queue_smtp_domains;     /* Ditto, for these domains */
 
 extern unsigned int random_seed;       /* Seed for random numbers */
 extern uschar *queue_smtp_domains;     /* Ditto, for these domains */
 
 extern unsigned int random_seed;       /* Seed for random numbers */


@@ -789,7 +789,7 @@ extern uschar *sending_ip_address;     /* Address of outgoing (SMTP) interface *
 extern int     sending_port;           /* Port of outgoing interface */
 extern SIGNAL_BOOL sigalrm_seen;       /* Flag for sigalrm_handler */
 extern uschar **sighup_argv;           /* Args for re-execing after SIGHUP */
 extern int     sending_port;           /* Port of outgoing interface */
 extern SIGNAL_BOOL sigalrm_seen;       /* Flag for sigalrm_handler */
 extern uschar **sighup_argv;           /* Args for re-execing after SIGHUP */

-extern int     slow_lookup_log;        /* Log DNS lookups taking loger than N millisecs */
+extern int     slow_lookup_log;        /* Log DNS lookups taking longer than N millisecs */

 extern int     smtp_accept_count;      /* Count of connections */
 extern BOOL    smtp_accept_keepalive;  /* Set keepalive on incoming */
 extern int     smtp_accept_max;        /* Max SMTP connections */
 extern int     smtp_accept_count;      /* Count of connections */
 extern BOOL    smtp_accept_keepalive;  /* Set keepalive on incoming */
 extern int     smtp_accept_max;        /* Max SMTP connections */

diff --git a/src/src/header.c b/src/src/header.c
index dad1638cbb6931aca1f7c99e702932c84026791f..decd0cce69a107e43b141314a62381954295e566 100644 (file)
--- a/src/src/header.c
+++ b/src/src/header.c
@@ -119,7 +119,7 @@ if (name == NULL)
     hptr = &header_list;
 
     /* header_list->text can be NULL if we get here between when the new
     hptr = &header_list;
 
     /* header_list->text can be NULL if we get here between when the new

-    received header is allocated and when it is acutally filled in. We want
+    received header is allocated and when it is actually filled in. We want

     that header to be first, so skip it for now. */
 
     if (header_list->text == NULL)
     that header to be first, so skip it for now. */
 
     if (header_list->text == NULL)


@@ -132,7 +132,7 @@ else
   {
   int len = Ustrlen(name);
 
   {
   int len = Ustrlen(name);
 

-  /* Find the first non-deleted header witht the correct name. */
+  /* Find the first non-deleted header with the correct name. */

 
   for (hptr = &header_list; (h = *hptr) != NULL; hptr = &(h->next))
     {
 
   for (hptr = &header_list; (h = *hptr) != NULL; hptr = &(h->next))
     {

diff --git a/src/src/host.c b/src/src/host.c
index 25dab2bb8c3f569c13aa9e53a375c89e52c719f8..f69e329d9cbe149a0d0ad2e8743c1466c375bb43 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -554,7 +554,7 @@ if (sender_helo_name == NULL) show_helo = FALSE;
 /* If HELO/EHLO was followed by an IP literal, it's messy because of two
 features of IPv6. Firstly, there's the "IPv6:" prefix (Exim is liberal and
 doesn't require this, for historical reasons). Secondly, IPv6 addresses may not
 /* If HELO/EHLO was followed by an IP literal, it's messy because of two
 features of IPv6. Firstly, there's the "IPv6:" prefix (Exim is liberal and
 doesn't require this, for historical reasons). Secondly, IPv6 addresses may not

-be given in canonical form, so we have to canonicize them before comparing. As
+be given in canonical form, so we have to canonicalize them before comparing. As

 it happens, the code works for both IPv4 and IPv6. */
 
 else if (sender_helo_name[0] == '[' &&
 it happens, the code works for both IPv4 and IPv6. */
 
 else if (sender_helo_name[0] == '[' &&


@@ -1646,7 +1646,7 @@ Returns:      OK on success, the answer being placed in the global variable
               FAIL if no host name can be found
               DEFER if a temporary error was encountered
 
               FAIL if no host name can be found
               DEFER if a temporary error was encountered
 

-The variable host_lookup_msg is set to an empty string on sucess, or to a
+The variable host_lookup_msg is set to an empty string on success, or to a

 reason for the failure otherwise, in a form suitable for tagging onto an error
 message, and also host_lookup_failed is set TRUE if the lookup failed. If there
 was a defer, host_lookup_deferred is set TRUE.
 reason for the failure otherwise, in a form suitable for tagging onto an error
 message, and also host_lookup_failed is set TRUE if the lookup failed. If there
 was a defer, host_lookup_deferred is set TRUE.

diff --git a/src/src/ip.c b/src/src/ip.c
index c275b1f00d2a8550065bf06f2c64c2c2d95910db..8bb6bed1f4e38d2674b515e04651628545657187 100644 (file)
--- a/src/src/ip.c
+++ b/src/src/ip.c
@@ -7,7 +7,7 @@
 
 /* Functions for doing things with sockets. With the advent of IPv6 this has
 got messier, so that it's worth pulling out the code into separate functions
 
 /* Functions for doing things with sockets. With the advent of IPv6 this has
 got messier, so that it's worth pulling out the code into separate functions

-that other parts of Exim can call, expecially as there are now several
+that other parts of Exim can call, especially as there are now several

 different places in the code where sockets are used. */
 
 
 different places in the code where sockets are used. */
 
 

diff --git a/src/src/log.c b/src/src/log.c
index 52570ac1346e665f5d5b14cf51845bcc006df6eb..ddd71377e2f75bb335db55a2e37948af10b32e15 100644 (file)
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -704,7 +704,7 @@ If it is not, don't try to write to the log because permission will probably be
 denied.
 
 Avoid actually writing to the logs when exim is called with -bv or -bt to
 denied.
 
 Avoid actually writing to the logs when exim is called with -bv or -bt to

-test an address, but take other actions, such as panicing.
+test an address, but take other actions, such as panicking.

 
 In Exim proper, the buffer for building the message is got at start-up, so that
 nothing gets done if it can't be got. However, some functions that are also
 
 In Exim proper, the buffer for building the message is got at start-up, so that
 nothing gets done if it can't be got. However, some functions that are also

diff --git a/src/src/lookupapi.h b/src/src/lookupapi.h
index 03de8f6756ffaf071dc0a07ba7436c82c922c54a..9055f52397b40043c01e9afc7d5faaa9ba4b1ece 100644 (file)
--- a/src/src/lookupapi.h
+++ b/src/src/lookupapi.h
@@ -34,7 +34,7 @@ typedef struct lookup_info {
     int,                          /* length of key or query */
     uschar **,                    /* for returning answer */
     uschar **,                    /* for error message */
     int,                          /* length of key or query */
     uschar **,                    /* for returning answer */
     uschar **,                    /* for error message */

-    uint *);                      /* cache TTL, sconds */
+    uint *);                      /* cache TTL, seconds */

   void (*close)(                  /* close function */
     void *);                      /* handle */
   void (*tidy)(void);             /* tidy function */
   void (*close)(                  /* close function */
     void *);                      /* handle */
   void (*tidy)(void);             /* tidy function */

diff --git a/src/src/lookups/cdb.c b/src/src/lookups/cdb.c
index 3a9078a4ecd711947c15e7cd048d5b5f5901060e..bc610467c1b06c963366e8c84c423d0a03a71637 100644 (file)
--- a/src/src/lookups/cdb.c
+++ b/src/src/lookups/cdb.c
@@ -43,7 +43,7 @@
  * cdb.[ch] it does *not* link against an external cdb library.
  *
  *
  * cdb.[ch] it does *not* link against an external cdb library.
  *
  *

- * There are 2 varients included within this code.  One uses MMAP and
+ * There are 2 variants included within this code.  One uses MMAP and

  * should give better performance especially for multiple lookups on a
  * modern machine.  The other is the default implementation which is
  * used in the case where the MMAP fails or if MMAP was not compiled
  * should give better performance especially for multiple lookups on a
  * modern machine.  The other is the default implementation which is
  * used in the case where the MMAP fails or if MMAP was not compiled


@@ -131,7 +131,7 @@ cdb_bread(int fd,
 
 /*
  * cdb_bread()
 
 /*
  * cdb_bread()

- * Internal function to parse 4 byte number (endian independant) */
+ * Internal function to parse 4 byte number (endian independent) */

 
 static uint32
 cdb_unpack(uschar *buf)
 
 static uint32
 cdb_unpack(uschar *buf)

diff --git a/src/src/lookups/dnsdb.c b/src/src/lookups/dnsdb.c
index da3495beb581c3d9aab5a926a29e357e7a3fd94e..d2ae0aefc8708ad963b4650774980046ebe09569 100644 (file)
--- a/src/src/lookups/dnsdb.c
+++ b/src/src/lookups/dnsdb.c
@@ -558,7 +558,7 @@ while ((domain = string_nextinlist(&keystring, &sep, NULL, 0)))
         }
       }    /* Loop for list of returned records */
 
         }
       }    /* Loop for list of returned records */
 

-           /* Loop for set of A-lookupu types */
+           /* Loop for set of A-lookup types */

     } while (type == T_ADDRESSES && searchtype != T_A);
 
   }        /* Loop for list of domains */
     } while (type == T_ADDRESSES && searchtype != T_A);
 
   }        /* Loop for list of domains */

diff --git a/src/src/lookups/ibase.c b/src/src/lookups/ibase.c
index 6405a64485c804e140a01c6e215bb1133b80c276..b29fccca78cbcb8d790fe3b6b6843feca3269d7d 100644 (file)
--- a/src/src/lookups/ibase.c
+++ b/src/src/lookups/ibase.c
@@ -426,7 +426,7 @@ always leaves enough room for a terminating zero. */
     if (stmth != NULL)
         isc_dsql_free_statement(status, &stmth, DSQL_drop);
 
     if (stmth != NULL)
         isc_dsql_free_statement(status, &stmth, DSQL_drop);
 

-/* Non-NULL result indicates a sucessful result */
+/* Non-NULL result indicates a successful result */

 
     if (result != NULL) {
         *resultptr = result;
 
     if (result != NULL) {
         *resultptr = result;

diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index b8a326834f498a550d33596e1881fb73f6528ce8..b52ef2221ee1293c1254f9fd990788cdb5007f99 100644 (file)
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -6,7 +6,7 @@
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Many thanks to Stuart Lynne for contributing the original code for this
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Many thanks to Stuart Lynne for contributing the original code for this

-driver. Further contibutions from Michael Haardt, Brian Candler, Barry
+driver. Further contributions from Michael Haardt, Brian Candler, Barry

 Pederson, Peter Savitch and Christian Kellner. Particular thanks to Brian for
 researching how to handle the different kinds of error. */
 
 Pederson, Peter Savitch and Christian Kellner. Particular thanks to Brian for
 researching how to handle the different kinds of error. */
 

diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c
index 632541a61ef390e0fb306502e2b46bea77d42b4c..5cf15af3a5879008587f5af0f0ca27906616babc 100644 (file)
--- a/src/src/lookups/mysql.c
+++ b/src/src/lookups/mysql.c
@@ -322,7 +322,7 @@ it is cached. */
 
 if (mysql_result != NULL) mysql_free_result(mysql_result);
 
 
 if (mysql_result != NULL) mysql_free_result(mysql_result);
 

-/* Non-NULL result indicates a sucessful result */
+/* Non-NULL result indicates a successful result */

 
 if (result != NULL)
   {
 
 if (result != NULL)
   {

diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c
index d3fba5e4c045bf9ea20e9839ad4130a8727bc2f4..eca15f1b40ffbe574bfab08c07fdf9788c944011 100644 (file)
--- a/src/src/lookups/oracle.c
+++ b/src/src/lookups/oracle.c
@@ -490,7 +490,7 @@ oclose(cda);
 
 ORACLE_EXIT_NO_VALS:
 
 
 ORACLE_EXIT_NO_VALS:
 

-/* Non-NULL result indicates a sucessful result */
+/* Non-NULL result indicates a successful result */

 
 if (result != NULL)
   {
 
 if (result != NULL)
   {

diff --git a/src/src/lookups/pgsql.c b/src/src/lookups/pgsql.c
index 735f85554f3e1f779283f18cd281d9a2f61091af..d71f97b33164502370244d2218d05f4c346456a9 100644 (file)
--- a/src/src/lookups/pgsql.c
+++ b/src/src/lookups/pgsql.c
@@ -97,7 +97,7 @@ configuration line for PostgreSQL via Unix domain sockets looks like this:
 hide pgsql_servers = (/tmp/.s.PGSQL.5432)/db/user/password[:<nextserver>]
 
 We enclose the path name in parentheses so that its slashes aren't visually
 hide pgsql_servers = (/tmp/.s.PGSQL.5432)/db/user/password[:<nextserver>]
 
 We enclose the path name in parentheses so that its slashes aren't visually

-confused with the delimeters for the other pgsql_server settings.
+confused with the delimiters for the other pgsql_server settings.

 
 For TCP/IP connections, the server is a host name and optional port (with a
 colon separator).
 
 For TCP/IP connections, the server is a host name and optional port (with a
 colon separator).


@@ -371,7 +371,7 @@ it is cached. */
 
 if (pg_result != NULL) PQclear(pg_result);
 
 
 if (pg_result != NULL) PQclear(pg_result);
 

-/* Non-NULL result indicates a sucessful result */
+/* Non-NULL result indicates a successful result */

 
 if (result != NULL)
   {
 
 if (result != NULL)
   {

diff --git a/src/src/lookups/redis.c b/src/src/lookups/redis.c
index df4cf0ca6d62e62c45cafead78e99a181f40e5ea..3a96f5ef940139337f9dc8b269de95e4b10e0925 100644 (file)
--- a/src/src/lookups/redis.c
+++ b/src/src/lookups/redis.c
@@ -344,7 +344,7 @@ as it is cached. */
 
 if (redis_reply) freeReplyObject(redis_reply);
 
 
 if (redis_reply) freeReplyObject(redis_reply);
 

-/* Non-NULL result indicates a sucessful result */
+/* Non-NULL result indicates a successful result */

 
 if (result)
   {
 
 if (result)
   {

diff --git a/src/src/macros.h b/src/src/macros.h
index 1b7cf4abf64d822a01e65861f4f352384f194e3a..53ffe1b2a1829ec2f0a0619d48b14100fecd8ccf 100644 (file)
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -352,7 +352,7 @@ and the first word of the log selector. */
 #define BIT_TEST(s,z,n) (((s)[BITWORD(n)] &   BITMASK(n)) != 0)
 
 /* Used in globals.c for initializing bit_table structures. T will be either
 #define BIT_TEST(s,z,n) (((s)[BITWORD(n)] &   BITMASK(n)) != 0)
 
 /* Used in globals.c for initializing bit_table structures. T will be either

-D or L correspondong to the debug and log selector bits declared below. */
+D or L corresponding to the debug and log selector bits declared below. */

 
 #define BIT_TABLE(T,name) { US #name, T##i_##name }
 
 
 #define BIT_TABLE(T,name) { US #name, T##i_##name }
 


@@ -846,7 +846,7 @@ enum {
 #define topt_add_delivery_date  0x002
 #define topt_add_envelope_to    0x004
 #define topt_use_crlf           0x008  /* Terminate lines with CRLF */
 #define topt_add_delivery_date  0x002
 #define topt_add_envelope_to    0x004
 #define topt_use_crlf           0x008  /* Terminate lines with CRLF */

-#define topt_end_dot            0x010  /* Send terminting dot line */
+#define topt_end_dot            0x010  /* Send terminating dot line */

 #define topt_no_headers         0x020  /* Omit headers */
 #define topt_no_body            0x040  /* Omit body */
 #define topt_escape_headers     0x080  /* Apply escape check to headers */
 #define topt_no_headers         0x020  /* Omit headers */
 #define topt_no_body            0x040  /* Omit body */
 #define topt_escape_headers     0x080  /* Apply escape check to headers */

diff --git a/src/src/malware.c b/src/src/malware.c
index b36bf0d6442e09cfc004b606936fc0ec67b8d956..e1eff16cf9df4c0ae1a0c60048e5d8f6bf10f821 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -966,7 +966,7 @@ if (!malware_ok)
                US"reported 'kavdaemon damaged' (code 7).", sock);
       }
 
                US"reported 'kavdaemon damaged' (code 7).", sock);
       }
 

-      /* code 8 is not handled, since it is ambigous. It appears mostly on
+      /* code 8 is not handled, since it is ambiguous. It appears mostly on

       bounces where part of a file has been cut off */
 
       /* "virus found" return codes (2-4) */
       bounces where part of a file has been cut off */
 
       /* "virus found" return codes (2-4) */

diff --git a/src/src/parse.c b/src/src/parse.c
index 3d942fd95e2df08024748d33d0c491d3f42c4634..3f0823a1e57808ea95a80aa64305231db0ae22b4 100644 (file)
--- a/src/src/parse.c
+++ b/src/src/parse.c
@@ -187,7 +187,7 @@ The start of the last potential comment position is remembered to
 make it possible to ignore comments at the end of compound items.
 
 Argument: current character pointer
 make it possible to ignore comments at the end of compound items.
 
 Argument: current character pointer

-Regurns:  new character pointer
+Returns:  new character pointer

 */
 
 static uschar *
 */
 
 static uschar *

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index d3ff03108c683885b60e82e68173435285041e66..58838c2ef0b5ac994c6a31ce936f20e3eca0a6d9 100644 (file)
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -1631,7 +1631,7 @@ while (sig)
       }
 
 
       }
 
 

-    /* We have a winner! (if bodydhash was correct earlier) */
+    /* We have a winner! (if bodyhash was correct earlier) */

     if (sig->verify_status == PDKIM_VERIFY_NONE)
       sig->verify_status = PDKIM_VERIFY_PASS;
 
     if (sig->verify_status == PDKIM_VERIFY_NONE)
       sig->verify_status = PDKIM_VERIFY_PASS;
 

diff --git a/src/src/queue.c b/src/src/queue.c
index e7ae019d2f1c0892d166ddab14d6297bfa946acf..714c73256341129156df2e1f0cf63d9e6d3b973e 100644 (file)
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -12,7 +12,7 @@
 
 
 
 
 
 

-/* Routines with knowlege of spool layout */
+/* Routines with knowledge of spool layout */

 
 #ifndef COMPILE_UTILITY
 static void
 
 #ifndef COMPILE_UTILITY
 static void


@@ -455,7 +455,7 @@ any messages therein), and then repeats for any subdirectories that were found.
 When the first argument of queue_get_spool_list() is 0, it scans the top
 directory, fills in subdirs, and sets subcount. The order of the directories is
 then randomized after the first time through, before they are scanned in
 When the first argument of queue_get_spool_list() is 0, it scans the top
 directory, fills in subdirs, and sets subcount. The order of the directories is
 then randomized after the first time through, before they are scanned in

-subsqeuent iterations.
+subsequent iterations.

 
 When the first argument of queue_get_spool_list() is -1 (for queue_run_in_
 order), it scans all directories and makes a single message list. */
 
 When the first argument of queue_get_spool_list() is -1 (for queue_run_in_
 order), it scans all directories and makes a single message list. */

diff --git a/src/src/readconf.c b/src/src/readconf.c
index cd18431f42166417cca8c7a17217dd995d877376..b2de8a3d32412cb68714ad716e250071aba490c3 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -253,7 +253,7 @@ static optionlist optionlist_config[] = {
   { "dns_retry",                opt_int,         &dns_retry },
   { "dns_trust_aa",             opt_stringptr,   &dns_trust_aa },
   { "dns_use_edns0",            opt_int,         &dns_use_edns0 },
   { "dns_retry",                opt_int,         &dns_retry },
   { "dns_trust_aa",             opt_stringptr,   &dns_trust_aa },
   { "dns_use_edns0",            opt_int,         &dns_use_edns0 },

- /* This option is now a no-op, retained for compability */
+ /* This option is now a no-op, retained for compatibility */

   { "drop_cr",                  opt_bool,        &drop_cr },
 /*********************************************************/
   { "dsn_advertise_hosts",      opt_stringptr,   &dsn_advertise_hosts },
   { "drop_cr",                  opt_bool,        &drop_cr },
 /*********************************************************/
   { "dsn_advertise_hosts",      opt_stringptr,   &dsn_advertise_hosts },


@@ -2368,7 +2368,7 @@ switch (type)
 
   /* We get a coverity error here for using count, as it derived
   from the tainted buffer pointed to by s, as parsed by sscanf().
 
   /* We get a coverity error here for using count, as it derived
   from the tainted buffer pointed to by s, as parsed by sscanf().

-  By the definition of sscanf we must be aceessing between start
+  By the definition of sscanf we must be accessing between start

   and end of s (assuming it is nul-terminated...) so ignore the error.  */
   /* coverity[tainted_data] */
   if (s[count] == '.')
   and end of s (assuming it is nul-terminated...) so ignore the error.  */
   /* coverity[tainted_data] */
   if (s[count] == '.')

diff --git a/src/src/receive.c b/src/src/receive.c
index e535876191e067e59fcbf71ddfd83196c8b7deb2..73713aa97f020f8c06ad39fed79be6004694ce17 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -3738,7 +3738,7 @@ if (bmi_run == 1)
   }
 #endif
 
   }
 #endif
 

-/* Update the timstamp in our Received: header to account for any time taken by
+/* Update the timestamp in our Received: header to account for any time taken by

 an ACL or by local_scan(). The new time is the time that all reception
 processing is complete. */
 
 an ACL or by local_scan(). The new time is the time that all reception
 processing is complete. */
 


@@ -3823,7 +3823,7 @@ string as required. Since we commonly want to add two items at a time, use a
 macro to simplify the coding. We log the arrival of a new message while the
 file is still locked, just in case the machine is *really* fast, and delivers
 it first! Include any message id that is in the message - since the syntax of a
 macro to simplify the coding. We log the arrival of a new message while the
 file is still locked, just in case the machine is *really* fast, and delivers
 it first! Include any message id that is in the message - since the syntax of a

-message id is actually an addr-spec, we can use the parse routine to canonicize
+message id is actually an addr-spec, we can use the parse routine to canonicalize

 it. */
 
 size = 256;
 it. */
 
 size = 256;


@@ -4058,7 +4058,7 @@ for this message. */
 
    Send dot onward.  If accepted, wipe the spooled files, log as delivered and accept
    the sender's dot (below).
 
    Send dot onward.  If accepted, wipe the spooled files, log as delivered and accept
    the sender's dot (below).

-   If rejected: copy response to sender, wipe the spooled files, log approriately.
+   If rejected: copy response to sender, wipe the spooled files, log appropriately.

    If temp-reject: normally accept to sender, keep the spooled file - unless defer=pass
    in which case pass temp-reject back to initiator and dump the files.
 
    If temp-reject: normally accept to sender, keep the spooled file - unless defer=pass
    in which case pass temp-reject back to initiator and dump the files.
 

diff --git a/src/src/route.c b/src/src/route.c
index bb220c69b2e6d2d5b6327e9b23ccab20440e9c65..08b3e055dd6e9ea76cf614269b57ba1e393d4954 100644 (file)
--- a/src/src/route.c
+++ b/src/src/route.c
@@ -714,7 +714,7 @@ while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))))
     pid = fork();
 
     /* If fork() fails, reinstate the original error and behave as if
     pid = fork();
 
     /* If fork() fails, reinstate the original error and behave as if

-    this block of code were not present. This is the same behavious as happens
+    this block of code were not present. This is the same behaviour as happens

     when Exim is not running as root at this point. */
 
     if (pid < 0)
     when Exim is not running as root at this point. */
 
     if (pid < 0)


@@ -765,7 +765,7 @@ while ((check = string_nextinlist(&listptr, &sep, buffer, sizeof(buffer))))
     rc = -1;
     }
 
     rc = -1;
     }
 

-  /* Handle error returns from stat() or route_check_access(). The EACESS error
+  /* Handle error returns from stat() or route_check_access(). The EACCES error

   is handled specially. At present, we can force it to be treated as
   non-existence. Write the code so that it will be easy to add forcing for
   existence if required later. */
   is handled specially. At present, we can force it to be treated as
   non-existence. Write the code so that it will be easy to add forcing for
   existence if required later. */


@@ -966,7 +966,7 @@ if (r->router_home_directory)
   }
 
 /* Skip if the sender condition is not met. We leave this one till after the
   }
 
 /* Skip if the sender condition is not met. We leave this one till after the

-local user check so that $home is set - enabling the possiblity of letting
+local user check so that $home is set - enabling the possibility of letting

 individual recipients specify lists of acceptable/unacceptable senders. */
 
 if ((rc = route_check_dls(r->name, US"senders", r->senders, NULL,
 individual recipients specify lists of acceptable/unacceptable senders. */
 
 if ((rc = route_check_dls(r->name, US"senders", r->senders, NULL,


@@ -1177,7 +1177,7 @@ NIS or NFS whatever cause an incorrect refusal. It's a pity that getgrnam()
 doesn't have some kind of indication as to why it has failed.
 
 Arguments:
 doesn't have some kind of indication as to why it has failed.
 
 Arguments:

-  s           the group namd or textual form of the numerical gid
+  s           the group name or textual form of the numerical gid

   return_gid  return the gid via this address
 
 Returns:      TRUE if the group was found; FALSE otherwise
   return_gid  return the gid via this address
 
 Returns:      TRUE if the group was found; FALSE otherwise


@@ -1483,7 +1483,7 @@ for (r = addr->start_router ? addr->start_router : routers; r; r = nextr)
   by  this router, even if it was different to the current address.
 
   Just in case someone does put it into a loop (possible with redirection
   by  this router, even if it was different to the current address.
 
   Just in case someone does put it into a loop (possible with redirection

-  continally adding to an address, for example), put a long stop counter on
+  continually adding to an address, for example), put a long stop counter on

   the number of parents. */
 
   for (parent = addr->parent; parent; parent = parent->parent)
   the number of parents. */
 
   for (parent = addr->parent; parent; parent = parent->parent)

diff --git a/src/src/routers/README b/src/src/routers/README
index f2a73c83ccd8b8bf704ccefd7a19073c0d85afe8..a674e8b47a800b108e26543ba6749b671ccbbad0 100644 (file)
--- a/src/src/routers/README
+++ b/src/src/routers/README
@@ -23,7 +23,7 @@ The yield of a router is one of:
 
   DISCARD         the address was discarded (:blackhole: or "seen finish")
 
 
   DISCARD         the address was discarded (:blackhole: or "seen finish")
 

-  FAIL            the address was not routed; do not pass to any subseqent
+  FAIL            the address was not routed; do not pass to any subsequent

                   routers, i.e. cause routing to fail.
 
   DEFER           retry this address later.
                   routers, i.e. cause routing to fail.
 
   DEFER           retry this address later.

diff --git a/src/src/search.c b/src/src/search.c
index ccad25021675a412a5cf58220c5ad0cc5f0607d0..b1dc884c9341d715f2faebbd8deffd9d4476c7ef 100644 (file)
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -757,7 +757,7 @@ else if (partial >= 0)
   }
 
 /* If nothing has been matched, but the option to look for "*@" is set, try
   }
 
 /* If nothing has been matched, but the option to look for "*@" is set, try

-replacing everthing to the left of @ by *. After a match, the wild part
+replacing everything to the left of @ by *. After a match, the wild part

 is set to the string to the left of the @. */
 
 if (yield == NULL && (starflags & SEARCH_STARAT) != 0)
 is set to the string to the left of the @. */
 
 if (yield == NULL && (starflags & SEARCH_STARAT) != 0)

diff --git a/src/src/sieve.c b/src/src/sieve.c
index 19bc5337b851bda99823236d00e943da5993f2ed..96344c416d33fa2dc1f46eebad5a514b6e9beeb5 100644 (file)
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -3104,7 +3104,7 @@ while (*filter->pc)
                 message.character=US"Notification";
                 message.length=Ustrlen(message.character);
                 }
                 message.character=US"Notification";
                 message.length=Ustrlen(message.character);
                 }

-              /* Allocation is larger than neccessary, but enough even for split MIME words */
+              /* Allocation is larger than necessary, but enough even for split MIME words */

               buffer_capacity=32+4*message.length;
               buffer=store_get(buffer_capacity);
               if (message.length!=-1) fprintf(f,"Subject: %s\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE));
               buffer_capacity=32+4*message.length;
               buffer=store_get(buffer_capacity);
               if (message.length!=-1) fprintf(f,"Subject: %s\n",parse_quote_2047(message.character, message.length, US"utf-8", buffer, buffer_capacity, TRUE));


@@ -3356,7 +3356,7 @@ while (*filter->pc)
             addr->reply->from = expand_string(US"$local_part@$domain");
           else
             addr->reply->from = from.character;
             addr->reply->from = expand_string(US"$local_part@$domain");
           else
             addr->reply->from = from.character;

-          /* Allocation is larger than neccessary, but enough even for split MIME words */
+          /* Allocation is larger than necessary, but enough even for split MIME words */

           buffer_capacity=32+4*subject.length;
           buffer=store_get(buffer_capacity);
          /* deconst cast safe as we pass in a non-const item */
           buffer_capacity=32+4*subject.length;
           buffer=store_get(buffer_capacity);
          /* deconst cast safe as we pass in a non-const item */

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index e8692ce56057021887f22b10192a938139070995..655e25394539d70a0759b4f5b585a42bd3d26141 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -93,9 +93,9 @@ enum {
   processing of the RCPT response(s).  We shall do the same, and not require
   synch for BDAT.  Worse, as the chunk may (very likely will) follow the
   command-header in the same packet we cannot do the usual "is there any
   processing of the RCPT response(s).  We shall do the same, and not require
   synch for BDAT.  Worse, as the chunk may (very likely will) follow the
   command-header in the same packet we cannot do the usual "is there any

-  follow-on data after the commmand line" even for non-pipeline mode.
+  follow-on data after the command line" even for non-pipeline mode.

   So we'll need an explicit check after reading the expected chunk amount
   So we'll need an explicit check after reading the expected chunk amount

-  when non-pipe, before sennding the ACK. */
+  when non-pipe, before sending the ACK. */

 
   BDAT_CMD,
 
 
   BDAT_CMD,
 


@@ -408,7 +408,7 @@ log_write(L_smtp_incomplete_transaction, LOG_MAIN|LOG_SENDER|LOG_RECIPIENTS,
 /* This gets the next byte from the SMTP input buffer. If the buffer is empty,
 it flushes the output, and refills the buffer, with a timeout. The signal
 handler is set appropriately by the calling function. This function is not used
 /* This gets the next byte from the SMTP input buffer. If the buffer is empty,
 it flushes the output, and refills the buffer, with a timeout. The signal
 handler is set appropriately by the calling function. This function is not used

-after a connection has negotated itself into an TLS/SSL state.
+after a connection has negotiated itself into an TLS/SSL state.

 
 Arguments:  none
 Returns:    the next character or EOF
 
 Arguments:  none
 Returns:    the next character or EOF


@@ -997,7 +997,7 @@ if (ret >= 16 && memcmp(&hdr.v2, v2sig, 12) == 0)
   /* May 2014: haproxy combined the version and command into one byte to
      allow two full bytes for the length field in order to proxy SSL
      connections.  SSL Proxy is not supported in this version of Exim, but
   /* May 2014: haproxy combined the version and command into one byte to
      allow two full bytes for the length field in order to proxy SSL
      connections.  SSL Proxy is not supported in this version of Exim, but

-     must still seperate values here. */
+     must still separate values here. */

 
   if (ver != 0x02)
     {
 
   if (ver != 0x02)
     {


@@ -1104,7 +1104,7 @@ else if (ret >= 8 && memcmp(hdr.v1.line, "PROXY", 5) == 0)
   size = end + 2 - hdr.v1.line; /* Skip header + CRLF */
   DEBUG(D_receive) debug_printf("Detected PROXYv1 header\n");
   /* Step through the string looking for the required fields. Ensure
   size = end + 2 - hdr.v1.line; /* Skip header + CRLF */
   DEBUG(D_receive) debug_printf("Detected PROXYv1 header\n");
   /* Step through the string looking for the required fields. Ensure

-     strict adherance to required formatting, exit for any error. */
+     strict adherence to required formatting, exit for any error. */

   p += 5;
   if (!isspace(*(p++)))
     {
   p += 5;
   if (!isspace(*(p++)))
     {


@@ -1557,7 +1557,7 @@ log_write(0, LOG_MAIN, "no MAIL in SMTP connection from %s D=%s%s",
 
 /* Check the format of a HELO line. The data for HELO/EHLO is supposed to be
 the domain name of the sending host, or an ip literal in square brackets. The
 
 /* Check the format of a HELO line. The data for HELO/EHLO is supposed to be
 the domain name of the sending host, or an ip literal in square brackets. The

-arrgument is placed in sender_helo_name, which is in malloc store, because it
+argument is placed in sender_helo_name, which is in malloc store, because it

 must persist over multiple incoming messages. If helo_accept_junk is set, this
 host is permitted to send any old junk (needed for some broken hosts).
 Otherwise, helo_allow_chars can be used for rogue characters in general
 must persist over multiple incoming messages. If helo_accept_junk is set, this
 host is permitted to send any old junk (needed for some broken hosts).
 Otherwise, helo_allow_chars can be used for rogue characters in general


@@ -3045,7 +3045,7 @@ the ACL that obeyed "drop" has already supplied the custom message, and NULL is
 passed to this function.
 
 In case things go wrong while processing this function, causing an error that
 passed to this function.
 
 In case things go wrong while processing this function, causing an error that

-may re-enter this funtion, there is a recursion check.
+may re-enter this function, there is a recursion check.

 
 Arguments:
   reason          What $smtp_notquit_reason will be set to in the ACL;
 
 Arguments:
   reason          What $smtp_notquit_reason will be set to in the ACL;


@@ -4958,7 +4958,7 @@ while (done <= 0)
 
     /* RFC 2487 is not clear on when this command may be sent, though it
     does state that all information previously obtained from the client
 
     /* RFC 2487 is not clear on when this command may be sent, though it
     does state that all information previously obtained from the client

-    must be discarded if a TLS session is started. It seems reasonble to
+    must be discarded if a TLS session is started. It seems reasonable to

     do an implied RSET when STARTTLS is received. */
 
     incomplete_transaction_log(US"STARTTLS");
     do an implied RSET when STARTTLS is received. */
 
     incomplete_transaction_log(US"STARTTLS");


@@ -4983,7 +4983,7 @@ while (done <= 0)
       /* and if TLS is already active, tls_server_start() should fail */
       }
 
       /* and if TLS is already active, tls_server_start() should fail */
       }
 

-    /* There is nothing we value in the input buffer and if TLS is succesfully
+    /* There is nothing we value in the input buffer and if TLS is successfully

     negotiated, we won't use this buffer again; if TLS fails, we'll just read
     fresh content into it.  The buffer contains arbitrary content from an
     untrusted remote source; eg: NOOP <shellcode>\r\nSTARTTLS\r\n
     negotiated, we won't use this buffer again; if TLS fails, we'll just read
     fresh content into it.  The buffer contains arbitrary content from an
     untrusted remote source; eg: NOOP <shellcode>\r\nSTARTTLS\r\n

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 3154c97674d579b0548b188690095e92e8ef7670..cd3906fc0c439dcb8d4ab058543ebe4e6c315b3f 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -550,7 +550,7 @@ int count;
 
 errno = 0;  /* Ensure errno starts out zero */
 
 
 errno = 0;  /* Ensure errno starts out zero */
 

-/* This is a loop to read and concatentate the lines that make up a multi-line
+/* This is a loop to read and concatenate the lines that make up a multi-line

 response. */
 
 for (;;)
 response. */
 
 for (;;)

diff --git a/src/src/spam.c b/src/src/spam.c
index 93c0a540d732e447103a6c3e658b8ed449fada0e..ac25a881fb7679db1a425f8485bf5898bdaa0086 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -414,12 +414,12 @@ if (wrote == -1)
   }
 
 /* now send the file */
   }
 
 /* now send the file */

-/* spamd sometimes accepts conections but doesn't read data off
+/* spamd sometimes accepts connections but doesn't read data off

  * the connection.  We make the file descriptor non-blocking so
  * that the write will only write sufficient data without blocking
  * the connection.  We make the file descriptor non-blocking so
  * that the write will only write sufficient data without blocking

- * and we poll the desciptor to make sure that we can write without
+ * and we poll the descriptor to make sure that we can write without

  * blocking.  Short writes are gracefully handled and if the whole
  * blocking.  Short writes are gracefully handled and if the whole

- * trasaction takes too long it is aborted.
+ * transaction takes too long it is aborted.

  * Note: poll() is not supported in OSX 10.2 and is reported to be
  *       broken in more recent versions (up to 10.4).
  */
  * Note: poll() is not supported in OSX 10.2 and is reported to be
  *       broken in more recent versions (up to 10.4).
  */

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index e1d6e3422968032df7ae6c9f9a4dbf173df9fb46..6ed5664118f6206d19f5da17c63ca6581ae5acc2 100644 (file)
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -232,7 +232,7 @@ Arguments:
 Returns:        spool_read_OK        success
                 spool_read_notopen   open failed
                 spool_read_enverror  error in the envelope portion
 Returns:        spool_read_OK        success
                 spool_read_notopen   open failed
                 spool_read_enverror  error in the envelope portion

-                spool_read_hdrdrror  error in the header portion
+                spool_read_hdrerror  error in the header portion

 */
 
 int
 */
 
 int

diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index e49d89a091ebe3a58b8b0575472595f4fd0a74a6..652506fb359c9d7b84df1b1f2ace9b03d0ab64fb 100644 (file)
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -378,7 +378,7 @@ if (close(fd) < 0)
 #endif  /* NEED_SYNC_DIRECTORY */
 
 /* Return the number of characters in the headers, which is the file size, less
 #endif  /* NEED_SYNC_DIRECTORY */
 
 /* Return the number of characters in the headers, which is the file size, less

-the prelimary stuff, less the additional count fields on the headers. */
+the preliminary stuff, less the additional count fields on the headers. */

 
 DEBUG(D_receive) debug_printf("Size of headers = %d\n",
   (int)(statbuf.st_size - size_correction));
 
 DEBUG(D_receive) debug_printf("Size of headers = %d\n",
   (int)(statbuf.st_size - size_correction));

diff --git a/src/src/string.c b/src/src/string.c
index be1a1d7a4771ddaf2a90cb4ce97552a4ff1f9211..cec59506dbe46420e3a620dfd3f3198169bf7efa 100644 (file)
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -306,7 +306,7 @@ expanded string. */
 
 ss = store_get(length + nonprintcount * 3 + 1);
 
 
 ss = store_get(length + nonprintcount * 3 + 1);
 

-/* Copy everying, escaping non printers. */
+/* Copy everything, escaping non printers. */

 
 t = s;
 tt = ss;
 
 t = s;
 tt = ss;


@@ -974,14 +974,14 @@ return buffer;
 ************************************************/
 /* This function is used to build a list, returning
 an allocated null-terminated growable string. The
 ************************************************/
 /* This function is used to build a list, returning
 an allocated null-terminated growable string. The

-given element has any embedded seperator characters
+given element has any embedded separator characters

 doubled.
 
 Arguments:
   list points to the start of the list that is being built, or NULL
        if this is a new list that has no contents yet
 doubled.
 
 Arguments:
   list points to the start of the list that is being built, or NULL
        if this is a new list that has no contents yet

-  sep  list seperator charactoer
-  ele  new lement to be appended to the list
+  sep  list separator character
+  ele  new element to be appended to the list

 
 Returns:  pointer to the start of the list, changed if copied for expansion.
 */
 
 Returns:  pointer to the start of the list, changed if copied for expansion.
 */

diff --git a/src/src/tls-gnu.c b/src/src/tls-gnu.c
index 10bfaca32ecf888f9c1e65ecf1ff13fe66c872b7..e02cf1cea8eb621f1138b613212f1ee9bd489c83 100644 (file)
--- a/src/src/tls-gnu.c
+++ b/src/src/tls-gnu.c
@@ -1723,7 +1723,7 @@ Arguments:
 
 Returns:           OK on success
                    DEFER for errors before the start of the negotiation
 
 Returns:           OK on success
                    DEFER for errors before the start of the negotiation

-                   FAIL for errors during the negotation; the server can't
+                   FAIL for errors during the negotiation; the server can't

                      continue running.
 */
 
                      continue running.
 */
 

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 59384420d915c5bc9bcc75a3ce4a4ecad2d0e3c9..f360f21aef762fe3553d1371cfdd564fce99e917 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -727,9 +727,9 @@ if (!exp_curve || !*exp_curve)
   return TRUE;
 
 /* "auto" needs to be handled carefully.
   return TRUE;
 
 /* "auto" needs to be handled carefully.

- * OpenSSL <  1.0.2: we do not select anything, but fallback to primve256v1
+ * OpenSSL <  1.0.2: we do not select anything, but fallback to prime256v1

  * OpenSSL <  1.1.0: we have to call SSL_CTX_set_ecdh_auto
  * OpenSSL <  1.1.0: we have to call SSL_CTX_set_ecdh_auto

- *                   (openss/ssl.h defines SSL_CTRL_SET_ECDH_AUTO)
+ *                   (openssl/ssl.h defines SSL_CTRL_SET_ECDH_AUTO)

  * OpenSSL >= 1.1.0: we do not set anything, the libray does autoselection
  *                   https://github.com/openssl/openssl/commit/fe6ef2472db933f01b59cad82aa925736935984b
  */
  * OpenSSL >= 1.1.0: we do not set anything, the libray does autoselection
  *                   https://github.com/openssl/openssl/commit/fe6ef2472db933f01b59cad82aa925736935984b
  */


@@ -862,7 +862,7 @@ verify_flags = OCSP_NOVERIFY; /* check sigs, but not purpose */
 OCSP_NOSIGS OCSP_NOVERIFY OCSP_NOCHAIN OCSP_NOCHECKS OCSP_NOEXPLICIT
 OCSP_TRUSTOTHER OCSP_NOINTERN */
 
 OCSP_NOSIGS OCSP_NOVERIFY OCSP_NOCHAIN OCSP_NOCHECKS OCSP_NOEXPLICIT
 OCSP_TRUSTOTHER OCSP_NOINTERN */
 

-/* This does a full verify on the OCSP proof before we load it for serviing
+/* This does a full verify on the OCSP proof before we load it for serving

 up; possibly overkill - just date-checks might be nice enough.
 
 OCSP_basic_verify takes a "store" arg, but does not
 up; possibly overkill - just date-checks might be nice enough.
 
 OCSP_basic_verify takes a "store" arg, but does not


@@ -879,10 +879,10 @@ function for getting a stack from a store.
 We do not free the stack since it could be needed a second time for
 SNI handling.
 
 We do not free the stack since it could be needed a second time for
 SNI handling.
 

-Seperately we might try to replace using OCSP_basic_verify() - which seems to not
+Separately we might try to replace using OCSP_basic_verify() - which seems to not

 be a public interface into the OpenSSL library (there's no manual entry) - 
 But what with?  We also use OCSP_basic_verify in the client stapling callback.
 be a public interface into the OpenSSL library (there's no manual entry) - 
 But what with?  We also use OCSP_basic_verify in the client stapling callback.

-And there we NEED it; we miust verify that status... unless the
+And there we NEED it; we must verify that status... unless the

 library does it for us anyway?  */
 
 if ((i = OCSP_basic_verify(basic_response, sk, NULL, verify_flags)) < 0)
 library does it for us anyway?  */
 
 if ((i = OCSP_basic_verify(basic_response, sk, NULL, verify_flags)) < 0)


@@ -972,7 +972,7 @@ where = US"generating pkey";
 if (!(rsa = RSA_generate_key(1024, RSA_F4, NULL, NULL)))
   goto err;
 
 if (!(rsa = RSA_generate_key(1024, RSA_F4, NULL, NULL)))
   goto err;
 

-where = US"assiging pkey";
+where = US"assigning pkey";

 if (!EVP_PKEY_assign_RSA(pkey, rsa))
   goto err;
 
 if (!EVP_PKEY_assign_RSA(pkey, rsa))
   goto err;
 


@@ -1764,7 +1764,7 @@ if (expcerts && *expcerts)
       variant.
       If a list isn't loaded into the server, but
       some verify locations are set, the server end appears to make
       variant.
       If a list isn't loaded into the server, but
       some verify locations are set, the server end appears to make

-      a wildcard reqest for client certs.
+      a wildcard request for client certs.

       Meanwhile, the client library as default behaviour *ignores* the list
       we send over the wire - see man SSL_CTX_set_client_cert_cb.
       Because of this, and that the dir variant is likely only used for
       Meanwhile, the client library as default behaviour *ignores* the list
       we send over the wire - see man SSL_CTX_set_client_cert_cb.
       Because of this, and that the dir variant is likely only used for


@@ -1859,7 +1859,7 @@ Arguments:
 
 Returns:            OK on success
                     DEFER for errors before the start of the negotiation
 
 Returns:            OK on success
                     DEFER for errors before the start of the negotiation

-                    FAIL for errors during the negotation; the server can't
+                    FAIL for errors during the negotiation; the server can't

                       continue running.
 */
 
                       continue running.
 */
 

diff --git a/src/src/transport.c b/src/src/transport.c
index c48f1575ba1cfb7d2af34e05c55c4a4bfd6e8927..b8a4636b60818fe2cc4220d5ff8de4ebb7ab2cec 100644 (file)
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -624,7 +624,7 @@ return write_chunk(fd, tctx, pp->address, Ustrlen(pp->address));
 
 
 
 
 
 

-/* Add/remove/rewwrite headers, and send them plus the empty-line sparator.
+/* Add/remove/rewrite headers, and send them plus the empty-line separator.

 
 Globals:
   header_list
 
 Globals:
   header_list


@@ -908,7 +908,7 @@ if (!(tctx->options & topt_no_headers))
 
     /* Pick up from all the addresses. The plist and dlist variables are
     anchors for lists of addresses already handled; they have to be defined at
 
     /* Pick up from all the addresses. The plist and dlist variables are
     anchors for lists of addresses already handled; they have to be defined at

-    this level becuase write_env_to() calls itself recursively. */
+    this level because write_env_to() calls itself recursively. */

 
     for (p = tctx->addr; p; p = p->next)
       if (!write_env_to(p, &plist, &dlist, &first, fd, tctx))
 
     for (p = tctx->addr; p; p = p->next)
       if (!write_env_to(p, &plist, &dlist, &first, fd, tctx))


@@ -978,7 +978,7 @@ if (tctx->options & topt_use_bdat)
   if (size > DELIVER_OUT_BUFFER_SIZE && hsize > 0)
     {
     DEBUG(D_transport)
   if (size > DELIVER_OUT_BUFFER_SIZE && hsize > 0)
     {
     DEBUG(D_transport)

-      debug_printf("sending small initial BDAT; hssize=%d\n", hsize);
+      debug_printf("sending small initial BDAT; hsize=%d\n", hsize);

     if (  tctx->chunk_cb(fd, tctx, hsize, 0) != OK
        || !transport_write_block(fd, deliver_out_buffer, hsize)
        || tctx->chunk_cb(fd, tctx, 0, tc_reap_prev) != OK
     if (  tctx->chunk_cb(fd, tctx, hsize, 0) != OK
        || !transport_write_block(fd, deliver_out_buffer, hsize)
        || tctx->chunk_cb(fd, tctx, 0, tc_reap_prev) != OK


@@ -2272,7 +2272,7 @@ if (expand_arguments)
        */
       if (address_pipe_argcount > 1)
         memmove(
        */
       if (address_pipe_argcount > 1)
         memmove(

-          /* current position + additonal args */
+          /* current position + additional args */

           argv + i + address_pipe_argcount,
           /* current position + 1 (for the (uschar *)0 at the end) */
           argv + i + 1,
           argv + i + address_pipe_argcount,
           /* current position + 1 (for the (uschar *)0 at the end) */
           argv + i + 1,

diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index 884452208554310abd4511a4940f6cc7cf07dcf1..9b3379be2dbe0412dafa2ce16f167c97f6570eeb 100644 (file)
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -1146,7 +1146,7 @@ directory name) is given, that is, when appending to a single file:
 
      Open with O_WRONLY + O_EXCL + O_CREAT with configured mode, unless we know
      this is via a symbolic link (only possible if allow_symlinks is set), in
 
      Open with O_WRONLY + O_EXCL + O_CREAT with configured mode, unless we know
      this is via a symbolic link (only possible if allow_symlinks is set), in

-     which case don't use O_EXCL, as it dosn't work.
+     which case don't use O_EXCL, as it doesn't work.

 
      If open fails because the file already exists, go to (6f). To avoid
      looping for ever in a situation where the file is continuously being
 
      If open fails because the file already exists, go to (6f). To avoid
      looping for ever in a situation where the file is continuously being


@@ -3128,7 +3128,7 @@ if (yield != OK)
   fcntl() call (BSDI & FreeBSD do not). */
 
   if (!isdirectory && ftruncate(fd, saved_size))
   fcntl() call (BSDI & FreeBSD do not). */
 
   if (!isdirectory && ftruncate(fd, saved_size))

-    DEBUG(D_transport) debug_printf("Error restting file size\n");
+    DEBUG(D_transport) debug_printf("Error resetting file size\n");

   }
 
 /* Handle successful writing - we want the modification time to be now for
   }
 
 /* Handle successful writing - we want the modification time to be now for

diff --git a/src/src/transports/lmtp.c b/src/src/transports/lmtp.c
index 0cc981064bc5cf75d1ba9a77a0e79b68d1954bab..c4606ef8b8c647bd096829e2ea2660f007ed589b 100644 (file)
--- a/src/src/transports/lmtp.c
+++ b/src/src/transports/lmtp.c
@@ -106,7 +106,7 @@ Arguments:
   more_errno   from the top address for use with ERRNO_FILTER_FAIL
   buffer       the LMTP response buffer
   yield        where to put a one-digit LMTP response code
   more_errno   from the top address for use with ERRNO_FILTER_FAIL
   buffer       the LMTP response buffer
   yield        where to put a one-digit LMTP response code

-  message      where to put an errror message
+  message      where to put an error message

 
 Returns:       TRUE if a "QUIT" command should be sent, else FALSE
 */
 
 Returns:       TRUE if a "QUIT" command should be sent, else FALSE
 */

diff --git a/src/src/transports/pipe.c b/src/src/transports/pipe.c
index 0535b674332103bf573922aabb8ecbb5ad4bc13b..8b87e4a95909c57ed6fd74877b9f9c111c243bcc 100644 (file)
--- a/src/src/transports/pipe.c
+++ b/src/src/transports/pipe.c
@@ -576,7 +576,7 @@ if (testflag(addr, af_pfr) && addr->local_part[0] == '|')
   {
   if (ob->force_command)
     {
   {
   if (ob->force_command)
     {

-    /* Enables expansion of $address_pipe into seperate arguments */
+    /* Enables expansion of $address_pipe into separate arguments */

     setflag(addr, af_force_command);
     cmd = ob->cmd;
     expand_arguments = TRUE;
     setflag(addr, af_force_command);
     cmd = ob->cmd;
     expand_arguments = TRUE;


@@ -1024,7 +1024,7 @@ if ((rc = child_close(pid, timeout)) != 0)
   the command that was given is a non-existent path). By default this is
   treated as just another failure, but if freeze_exec_fail is set, the reaction
   is to freeze the message rather than bounce the address. Exim used to signal
   the command that was given is a non-existent path). By default this is
   treated as just another failure, but if freeze_exec_fail is set, the reaction
   is to freeze the message rather than bounce the address. Exim used to signal

-  this failure with EX_UNAVAILABLE, which is definined in many systems as
+  this failure with EX_UNAVAILABLE, which is defined in many systems as

 
       #define EX_UNAVAILABLE  69
 
 
       #define EX_UNAVAILABLE  69
 


@@ -1062,7 +1062,7 @@ if ((rc = child_close(pid, timeout)) != 0)
       uschar *ss;
       int size, ptr, i;
 
       uschar *ss;
       int size, ptr, i;
 

-      /* If temp_errors is "*" all codes are temporary. Initializion checks
+      /* If temp_errors is "*" all codes are temporary. Initialization checks

       that it's either "*" or a list of numbers. If not "*", scan the list of
       temporary failure codes; if any match, the result is DEFER. */
 
       that it's either "*" or a list of numbers. If not "*", scan the list of
       temporary failure codes; if any match, the result is DEFER. */
 

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 527142967e9eacf824202c4573bdf9663288bfdd..8708271701c8ac7b6f5df62da9a36ef9959d2120 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -508,7 +508,7 @@ Arguments:
   more_errno     from the top address for use with ERRNO_FILTER_FAIL
   buffer         the SMTP response buffer
   yield          where to put a one-digit SMTP response code
   more_errno     from the top address for use with ERRNO_FILTER_FAIL
   buffer         the SMTP response buffer
   yield          where to put a one-digit SMTP response code

-  message        where to put an errror message
+  message        where to put an error message

   pass_message   set TRUE if message is an SMTP response
 
 Returns:         TRUE if an SMTP "QUIT" command should be sent, else FALSE
   pass_message   set TRUE if message is an SMTP response
 
 Returns:         TRUE if an SMTP "QUIT" command should be sent, else FALSE


@@ -1893,7 +1893,7 @@ set from the command line if they were set in the process that passed the
 connection on. */
 
 /*XXX continue case needs to propagate DSN_INFO, prob. in deliver.c
 connection on. */
 
 /*XXX continue case needs to propagate DSN_INFO, prob. in deliver.c

-as the contine goes via transport_pass_socket() and doublefork and exec.
+as the continue goes via transport_pass_socket() and doublefork and exec.

 It does not wait.  Unclear how we keep separate host's responses
 separate - we could match up by host ip+port as a bodge. */
 
 It does not wait.  Unclear how we keep separate host's responses
 separate - we could match up by host ip+port as a bodge. */
 


@@ -3109,7 +3109,7 @@ if (completed_address && lflags.ok && lflags.send_quit)
         }
 #endif
 
         }
 #endif
 

-      /* If the socket is successfully passed, we musn't send QUIT (or
+      /* If the socket is successfully passed, we mustn't send QUIT (or

       indeed anything!) from here. */
 
 /*XXX DSN_INFO: assume likely to do new HELO; but for greet we'll want to
       indeed anything!) from here. */
 
 /*XXX DSN_INFO: assume likely to do new HELO; but for greet we'll want to

diff --git a/src/src/transports/tf_maildir.c b/src/src/transports/tf_maildir.c
index 0fbb77243f7912b28e3a92fb55607a9575a870ed..7be72896a2bf9c1fca31b790473959476d48b60f 100644 (file)
--- a/src/src/transports/tf_maildir.c
+++ b/src/src/transports/tf_maildir.c
@@ -356,7 +356,7 @@ Or, at least, it is supposed to!
 
 Arguments:
   path             the path to the maildir directory; this is already backed-up
 
 Arguments:
   path             the path to the maildir directory; this is already backed-up

-                     to the parent if the delivery diretory is a maildirfolder
+                     to the parent if the delivery directory is a maildirfolder

   ob               the appendfile options block
   regex            a compiled regex for getting a file's size from its name
   dir_regex        a compiled regex for selecting maildir directories
   ob               the appendfile options block
   regex            a compiled regex for getting a file's size from its name
   dir_regex        a compiled regex for selecting maildir directories

diff --git a/src/src/utf8.c b/src/src/utf8.c
index e8690fc39da290006dbd5f7448780ebc88181d67..7b7b88f66ef462c4bdb7c1b3fed990cec8fdfd21 100644 (file)
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -202,7 +202,7 @@ return NULL;
 /* Whole address conversion.
 The *err string pointer should be null before the call.
 
 /* Whole address conversion.
 The *err string pointer should be null before the call.
 

-Return NULL on oeeror, with (optional) errstring pointer filled in
+Return NULL on error, with (optional) errstring pointer filled in

 */
 
 uschar *
 */
 
 uschar *

diff --git a/src/src/valgrind.h b/src/src/valgrind.h
index f16e701773c83a4a8d7c1b8b4764e793eddf69e8..01c49dae74b732887819266c5e7d2c83da9e024a 100644 (file)
--- a/src/src/valgrind.h
+++ b/src/src/valgrind.h
@@ -1271,7 +1271,7 @@ typedef
 /* NB 9 Sept 07.  There is a nasty kludge here in all these CALL_FN_
    macros.  In order not to trash the stack redzone, we need to drop
    %rsp by 128 before the hidden call, and restore afterwards.  The
 /* NB 9 Sept 07.  There is a nasty kludge here in all these CALL_FN_
    macros.  In order not to trash the stack redzone, we need to drop
    %rsp by 128 before the hidden call, and restore afterwards.  The

-   nastyness is that it is only by luck that the stack still appears
+   nastiness is that it is only by luck that the stack still appears

    to be unwindable during the hidden call - since then the behaviour
    of any routine using this macro does not match what the CFI data
    says.  Sigh.
    to be unwindable during the hidden call - since then the behaviour
    of any routine using this macro does not match what the CFI data
    says.  Sigh.


@@ -4493,7 +4493,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...)
 
 
 /* These requests allow control to move from the simulated CPU to the
 
 
 /* These requests allow control to move from the simulated CPU to the

-   real CPU, calling an arbitary function.
+   real CPU, calling an arbitrary function.

 
    Note that the current ThreadId is inserted as the first argument.
    So this call:
 
    Note that the current ThreadId is inserted as the first argument.
    So this call:

diff --git a/src/src/verify.c b/src/src/verify.c
index 0959b00512832edfad2f109fa2cad2b87591ac24..0e31ee8b564bd42998ecb71b6dd0b298fddae5f3 100644 (file)
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -385,7 +385,7 @@ else
   callout and save the result in the cache for next time, unless no_cache is set,
   or unless we have a previously cached negative random result. If we are to test
   with a random local part, ensure that such a local part is available. If not,
   callout and save the result in the cache for next time, unless no_cache is set,
   or unless we have a previously cached negative random result. If we are to test
   with a random local part, ensure that such a local part is available. If not,

-  log the fact, but carry on without randomming. */
+  log the fact, but carry on without randomising. */

 
   if (options & vopt_callout_random && callout_random_local_part != NULL)
     if (!(random_local_part = expand_string(callout_random_local_part)))
 
   if (options & vopt_callout_random && callout_random_local_part != NULL)
     if (!(random_local_part = expand_string(callout_random_local_part)))


@@ -1262,7 +1262,7 @@ can do it there for the non-rcpt-verify case.  For this we keep an addresscount.
 
     /* End the SMTP conversation and close the connection. */
 
 
     /* End the SMTP conversation and close the connection. */
 

-    /* Cutthrough - on a successfull connect and recipient-verify with
+    /* Cutthrough - on a successful connect and recipient-verify with

     use-sender and we are 1st rcpt and have no cutthrough conn so far
     here is where we want to leave the conn open */
     if (  cutthrough.delivery
     use-sender and we are 1st rcpt and have no cutthrough conn so far
     here is where we want to leave the conn open */
     if (  cutthrough.delivery


@@ -2526,7 +2526,7 @@ return yield;
 *      Check header names for 8-bit characters   *
 *************************************************/
 
 *      Check header names for 8-bit characters   *
 *************************************************/
 

-/* This function checks for invalid charcters in header names. See
+/* This function checks for invalid characters in header names. See

 RFC 5322, 2.2. and RFC 6532, 3.
 
 Arguments:
 RFC 5322, 2.2. and RFC 6532, 3.
 
 Arguments:


@@ -3107,7 +3107,7 @@ if (*ss == '@')
   }
 
 /* If the pattern is an IP address, optionally followed by a bitmask count, do
   }
 
 /* If the pattern is an IP address, optionally followed by a bitmask count, do

-a (possibly masked) comparision with the current IP address. */
+a (possibly masked) comparison with the current IP address. */

 
 if (string_is_ip_address(ss, &maskoffset) != 0)
   return (host_is_in_net(cb->host_address, ss, maskoffset)? OK : FAIL);
 
 if (string_is_ip_address(ss, &maskoffset) != 0)
   return (host_is_in_net(cb->host_address, ss, maskoffset)? OK : FAIL);


@@ -3622,7 +3622,7 @@ else
     (void)tree_insertnode(&dnsbl_cache, t);
     }
 
     (void)tree_insertnode(&dnsbl_cache, t);
     }
 

-  /* Do the DNS loopup . */
+  /* Do the DNS lookup . */

 
   HDEBUG(D_dnsbl) debug_printf("new DNS lookup for %s\n", query);
   cb->rc = dns_basic_lookup(&dnsa, query, T_A);
 
   HDEBUG(D_dnsbl) debug_printf("new DNS lookup for %s\n", query);
   cb->rc = dns_basic_lookup(&dnsa, query, T_A);

diff --git a/src/util/mkcdb.pl b/src/util/mkcdb.pl
index 2486e8f5dab3406d41f562b39c63fd21cf019f9c..16827c63b6794553adaf7efbfe0bc5fca1d876a9 100755 (executable)
--- a/src/util/mkcdb.pl
+++ b/src/util/mkcdb.pl
@@ -9,7 +9,7 @@
 # Little Perl script to convert flat file into CDB file. Two advantages over
 # cdbmake-12 awk script that is distributed with CDB:
 #  1) Handles 'dpc22:dpc22@hermes' as well as 'dpc22 dpc22@hermes'
 # Little Perl script to convert flat file into CDB file. Two advantages over
 # cdbmake-12 awk script that is distributed with CDB:
 #  1) Handles 'dpc22:dpc22@hermes' as well as 'dpc22 dpc22@hermes'

-#  2) Perl works with arbitary length strings: awk chokes at 1,024 chars
+#  2) Perl works with arbitrary length strings: awk chokes at 1,024 chars

 #
 # Cambridge: hermes/src/admin/mkcdb,v 1.9 2005/02/15 18:14:12 fanf2 Exp
 
 #
 # Cambridge: hermes/src/admin/mkcdb,v 1.9 2005/02/15 18:14:12 fanf2 Exp
 

diff --git a/test/Makefile.in b/test/Makefile.in
index 0c8d9b71cd310c41425ca2a913ba19f6f43323e7..3d7810c8bbd4f47f9ee0f1a0e9ef65ada1111668 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -33,7 +33,7 @@ makebin:;       @if [ ! -e bin ] ; then mkdir bin 2>/dev/null; echo ""; fi
 # bin/client          an SMTP script-driven client, without TLS support
 # bin/client-gnutls   ditto, with GnuTLS support
 # bin/client-ssl      ditto, with OpenSSL support
 # bin/client          an SMTP script-driven client, without TLS support
 # bin/client-gnutls   ditto, with GnuTLS support
 # bin/client-ssl      ditto, with OpenSSL support

-# bin/fakens          a fake namserver
+# bin/fakens          a fake nameserver

 # bin/fd              output details of open file descriptors
 # bin/iefbr14         a program that does nothing and returns 0
 # bin/loaded          a dynamically loaded test module
 # bin/fd              output details of open file descriptors
 # bin/iefbr14         a program that does nothing and returns 0
 # bin/loaded          a dynamically loaded test module

diff --git a/test/README b/test/README
index a600756be0c12f55067159264d3c138f9873ef0a..38972042fa8b5b9f8b27bb21099fe9f2422ba6b4 100644 (file)
--- a/test/README
+++ b/test/README
@@ -269,7 +269,7 @@ There are some options for the ./runtest script itself:
             This allows "overrides" for the test results. It's intended
             use is to deal with distro specific differences in the test
             output. The default flavour is "FOO" if autodetection fails.
             This allows "overrides" for the test results. It's intended
             use is to deal with distro specific differences in the test
             output. The default flavour is "FOO" if autodetection fails.

-            (Autodection is possible for known flavours only. Known
+            (Autodetection is possible for known flavours only. Known

             flavours are computed after file name extensions in stdout/*
             and stderr/*.)
 
             flavours are computed after file name extensions in stdout/*
             and stderr/*.)
 


@@ -416,7 +416,7 @@ after doing any further comparisons that may be necessary.
 
 Other circumstances give rise to other prompts. If a test generates output for
 which there is no saved data, the prompt (after a message stating which file is
 
 Other circumstances give rise to other prompts. If a test generates output for
 which there is no saved data, the prompt (after a message stating which file is

-unexpectely not empty) is:
+unexpectedly not empty) is:

 
   Continue, Show, or Quit? [Q]
 
 
   Continue, Show, or Quit? [Q]
 


@@ -685,7 +685,7 @@ just one command:
 
 The expected return code in this case is 1, and the data lines are passed to
 Exim on its standard input. Both the command line and the data lines have the
 
 The expected return code in this case is 1, and the data lines are passed to
 Exim on its standard input. Both the command line and the data lines have the

-standard substitions applied to them. Thus, HOSTNAME in the example above will
+standard substitutions applied to them. Thus, HOSTNAME in the example above will

 be replaced by the local host's name. Long commands can be continued over
 several lines by using \ as a continuation character. This does *not* apply to
 data lines.
 be replaced by the local host's name. Long commands can be continued over
 several lines by using \ as a continuation character. This does *not* apply to
 data lines.


@@ -778,7 +778,7 @@ found, the entire script is skipped, and a comment is output.
   need_largefiles
 
 This command must be at the head of a script. If the Exim binary does not
   need_largefiles
 
 This command must be at the head of a script. If the Exim binary does not

-suppport large files (off_t is <= 4), the entire script is skipped, and a
+support large files (off_t is <= 4), the entire script is skipped, and a

 comment is output.
 
 
 comment is output.
 
 


@@ -884,7 +884,7 @@ When OpenSSL is available on the host, an alternative version of the client
 program is compiled, one that supports TLS using OpenSSL. The additional
 arguments specify a certificate and key file when required for the connection.
 There are two additional options: -tls-on-connect, that causes the client to
 program is compiled, one that supports TLS using OpenSSL. The additional
 arguments specify a certificate and key file when required for the connection.
 There are two additional options: -tls-on-connect, that causes the client to

-initiate TLS negociation immediately on connection; -ocsp that causes the TLS
+initiate TLS negotiation immediately on connection; -ocsp that causes the TLS

 negotiation to include a certificate-status request.  The latter takes a
 filename argument, the CA info for verifying the stapled response.
 
 negotiation to include a certificate-status request.  The latter takes a
 filename argument, the CA info for verifying the stapled response.
 


@@ -1135,7 +1135,7 @@ indicating that they are specific to that one test. A few fixed files (for
 example, some TLS certificates) are used by more than one test, and so their
 names are not of this form.
 
 example, some TLS certificates) are used by more than one test, and so their
 names are not of this form.
 

-There are also some auxilary DNS zone files, which are described in the next
+There are also some auxiliary DNS zone files, which are described in the next

 section.
 
 
 section.
 
 

diff --git a/test/runtest b/test/runtest
index bbb46542af84cda4b0ffb6010941ae9693087a99..6721f1daad2a2ddac70df725bb45f83c266abad3 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -968,7 +968,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     }
     next if /^tls_validate_require_cipher child \d+ ended: status=0x0/;
 
     }
     next if /^tls_validate_require_cipher child \d+ ended: status=0x0/;
 

-    # We invoke Exim with -D, so we hit this new messag as of Exim 4.73:
+    # We invoke Exim with -D, so we hit this new message as of Exim 4.73:

     next if /^macros_trusted overridden to true by whitelisting/;
 
     # We have to omit the localhost ::1 address so that all is well in
     next if /^macros_trusted overridden to true by whitelisting/;
 
     # We have to omit the localhost ::1 address so that all is well in


@@ -1789,7 +1789,7 @@ system("$cmd");
 # The <SCRIPT> file is open for us to read an optional return code line,
 # followed by the command line and any following data lines for stdin. The
 # command line can be continued by the use of \. Data lines are not continued
 # The <SCRIPT> file is open for us to read an optional return code line,
 # followed by the command line and any following data lines for stdin. The
 # command line can be continued by the use of \. Data lines are not continued

-# in this way. In all lines, the following substutions are made:
+# in this way. In all lines, the following substitutions are made:

 #
 # DIR    => the current directory
 # CALLER => the caller of this script
 #
 # DIR    => the current directory
 # CALLER => the caller of this script


@@ -1798,14 +1798,14 @@ system("$cmd");
 #            reference to the subtest number, holding previous value
 #            reference to the expected return code value
 #            reference to where to put the command name (for messages)
 #            reference to the subtest number, holding previous value
 #            reference to the expected return code value
 #            reference to where to put the command name (for messages)

-#            auxilliary information returned from a previous run
+#            auxiliary information returned from a previous run

 #
 #

-# Returns:   0 the commmand was executed inline, no subprocess was run
+# Returns:   0 the command was executed inline, no subprocess was run

 #            1 a non-exim command was run and waited for
 #            2 an exim command was run and waited for
 #            3 a command was run and not waited for (daemon, server, exim_lock)
 #            4 EOF was encountered after an initial return code line
 #            1 a non-exim command was run and waited for
 #            2 an exim command was run and waited for
 #            3 a command was run and not waited for (daemon, server, exim_lock)
 #            4 EOF was encountered after an initial return code line

-# Optionally alse a second parameter, a hash-ref, with auxilliary information:
+# Optionally also a second parameter, a hash-ref, with auxiliary information:

 #            exim_pid: pid of a run process
 #            munge: name of a post-script results munger
 
 #            exim_pid: pid of a run process
 #            munge: name of a post-script results munger
 


@@ -2808,7 +2808,7 @@ if (defined $parm_support{Content_Scanning})
     # This test for an active SpamAssassin is courtesy of John Jetmore.
     # The tests are hard coded to localhost:783, so no point in making
     # this test flexible like the clamav test until the test scripts are
     # This test for an active SpamAssassin is courtesy of John Jetmore.
     # The tests are hard coded to localhost:783, so no point in making
     # this test flexible like the clamav test until the test scripts are

-    # changed.  spamd doesn't have the nice PING/PONG protoccol that
+    # changed.  spamd doesn't have the nice PING/PONG protocol that

     # clamd does, but it does respond to errors in an informative manner,
     # so use that.
 
     # clamd does, but it does respond to errors in an informative manner,
     # so use that.
 

diff --git a/test/src/fakens.c b/test/src/fakens.c
index e4584c4df715f25ef90fc90752a3d99ca199177a..0806136cc99a87ba437e6e8c173ade1c2a03d413 100644 (file)
--- a/test/src/fakens.c
+++ b/test/src/fakens.c
@@ -25,7 +25,7 @@ The arguments to the program are:
   the DNS record type that is being sought
 
 The output from the program is written to stdout. It is supposed to be in
   the DNS record type that is being sought
 
 The output from the program is written to stdout. It is supposed to be in

-exactly the same format as a traditional namserver response (see RFC 1035) so
+exactly the same format as a traditional nameserver response (see RFC 1035) so

 that Exim can process it as normal. At present, no compression is used.
 Error messages are written to stderr.
 
 that Exim can process it as normal. At present, no compression is used.
 Error messages are written to stderr.
 


@@ -382,7 +382,7 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL)
       rr_sec = TRUE;
       p += 7;
       }
       rr_sec = TRUE;
       p += 7;
       }

-    else if (Ustrncmp(p, US"AA ", 3) == 0)      /* tagged as authoritive */
+    else if (Ustrncmp(p, US"AA ", 3) == 0)      /* tagged as authoritative */

       {
       rr_aa = TRUE;
       p += 3;
       {
       rr_aa = TRUE;
       p += 3;


@@ -773,8 +773,8 @@ if (yield == NO_RECOVERY) goto END_OFF;
 header->ancount = htons(count);
 
 /* If the AA bit should be set (as indicated by the AA prefix in the zone file),
 header->ancount = htons(count);
 
 /* If the AA bit should be set (as indicated by the AA prefix in the zone file),

-we are expected to return some records in the authortive section. Bind9: If
-there is data in the answer section, the authoritive section contains the NS
+we are expected to return some records in the authoritative section. Bind9: If
+there is data in the answer section, the authoritative section contains the NS

 records, otherwise it contains the SOA record.  Currently we mimic this
 behaviour for the first case (there is some answer record).
 */
 records, otherwise it contains the SOA record.  Currently we mimic this
 behaviour for the first case (there is some answer record).
 */

diff --git a/test/src/server.c b/test/src/server.c
index 9d00300f13790fbbc4353086b6ae15a81d8eb006..ce55c5c377ac716be3f875b7c683eed0fb56d9b5 100644 (file)
--- a/test/src/server.c
+++ b/test/src/server.c
@@ -661,7 +661,7 @@ for (count = 0; count < connection_count; count++)
          n = dlen < sizeof(buffer) ? dlen : sizeof(buffer);
          if ((n = read(dup_accept_socket, CS buffer, n)) == 0)
            {
          n = dlen < sizeof(buffer) ? dlen : sizeof(buffer);
          if ((n = read(dup_accept_socket, CS buffer, n)) == 0)
            {

-           printf("Unxpected EOF read from client\n");
+           printf("Unexpected EOF read from client\n");

            s = s->next;
            goto END_OFF;
            }
            s = s->next;
            goto END_OFF;
            }


@@ -671,7 +671,7 @@ for (count = 0; count < connection_count; count++)
        while (dlen-- > 0)
          if (fgetc(in) == EOF)
            {
        while (dlen-- > 0)
          if (fgetc(in) == EOF)
            {

-           printf("Unxpected EOF read from client\n");
+           printf("Unexpected EOF read from client\n");

            s = s->next;
            goto END_OFF;
            }
            s = s->next;
            goto END_OFF;
            }