X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c7dfe372a22e9e95af62c73c73ed94dd9279f8e3..3d02b3144cdde92d99ee7fcd0eb6cc9ba7c272f3:/doc/doc-txt/OptionLists.txt

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index e829cb1e9..55b0f36fc 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -1,7 +1,7 @@
 LISTS OF EXIM OPTIONS
 ---------------------
 
-This file contains complete lists of four kinds of Exim option:
+This file contains an almost 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;
@@ -9,7 +9,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.72.
+This file was last updated for Exim release 4.95.
 
 
 1. RUN TIME OPTIONS
@@ -78,6 +78,7 @@ allow_fail                           boolean         false         redirect
 allow_filter                         boolean         false         redirect          4.00
 allow_freeze                         boolean         false         redirect          4.00
 allow_fifo                           boolean         false         appendfile        3.13
+allow_insecure_tainted_data          boolean         true          main              4.95 support will drop ~4.97ٍ
 allow_localhost                      boolean         false         smtp              1.73
 allow_mx_to_ip                       boolean         false         main              3.14
 allow_symlink                        boolean         false         appendfile
@@ -295,6 +296,9 @@ hold_domains                         domain list     unset         main
 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_name_extract                    string
+	"${if and {{match{.outlook.com\\$}{$host}} {match{$item}{\\N^250-([\\w.]+)\\s\\N}}} {$1}}"
+								   smtp		     4.96
 host_lookup                          host list       unset         main              3.00
 host_lookup_order                    string list  "bydns:byaddr"   main              4.30
 host_reject_connection               host list       unset         main              4.00
@@ -313,6 +317,8 @@ hosts_pipe_connect		     host_list	     unset	   smtp		     4.93 if experimental
 hosts_randomize                      boolean         false         manualroute       4.00
                                                      false         smtp              3.14
 hosts_require_auth                   host list       unset         smtp              4.00
+hosts_require_alpn                   host list       unset         main              4.95
+								   smtp              4.95
 hosts_require_dane                   host list       unset         smtp              4.91 (4.85 experimental)
 hosts_require_helo		     host list	     "*"	   main		     4.95
 hosts_require_ocsp                   host list       unset         smtp              4.82 if experimental_ocsp
@@ -597,7 +603,8 @@ timeout_defer                        boolean         false         pipe
 timeout_frozen_after                 time            0s            main              3.20
 timezone                             string          +             main              3.15
 tls_advertise_hosts                  host list       *             main              3.20
-tls_advertise_requiretls             host list       *             main              4.92 if experimental_requiretls
+tls_alpn			     string*	     unset	   main		     4.95
+								   smtp		     4.95
 tls_certificate                      string*         unset         main              3.20
                                                      unset         smtp              3.20
 tls_dh_max_bits                      integer         2236          main              4.80