Typo fix.

messsage -> message
receved -> received

Found/reported by Vincent Lefevre in <https://bugs.debian.org/819482>.

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 7dc05c64a8273974822b5d33193579ac275c98d6..6185536b91e8a48be715f8cef306eb93f5fda6d7 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -14170,7 +14170,7 @@ If the message being returned has lines longer than this value it is
 treated as if the &%bounce_return_size_limit%& (below) restriction was exceeded.
 
 The option also applies to bounces returned when an error is detected
 treated as if the &%bounce_return_size_limit%& (below) restriction was exceeded.
 
 The option also applies to bounces returned when an error is detected

-during reception of a messsage.
+during reception of a message.

 In this case lines from the original are truncated.
 
 The option does not apply to messages generated by an &(autoreply)& transport.
 In this case lines from the original are truncated.
 
 The option does not apply to messages generated by an &(autoreply)& transport.

diff --git a/doc/doc-src/FAQ.src b/doc/doc-src/FAQ.src
index 03360be6a125ea8b456939d501362cbb172c820c..9280e0314e9ba85d43c109b279523fa77a998d74 100644 (file)
--- a/doc/doc-src/FAQ.src
+++ b/doc/doc-src/FAQ.src
@@ -2316,7 +2316,7 @@ A0310: If a DNS lookup returns no MXs, Exim looks for an address record, in
 
 
 Q0311: When a DNS lookup for MX records fails to complete, why doesn't Exim
 
 
 Q0311: When a DNS lookup for MX records fails to complete, why doesn't Exim

-       send the messsage to the host defined by the A record?
+       send the message to the host defined by the A record?

 
 A0311: The RFCs are quite clear on this. Only if it is known that there are no
        MX records is an MTA allowed to make use of the A record. When an MX
 
 A0311: The RFCs are quite clear on this. Only if it is known that there are no
        MX records is an MTA allowed to make use of the A record. When an MX

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 80c92a536193aa9724dafc9e7df372a37f51e6aa..4c42c75a4eb0c2c1a2676cd5950d5256a9ec4d3d 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -269,7 +269,7 @@ Version 4.82
     "aaaa" and "a" lookups is done and the full set of results returned.
 
 14. New expansion variable $headers_added with content from ACL add_header
     "aaaa" and "a" lookups is done and the full set of results returned.
 
 14. New expansion variable $headers_added with content from ACL add_header

-    modifier (but not yet added to messsage).
+    modifier (but not yet added to message).

 
 15. New 8bitmime status logging option for received messages.  Log field "M8S".
 
 
 15. New 8bitmime status logging option for received messages.  Log field "M8S".
 

diff --git a/src/src/configure.default b/src/src/configure.default
index e5feb7751a4e9d6c52b6719d3c541f9671f11983..3c8cf97ed7a10fb88354897263d719f37ff20943 100644 (file)
--- a/src/src/configure.default
+++ b/src/src/configure.default
@@ -707,8 +707,8 @@ begin transports
 
 
 # This transport is used for delivering messages over SMTP connections.
 
 
 # This transport is used for delivering messages over SMTP connections.

-# Refuse to send any messsage with over-long lines, which could have
-# been receved other than via SMTP. The use of message_size_limit to
+# Refuse to send any message with over-long lines, which could have
+# been received other than via SMTP. The use of message_size_limit to

 # enforce this is a red herring.
 
 remote_smtp:
 # enforce this is a red herring.
 
 remote_smtp:

diff --git a/src/src/globals.h b/src/src/globals.h
index b7f9c348998ab42e1555399fef32919b8a951420..b83f9fe8a6f034012e016a4fce15c2e4ed6f6ec4 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -193,7 +193,7 @@ extern uschar *acl_smtp_starttls;      /* ACL run for STARTTLS */
 extern uschar *acl_smtp_vrfy;          /* ACL run for VRFY */
 extern BOOL    acl_temp_details;       /* TRUE to give details for 4xx error */
 extern tree_node *acl_var_c;           /* ACL connection variables */
 extern uschar *acl_smtp_vrfy;          /* ACL run for VRFY */
 extern BOOL    acl_temp_details;       /* TRUE to give details for 4xx error */
 extern tree_node *acl_var_c;           /* ACL connection variables */

