SOCKS: move from Experimental to mainline

[exim.git] / src / src / EDITME

diff --git a/src/src/EDITME b/src/src/EDITME
index c2d95ff40cc20773f7cd4312a831b19d9e56eadd..5b17e53d830ce3788fe1465987a871b0eaf06226 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -431,6 +431,13 @@ EXIM_MONITOR=eximon.bin
 # DISABLE_DNSSEC=yes
 
 
+#------------------------------------------------------------------------------
+# By default Exim has support for connecting outbound via a SOCK5 proxy.
+# To remove this support uncomment the following line.
+
+# DISABLE_SOCKS=yes
+
+
 #------------------------------------------------------------------------------
 # Compiling Exim with experimental features. These are documented in
 # experimental-spec.txt. "Experimental" means that the way these features are
@@ -497,9 +504,6 @@ EXIM_MONITOR=eximon.bin
 # Note: Enabling this unconditionally overrides DISABLE_DNSSEC
 # EXPERIMENTAL_DANE=yes
 
-# Uncomment the following line to add SOCKS support
-# EXPERIMENTAL_SOCKS=yes
-
 # Uncomment the following to add Internationalisation features. You need to
 # have the IDN library installed.
 # EXPERIMENTAL_INTERNATIONAL=yes