Added info about --show-proxy-settings

Signed-off-by: Robert Fischer <ml-openvpn@trispace.org>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>

diff --git a/openvpn.8 b/openvpn.8
index 5cbf4c57e82e4e06969714218c902ebdee5e448b..45c0663b584cdd6bf8a654d4d6a1bcaed62246af 100644 (file)
--- a/openvpn.8
+++ b/openvpn.8
@@ -494,6 +494,11 @@ InternetQueryOption API.
 This option exists in OpenVPN 2.1 or higher.
 .\"*********************************************************
 .TP
+.B \-\-show-proxy-settings
+Show sensed HTTP or SOCKS proxy settings. Currently, only Windows clients
+support this option.
+.\"*********************************************************
+.TP
 .B \-\-http-proxy server port [authfile|'auto'|'auto-nct'] [auth-method]
 Connect to remote host through an HTTP proxy at address
 .B server

diff --git a/options.c b/options.c
index 169a8e8afe1b6aa899e78c15fa86753673c8338b..ab4228deb7602633e48af714e5df416a0849f3ce 100644 (file)
--- a/options.c
+++ b/options.c
@@ -118,6 +118,7 @@ static const char usage_message[] =
   "--connect-retry-max n : Maximum connection attempt retries, default infinite.\n"
 #ifdef GENERAL_PROXY_SUPPORT
   "--auto-proxy    : Try to sense proxy settings (or lack thereof) automatically.\n"
+  "--show-proxy-settings : Show sensed proxy settings.\n"
 #endif
 #ifdef ENABLE_HTTP_PROXY
   "--http-proxy s p [up] [auth] : Connect to remote host\n"