Added the long-awaited ${if match_ip condition.

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

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index ba727b0bbff920f6f7d54d463ca202d87c89dbed..53b76d304f9c4e423af30a15ffe45c071bce5015 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.7 2005/04/04 10:33:49 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.9 2005/06/21 14:14:55 ph10 Exp $

 
 LISTS OF EXIM OPTIONS
 ---------------------
 
 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).
 
   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.50.
+This file was last updated for Exim release 4.51.

 
 
 1. RUN TIME OPTIONS
 
 
 1. RUN TIME OPTIONS


@@ -140,6 +140,8 @@ create_file                          string          "anywhere"    appendfile
 current_directory                    string          unset         transports        4.00
                                                      unset         queryprogram      4.00
 daemon_smtp_ports                    string          unset         main              1.75  pluralised in 4.21
 current_directory                    string          unset         transports        4.00
                                                      unset         queryprogram      4.00
 daemon_smtp_ports                    string          unset         main              1.75  pluralised in 4.21

+daemon_startup_retries               int             9             main              4.52
+daemon_startup_sleep                 time            30s           main              4.52

 data                                 string          unset         redirect          4.00
 data_timeout                         time            5m            smtp
 debug_print                          string*         unset         authenticators    4.00
 data                                 string          unset         redirect          4.00
 data_timeout                         time            5m            smtp
 debug_print                          string*         unset         authenticators    4.00


@@ -497,6 +499,7 @@ timeout                              time            5m            lmtp
                                                      1h            pipe
                                                      1h            queryprogram      4.00
                                                      5s            iplookup          4.00
                                                      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
 timeout_frozen_after                 time            0s            main              3.20
 timezone                             string          +             main              3.15
 tls_advertise_hosts                  host list       *             main              3.20