X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f324b55dcd5a95ce8273f6f368d03aab81d7ea59..b43a74eae436554933b0d50b5757a42c048fc1d3:/doc/doc-txt/OptionLists.txt diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 2d0f160a2..2bd046b9e 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.24 2006/09/22 14:01:12 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.32 2007/04/11 15:26:10 ph10 Exp $ LISTS OF EXIM OPTIONS --------------------- @@ -11,7 +11,7 @@ This file contains complete lists of four 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.64. +This file was last updated for Exim release 4.67. 1. RUN TIME OPTIONS @@ -68,6 +68,7 @@ acl_smtp_rcpt string* unset main acl_smtp_starttls string* unset main 4.11 acl_smtp_vrfy string* unset main 4.00 address_data string* unset routers 4.00 +address_retry_include_sender boolean true smtp 4.64 address_test boolean true routers 4.14 admin_groups string list unset main 3.02 allow_domain_literals boolean false main 4.00 replacing forbid_domain_literals @@ -178,6 +179,7 @@ driver string unset authenticator unset routers 4.00 unset transports drop_cr boolean false main 4.00 became a no-op in 4.21 +dsn_from string* + main 4.67 envelope_to_add boolean false transports envelope_to_remove boolean true main environment string* unset pipe 2.95 @@ -230,6 +232,12 @@ from string* unset autoreply gecos_name string* unset main gecos_pattern string unset main gethostbyname boolean false smtp +gnutls_require_kx string* unset main 4.67 + string* unset smtp 4.67 +gnutls_require_mac string* unset main 4.67 + string* unset smtp 4.67 +gnutls_require_protocols string* unset main 4.67 + string* unset smtp 4.67 group string + routers 4.00 unset transports 4.00 replaces local option in some transports header_line_maxsize integer 0 (unset) main 4.14 @@ -251,6 +259,7 @@ helo_verify_hosts host list unset main hide_child_in_errmsg false redirect 4.00 hold_domains domain list unset main 1.70 home_directory string* unset transports 4.00 replaces individual options +host_all_ignored string "defer" manualroute 4.67 host_find_failed string "freeze" manualroute 4.00 host_lookup host list unset main 3.00 host_lookup_order string list "bydns:byaddr" main 4.30 @@ -258,6 +267,7 @@ host_reject_connection host list unset main hosts string unset iplookup 4.00 string list* unset smtp hosts_avoid_esmtp host list unset smtp 4.21 +hosts_avoid_pipelining host list unset smtp 4.67 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 @@ -442,7 +452,7 @@ sender_unqualified_hosts host list unset main senders address list unset routers 4.00 serialize_hosts host list unset smtp 1.60 server_advertise_condition string* unset authenticators 4.14 -server_condition string* unset plaintext 3.10 +server_condition string* unset authenticators 3.10 (plaintext) 4.64 (others) server_hostname string* "$primary_hostname" cyrus_sasl 4.43 server_mail_auth_condition string* unset authenticators 3.22 server_mech string public_name cyrus_sasl 4.43 @@ -580,6 +590,7 @@ provide compatibility with Sendmail. -bd + Start daemon -bdf + Start daemon and run it in the foreground -be Test string expansion +-bem Test string expansion, read test message first -bF Test system filter file -bf Test user filter file -bfd Set domain for filter testing @@ -634,6 +645,7 @@ provide compatibility with Sendmail. -Mmad + Mark all recipients delivered -Mmd + Mark one recipient delivered -Mrm + Remove message(s) (no bounce) +-Mset + Load message's variables when testing with -be -Mt + Thaw message(s) -Mvb + View message body -Mvh + View message header @@ -773,7 +785,7 @@ DB_DIRECTORY_MODE optional* mode for hints directory DB_LOCKFILE_MODE optional* mode for hints lock files DB_LOCK_TIMEOUT optional* timeout for hints lock files DB_MODE optional* mode for hints files -DEFAULT_CRYPT optional use crypt16() as default +DEFAULT_CRYPT optional default crypt() function DELIVER_IN_BUFFER_SIZE optional* DELIVER_OUT_BUFFER_SIZE optional* DISABLE_D_OPTION optional disables -D option