Fix another case of bad comparison between IPv6 addresses that may or

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

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 53b76d304f9c4e423af30a15ffe45c071bce5015..152f02fc6d6b0c97764077233ddb0f7392cc05bf 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.9 2005/06/21 14:14:55 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.12 2005/11/15 16:10:51 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
@@ -161,6 +162,8 @@ disable_logging                      boolean         false         routers
 disable_logging                      boolean         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
+dns_csa_use_reverse                  boolean         true          main              4.60
 dns_ipv4_lookup                      boolean         false         main              3.20
 dns_qualify_single                   boolean         true          smtp
 dns_retrans                          time            0s            main              1.60
@@ -474,6 +477,7 @@ socket                               string*         unset         lmtp
 spamd_address                        string          +             main              4.50 with content scan
 split_spool_directory                boolean         false         main              1.70
 spool_directory                      string          ++            main
+sqlite_lock_timeout                  time            5s            main              4.53
 srv_fail_domains                     domain list     unset         dnslookup         4.43
 strip_excess_angle_brackets          boolean         false         main
 strip_trailing_dot                   boolean         false         main
@@ -737,6 +741,7 @@ APPENDFILE_DIRECTORY_MODE    optional*
 APPENDFILE_LOCKFILE_MODE     optional*
 AR                           system       command to build a library
 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
 BASENAME_COMMAND             system**     path to basename