summaryrefslogtreecommitdiff
path: root/doc/doc-txt
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-08 16:10:46 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-08 16:10:46 +0000
commit064a94c915ab9d962a876049ed864a56dc2c7af4 (patch)
treebfe823015d699d653670bbaaa51fdac6dba25dea /doc/doc-txt
parentea49d0e16fbc6f56fc5b8519d266f88d09139187 (diff)
Don't add From: or Reply-To: to quota warning messages if they are
provided by quota_warn_message.
Diffstat (limited to 'doc/doc-txt')
-rw-r--r--doc/doc-txt/ChangeLog6
-rw-r--r--doc/doc-txt/NewStuff8
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f8f046b68..dd11682f1 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.287 2006/02/08 14:28:51 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.288 2006/02/08 16:10:46 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -102,6 +102,10 @@ PH/17 If a delivery to a pipe, file, or autoreply was deferred, Exim was not
using the correct key (the original address) when searching the retry
rules in order to find which one to use for generating the retry hint.
+PH/18 If quota_warn_message contains a From: header, Exim now refrains from
+ adding the default one. Similarly, if it contains a Reply-To: header, the
+ errors_reply_to option, if set, is not used.
+
Exim version 4.60
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 2aab4af8d..83e44d836 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.80 2005/12/12 15:58:53 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.81 2006/02/08 16:10:46 ph10 Exp $
New Features in Exim
--------------------
@@ -20,7 +20,7 @@ PH/01 There is a new global option called disable_ipv6, which does exactly what
data, etc. are also ignored. If IP literals are enabled, the ipliteral
router declines to handle IPv6 literal addresses.
-PH/01 There are now 20 of each type of ACL variable by default (instead of 10).
+PH/02 There are now 20 of each type of ACL variable by default (instead of 10).
It is also possible to change the numbers by setting ACL_CVARS and/or
ACL_MVARS in Local/Makefile. Backward compatibility is maintained if you
upgrade to this release with existing messages containing ACL variable
@@ -28,6 +28,10 @@ PH/01 There are now 20 of each type of ACL variable by default (instead of 10).
(downgrading) will not be compatible; the values of ACL variables will be
lost.
+PH/03 If quota_warn_message contains a From: header, Exim now refrains from
+ adding the default one. Similarly, if it contains a Reply-To: header, the
+ errors_reply_to option, if set, is not used.
+
Version 4.60
------------