summaryrefslogtreecommitdiff
path: root/doc/doc-txt
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-06-26 12:10:03 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2022-06-26 12:21:08 +0100
commit9f1a75f126ae217a3a3568b106c9133b3c5c413a (patch)
tree9a7ac8fe4c827c981b49946260ea0d1aa1e5524d /doc/doc-txt
parent57318bfd2312ea561661906ca8001bd74a01b312 (diff)
parent89318c714454e11217505d2163d807d5d827f50a (diff)
downloadexim4-9f1a75f126ae217a3a3568b106c9133b3c5c413a.tar.gz
Merge branch '4.next'4.next
Diffstat (limited to 'doc/doc-txt')
-rw-r--r--doc/doc-txt/ChangeLog12
-rw-r--r--doc/doc-txt/OptionLists.txt1
2 files changed, 13 insertions, 0 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 3e6da9185..02ea32aa3 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -2,6 +2,18 @@ This document describes *changes* to previous versions, that might
affect Exim's operation, with an unchanged configuration file. For new
options, and new features, see the NewStuff file next to this ChangeLog.
+Exim version 4.97
+-----------------
+
+JH/01 The hosts_connection_nolog main option now also controls "no MAIL in
+ SMTP connection" log lines.
+
+JH/02 Option default value updates:
+ - queue_fast_ramp (main) true (was false)
+ - remote_max_parallel (main) 4 (was 2)
+
+JH/03 Cache static regex pattern compilations, for use by ACLs.
+
Exim version 4.96
-----------------
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 55b0f36fc..ee62cad48 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -420,6 +420,7 @@ optional boolean false iplookup
oracle_servers string unset main 4.00
owners string list unset redirect 4.00
owngroups string list unset redirect 4.00
+panic_coredump boolean false main 4.96
pass_on_timeout boolean false routers 4.00
pass_router string unset routers 4.00
path string "/usr/bin" pipe