diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-21 01:11:36 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-21 01:11:36 +0200 |
| commit | 23a783836e5765514c85f83a510b9225a43cdfc1 (patch) | |
| tree | 89efceeb468bc7c755a6db9f53a63aa993e48068 /openvpn/doc/openvpn.8 | |
| parent | 249cbf6d60929332f049468b40f4459167916ed1 (diff) | |
Update openvpn to Version 2.3_alpha3
--HG--
rename : openvpn/src/plugins/README => openvpn/doc/README.plugins
rename : openvpn/src/plugins/defer/README => openvpn/sample/sample-plugins/defer/README
rename : openvpn/src/plugins/defer/build => openvpn/sample/sample-plugins/defer/build
rename : openvpn/src/plugins/defer/simple.c => openvpn/sample/sample-plugins/defer/simple.c
rename : openvpn/src/plugins/examples/simple.def => openvpn/sample/sample-plugins/defer/simple.def
rename : openvpn/src/plugins/defer/winbuild => openvpn/sample/sample-plugins/defer/winbuild
rename : openvpn/src/plugins/examples/build => openvpn/sample/sample-plugins/log/build
rename : openvpn/src/plugins/examples/log.c => openvpn/sample/sample-plugins/log/log.c
rename : openvpn/src/plugins/examples/log_v3.c => openvpn/sample/sample-plugins/log/log_v3.c
rename : openvpn/src/plugins/examples/winbuild => openvpn/sample/sample-plugins/log/winbuild
rename : openvpn/src/plugins/examples/README => openvpn/sample/sample-plugins/simple/README
rename : openvpn/src/plugins/examples/build => openvpn/sample/sample-plugins/simple/build
rename : openvpn/src/plugins/examples/simple.c => openvpn/sample/sample-plugins/simple/simple.c
rename : openvpn/src/plugins/examples/simple.def => openvpn/sample/sample-plugins/simple/simple.def
rename : openvpn/src/plugins/examples/winbuild => openvpn/sample/sample-plugins/simple/winbuild
rename : openvpn/src/plugins/auth-pam/README => openvpn/src/plugins/auth-pam/README.auth-pam
rename : openvpn/src/plugins/down-root/README => openvpn/src/plugins/down-root/README.down-root
Diffstat (limited to 'openvpn/doc/openvpn.8')
| -rw-r--r-- | openvpn/doc/openvpn.8 | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/openvpn/doc/openvpn.8 b/openvpn/doc/openvpn.8 index f420d584..56be29ec 100644 --- a/openvpn/doc/openvpn.8 +++ b/openvpn/doc/openvpn.8 @@ -482,18 +482,6 @@ as the number of retries of connection attempt (default=infinite). .\"********************************************************* .TP -.B \-\-auto-proxy -Try to sense HTTP or SOCKS proxy settings automatically. -If no settings are present, a direct connection will be attempted. -If both HTTP and SOCKS settings are present, HTTP will be preferred. -If the HTTP proxy server requires a password, it will be queried from -stdin or the management interface. If the underlying OS doesn't support an API for -returning proxy settings, a direct connection will be attempted. -Currently, only Windows clients support this option via the -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. @@ -2458,6 +2446,12 @@ for inputs which ordinarily would have been queried from the console. .\"********************************************************* .TP +.B \-\-management-query-proxy +Query management channel for proxy server information for a specific +.B \-\-remote +(client-only). +.\"********************************************************* +.TP .B \-\-management-query-remote Allow management interface to override .B \-\-remote |