Make smtp_receive_timeout main option expanded. Bug 564

[users/heiko/exim.git] / doc / doc-src / FAQ.src

diff --git a/doc/doc-src/FAQ.src b/doc/doc-src/FAQ.src
index 461b1a608c0d133339a5f9740437762116af767e..03360be6a125ea8b456939d501362cbb172c820c 100644 (file)
--- a/doc/doc-src/FAQ.src
+++ b/doc/doc-src/FAQ.src
@@ -1,4 +1,3 @@
-## $Cambridge: exim/doc/doc-src/FAQ.src,v 1.8 2009/11/05 19:37:00 nm4 Exp $

 ##
 ## This file is processed by Perl scripts to produce an ASCII and an HTML
 ## version. Lines starting with ## are omitted. The markup used with paragraphs
 ##
 ## This file is processed by Perl scripts to produce an ASCII and an HTML
 ## version. Lines starting with ## are omitted. The markup used with paragraphs


@@ -851,7 +850,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
 
        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.
 
        is set in \(Local/Makefile)\ and the corresponding file contains a
        prefix which matches the alternative configuration file being used.
 


@@ -1155,7 +1154,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.
 
        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
        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