X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/23c7ff99864ed699b3c6e547c1396a02eb6e4b73..2e2a30b495b1ef8052259093f9422f57903b1717:/doc/doc-txt/OptionLists.txt diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 42d1d267f..ac1e06a11 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -1,9 +1,9 @@ -$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.3 2004/11/04 10:42:11 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.8 2005/05/03 14:20:00 ph10 Exp $ LISTS OF EXIM OPTIONS --------------------- -This file contains complete lists of three kinds of Exim option: +This file contains complete lists of four kinds of Exim option: 1. Those that can appear in the run time configuration file; 2. Those that can be used on the command line; @@ -11,7 +11,7 @@ This file contains complete lists of three kinds of Exim option: 4. Those that can appear in the build time configuration for the Exim monitor (Local/eximon.conf). -This file was last updated for Exim release 4.40. +This file was last updated for Exim release 4.51. 1. RUN TIME OPTIONS @@ -52,6 +52,7 @@ in fact some of them were inherited from earlier versions. ----------------------------------------------------------------------------------------- accept_8bitmime boolean false main 1.60 acl_not_smtp string* unset main 4.11 +acl_not_smtp_mime string* unset main 4.51 with content scan acl_smtp_auth string* unset main 4.00 acl_smtp_connect string* unset main 4.11 acl_smtp_data string* unset main 4.00 @@ -60,6 +61,7 @@ acl_smtp_expn string* unset main acl_smtp_helo string* unset main 4.20 acl_smtp_mail string* unset main 4.11 acl_smtp_mailauth string* unset main 4.21 +acl_smtp_mime string* unset main 4.50 with content scan acl_smtp_predata string* unset main 4.43 acl_smtp_quit string* unset main 4.43 acl_smtp_rcpt string* unset main 4.00 @@ -83,6 +85,7 @@ auth_advertise_hosts host list "*" main authenticated_sender string* unset smtp 4.14 authenticate_hosts host list unset smtp 3.13 auto_thaw time 0s main +av_scanner string* + main 4.50 with content scan batch_id string unset appendfile 4.00 unset lmtp 4.00 unset pipe 4.00 @@ -247,6 +250,7 @@ hosts_avoid_esmtp host list unset smtp hosts_avoid_tls host list unset smtp 3.20 hosts_connection_nolog host list unset main 4.43 hosts_max_try integer 5 smtp 3.20 +hosts_max_try_hardlimit integer 50 smtp 4.50 hosts_nopass_tls host list unset smtp 4.00 hosts_override boolean false smtp 2.11 hosts_randomize boolean false manualroute 4.00 @@ -465,6 +469,7 @@ smtp_receive_timeout time 5m main smtp_reserve_hosts host list unset main smtp_return_error_details boolean false main 4.11 socket string* unset lmtp 4.11 +spamd_address string + main 4.50 with content scan split_spool_directory boolean false main 1.70 spool_directory string ++ main srv_fail_domains domain list unset dnslookup 4.43 @@ -492,6 +497,7 @@ timeout time 5m lmtp 1h pipe 1h queryprogram 4.00 5s iplookup 4.00 +timeout_defer boolean false pipe 4.51 timeout_frozen_after time 0s main 3.20 timezone string + main 3.15 tls_advertise_hosts host list * main 3.20 @@ -589,7 +595,8 @@ provide compatibility with Sendmail. -bvs Test sender address verification -C + Use alternate configuration file -D + Define macro for configuration file --d Turn on debugging output +-d + Turn on debugging output +-dd + Ditto, but if a daemon, not for subprocesses -dropcr Remove CR character in input: became a no-op in 4.21 -E Internal use only -ex * Synonym for -oex (for several different x)