Better debug diagnosis of malformed IPv4 addresses.

[exim.git] / doc / doc-txt / OptionLists.txt

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index cd61f3d1c6f8ae635a17239b9df5f7dd531fdfb3..3268b3cbe6a5c26e69d6a5744e4a878bd0bb4f98 100644 (file)
--- 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.11 2005/11/10 12:30:14 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.16 2006/02/10 14:25:43 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.51.
+This file was last updated for Exim release 4.60.
 
 
 1. RUN TIME OPTIONS
@@ -117,6 +117,7 @@ check_log_inodes                     integer         0             main
 check_log_space                      integer         0             main
 check_owner                          boolean         true          appendfile        3.14
                                                      +             redirect          4.00
+check_rfc2047_length                 boolean         true          main              4.60
 check_secondary_mx                   boolean         false         dnslookup         4.00
 check_spool_inodes                   integer         0             main
 check_spool_space                    integer         0             main
@@ -157,8 +158,9 @@ delivery_date_remove                 boolean         true          main
 directory                            string*         unset         appendfile
 directory_mode                       octal-integer   0700          appendfile
 directory_transport                  string*         unset         redirect          4.00
+disable_ipv6                         boolean         false         main              4.61
 disable_logging                      boolean         false         routers           4.11
-disable_logging                      boolean         false         transports        4.11
+                                                     false         transports        4.11
 dns_again_means_nonexist             domain list     unset         main              1.89
 dns_check_names_pattern              string          +             main              2.11
 dns_csa_search_limit                 integer         5             main              4.60
@@ -324,7 +326,7 @@ message_id_header_text               string*         unset         main
 message_logs                         boolean         true          main              4.10
 message_prefix                       string*         +             appendfile        4.00 replaces prefix
                                      string*         unset         pipe              4.00 replaces prefix
-message_size_limit                   integer         0             main
+message_size_limit                   integer         50M           main
                                                      0             transports        2.05
 message_suffix                       string*         +             appendfile        4.00 replaces suffix
                                      string*         unset         pipe              4.00 replaces suffix
@@ -733,6 +735,8 @@ to stop you overriding it in your Local/Makefile.
 Option                       Type         Description
 ------------------------------------------------------------------------------
 
+ACL_CVARS=20                 optional*    number of acl_c variables
+ACL_MVARS=20                 optional*    number of acl_m variables
 ALT_CONFIG_PREFIX            optional     restricts location of -C files
 ALT_CONFIG_ROOT_ONLY         optional*    privileged -C needs root (not exim)
 APPENDFILE_MODE              optional*
@@ -743,6 +747,7 @@ AUTH_CRAM_MD5                driver       include cram_md5 authenticator
 AUTH_CYRUS_SASL              driver       include Cyrus SASL authenticator
 AUTH_PLAINTEXT               driver       include plaintext authenticator
 AUTH_SPA                     driver       include SPA (NTLM) authenticator
+AUTH_VARS=3                  optional*    number of $auth variables
 BASENAME_COMMAND             system**     path to basename
 BASE_62=62                   optional*    not normally changed for Unix
 BIN_DIRECTORY                mandatory    Exim binary directory