summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNigel Metheringham <nigel@exim.org>2010-03-05 16:08:14 +0000
committerNigel Metheringham <nigel@exim.org>2010-03-05 16:08:14 +0000
commit5a1a584503da8218be7759637e7caa1cb169e1a7 (patch)
tree48f25e4f2c92b1216fc0d302f40ae745a0ea5435
parentbb576ff7109d75428c71b7c65e5124706f730482 (diff)
Documentation fix for max_rcpts. Fixes: #955
-rw-r--r--doc/doc-docbook/spec.xfpt6
-rw-r--r--doc/doc-txt/ChangeLog5
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 41565d484..cba865032 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -1,4 +1,4 @@
-. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.70 2010/01/04 19:35:49 nm4 Exp $
+. $Cambridge: exim/doc/doc-docbook/spec.xfpt,v 1.71 2010/03/05 16:08:14 nm4 Exp $
.
. /////////////////////////////////////////////////////////////////////////////
. This is the primary source of the Exim Manual. It is an xfpt document that is
@@ -30307,8 +30307,8 @@ If a message contains a number of different addresses, all those with the same
characteristics (for example, the same envelope sender) that resolve to the
same set of hosts, in the same order, are sent in a single SMTP transaction,
even if they are for different domains, unless there are more than the setting
-of the &%max_rcpts%& option in the &(smtp)& transport allows, in which case
-they are split into groups containing no more than &%max_rcpts%& addresses
+of the &%max_rcpt%&s option in the &(smtp)& transport allows, in which case
+they are split into groups containing no more than &%max_rcpt%&s addresses
each. If &%remote_max_parallel%& is greater than one, such groups may be sent
in parallel sessions. The order of hosts with identical MX values is not
significant when checking whether addresses can be batched in this way.
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 7cff2c529..ded8fb8bf 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.603 2010/03/05 16:05:02 nm4 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.604 2010/03/05 16:08:15 nm4 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -15,6 +15,9 @@ NM/01 Bugzilla 965: Support mysql stored procedures.
NM/02 Bugzilla 961: Spacing fix (syntax error) on Makefile directives for NetBSD
+NM/03 Bugzilla 955: Documentation fix for max_rcpts.
+ Patch from Andreas Metzler
+
Exim version 4.71
-----------------