-extern tree_node *acl_var_m;           /* ACL messsage variables */
+extern tree_node *acl_var_m;           /* ACL message variables */

 extern uschar *acl_verify_message;     /* User message for verify failure */
 extern string_item *acl_warn_logged;   /* Logged lines */
 extern uschar *acl_wherecodes[];       /* Response codes for ACL fails */
 extern uschar *acl_verify_message;     /* User message for verify failure */
 extern string_item *acl_warn_logged;   /* Logged lines */
 extern uschar *acl_wherecodes[];       /* Response codes for ACL fails */

diff --git a/src/src/receive.c b/src/src/receive.c
index 6b69bcb2a602461357946ceb002710db8f266253..f4b3d7824f5882d3b0a3355f420037252164e724 100644 (file)
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -1292,7 +1292,7 @@ else if (rc != OK)
   if (  smtp_input
      && smtp_handle_acl_fail(ACL_WHERE_MIME, rc, user_msg, log_msg) != 0)
     {
   if (  smtp_input
      && smtp_handle_acl_fail(ACL_WHERE_MIME, rc, user_msg, log_msg) != 0)
     {

-    *smtp_yield_ptr = FALSE;    /* No more messsages after dropped connection */
+    *smtp_yield_ptr = FALSE;    /* No more messages after dropped connection */

     *smtp_reply_ptr = US"";     /* Indicate reply already sent */
     }
   message_id[0] = 0;            /* Indicate no message accepted */
     *smtp_reply_ptr = US"";     /* Indicate reply already sent */
     }
   message_id[0] = 0;            /* Indicate no message accepted */


@@ -3275,7 +3275,7 @@ else
             {
             Uunlink(spool_name);
             if (smtp_handle_acl_fail(ACL_WHERE_DKIM, rc, user_msg, log_msg) != 0)
             {
             Uunlink(spool_name);
             if (smtp_handle_acl_fail(ACL_WHERE_DKIM, rc, user_msg, log_msg) != 0)

-              smtp_yield = FALSE;    /* No more messsages after dropped connection */
+              smtp_yield = FALSE;    /* No more messages after dropped connection */

             smtp_reply = US"";       /* Indicate reply already sent */
             message_id[0] = 0;       /* Indicate no message accepted */
             goto TIDYUP;             /* Skip to end of function */
             smtp_reply = US"";       /* Indicate reply already sent */
             message_id[0] = 0;       /* Indicate no message accepted */
             goto TIDYUP;             /* Skip to end of function */


@@ -3393,7 +3393,7 @@ else
        dcc_ok = 0;
 #endif
         if (smtp_handle_acl_fail(ACL_WHERE_DATA, rc, user_msg, log_msg) != 0)
        dcc_ok = 0;
 #endif
         if (smtp_handle_acl_fail(ACL_WHERE_DATA, rc, user_msg, log_msg) != 0)

-          smtp_yield = FALSE;    /* No more messsages after dropped connection */
+          smtp_yield = FALSE;    /* No more messages after dropped connection */

         smtp_reply = US"";       /* Indicate reply already sent */
         message_id[0] = 0;       /* Indicate no message accepted */
         goto TIDYUP;             /* Skip to end of function */
         smtp_reply = US"";       /* Indicate reply already sent */
         message_id[0] = 0;       /* Indicate no message accepted */
         goto TIDYUP;             /* Skip to end of function */


@@ -3987,7 +3987,7 @@ for this message. */
 */
 if(cutthrough.fd >= 0)
   {
 */
 if(cutthrough.fd >= 0)
   {

-  uschar * msg= cutthrough_finaldot(); /* Ask the target system to accept the messsage */
+  uschar * msg= cutthrough_finaldot(); /* Ask the target system to accept the message */

                                        /* Logging was done in finaldot() */
   switch(msg[0])
     {
                                        /* Logging was done in finaldot() */
   switch(msg[0])
     {

diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index 638190f84cc32111e00b26c5d3034b9e324d29c7..ad12d1a94b762b578171adcb15296c9b205822b1 100644 (file)
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -498,7 +498,7 @@ then removing the old links. When moving messages onto the main spool, the -H
 file should be set up last, because that's the one that tells Exim there is a
 message to be delivered, so we create its new link last and remove its old link
 first. Programs that look at the alternate directories should follow the same
 file should be set up last, because that's the one that tells Exim there is a
 message to be delivered, so we create its new link last and remove its old link
 first. Programs that look at the alternate directories should follow the same

-rule of waiting for a -H file before doing anything. When moving messsages off
+rule of waiting for a -H file before doing anything. When moving messages off

 the mail spool, the -D file should be open and locked at the time, thus keeping
 Exim's hands off. */
 
 the mail spool, the -D file should be open and locked at the time, thus keeping
 Exim's hands off. */