Merge branch 'master' of ssh://git.exim.org/home/git/exim

diff --git a/doc/doc-src/FAQ.src b/doc/doc-src/FAQ.src
index 461b1a608c0d133339a5f9740437762116af767e..a132911b5b13949842d515778df740a5ee2dc46b 100644 (file)
--- a/doc/doc-src/FAQ.src
+++ b/doc/doc-src/FAQ.src
@@ -851,7 +851,7 @@ A0044: Exim has been unable to create a file in its spool area in which to
 
        If you are running Exim with an alternate configuration file using a
        command such as \"exim -C altconfig..."\, remember that the use of -C
-       takes away Exim's root privilege, unless \\TRUSTED_CONFIG_PREFIX_FILE\\
+       takes away Exim's root privilege, unless \\TRUSTED_CONFIG_LIST\\
        is set in \(Local/Makefile)\ and the corresponding file contains a
        prefix which matches the alternative configuration file being used.
 
@@ -1155,7 +1155,7 @@ A0065: When Exim is called with -C, it passes on -C to any instances of itself
        includes the case where Exim re-execs itself to regain root privilege.
        Thus it can't write to the spool.
 
-       The fix for this is to use the \\TRUSTED_CONFIG_PREFIX_LIST\\ build-time
+       The fix for this is to use the \\TRUSTED_CONFIG_LIST\\ build-time
        option. This defines a file containing a list of 'trusted' prefixes for
        configuration files. Any configuration file specified with -C, if it
        matches a prefix listed in that file, will be used without dropping root

diff --git a/src/src/EDITME b/src/src/EDITME
index 1bb60be2103c7d377fb4e521163a03f622f88b6f..3c162c94ab34fc27559f5d5bad03b819d0989838 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -498,7 +498,7 @@ FIXED_NEVER_USERS=root
 # to override values with -D and assumes that these will be passed through to
 # the delivery processes.  As of Exim 4.73, this is no longer the case by
 # default.  Going forward, we strongly recommend that you use a shim Exim
-# configuration file owned by root stored under TRUSTED_CONFIG_PREFIX_LIST.
+# configuration file owned by root stored under TRUSTED_CONFIG_LIST.
 # That shim can set macros before .include'ing your main configuration file.
 #
 # As a strictly transient measure to ease migration to 4.73, the