Add documentation for http-proxy-user-pass option

Patch V2: fix formatting problems
Acked-by: Selva Nair <selva.nair@gmail.com>
Message-Id: <1466167786-13748-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/11933

Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/Changes.rst b/Changes.rst
index ab322e2df63cd16ed6d716d582c85003d749f23c..f945ad72aa47a9f46046799bc4c4ad9c03d7e563 100644 (file)
--- a/Changes.rst
+++ b/Changes.rst
@@ -51,6 +51,10 @@ AEAD (GCM) data channel cipher support
     bytes per packet for AES-128-GCM instead of 36 bytes per packet for
     AES-128-CBC + HMAC-SHA1).
 
+Http proxy password inside config file
+       Http proxy passwords can be specified with the inline file option
+    http-proxy-user-pass
+
 
 User-visible Changes
 --------------------

diff --git a/doc/openvpn.8 b/doc/openvpn.8
index f1a43614921117a6c78dde10c55950ec8d8be19a..7e9f9a042abbf46d907fca5fdade5ba805d51b9c 100644 (file)
--- a/doc/openvpn.8
+++ b/doc/openvpn.8
@@ -497,7 +497,10 @@ and port
 If HTTP Proxy-Authenticate is required,
 .B authfile
 is a file containing a username and password on 2 lines, or
-"stdin" to prompt from console.
+"stdin" to prompt from console. Its content can also be specified
+in the config file with the
+.B \-\-http\-proxy\-user\-pass
+option. (See section on inline files)
 
 .B auth\-method
 should be one of "none", "basic", or "ntlm".
@@ -6581,7 +6584,7 @@ X509_1_C=KG
 .SH INLINE FILE SUPPORT
 OpenVPN allows including files in the main configuration for the
 .B \-\-ca, \-\-cert, \-\-dh, \-\-extra\-certs, \-\-key, \-\-pkcs12, \-\-secret,
-.B \-\-crl-verify
+.B \-\-crl\-verify, \-\-http\-proxy\-user\-pass
 and
 .B \-\-tls\-auth
 options.