From: hniksic <devnull@localhost>
Date: Tue, 15 Nov 2005 21:18:14 +0000 (-0800)
Subject: [svn] Document the https_proxy setting.
X-Git-Tag: v1.13~703
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=f3b54cdaf44662c7eb9897672b225024b3b4712a

[svn] Document the https_proxy setting.
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f28ef5d3..bb68fdc8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-15  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* wget.texi: Document https_proxy.
+
 2005-09-02  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* sample.wgetrc: Rewrite the "passive FTP" paragraph to better
diff --git a/doc/wget.texi b/doc/wget.texi
index cf41dc01..7a06917f 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -2638,6 +2638,10 @@ environment.
 Set @sc{http} user to @var{string}, equivalent to
 @samp{--http-user=@var{string}}.
 
+@item https_proxy = @var{string}
+Use @var{string} as @sc{https} proxy, instead of the one specified in
+environment.
+
 @item ignore_length = on/off
 When set to on, ignore @code{Content-Length} header; the same as
 @samp{--ignore-length}.
@@ -3166,8 +3170,9 @@ the following environment variables:
 
 @table @code
 @item http_proxy
+@itemx https_proxy
 This variable should contain the @sc{url} of the proxy for @sc{http}
-connections.
+and @sc{https} connections.
 
 @item ftp_proxy
 This variable should contain the @sc{url} of the proxy for @sc{ftp}
@@ -3191,6 +3196,7 @@ This option and the corresponding command may be used to suppress the
 use of proxy, even if the appropriate environment variables are set.
 
 @item http_proxy = @var{URL}
+@itemx https_proxy = @var{URL}
 @itemx ftp_proxy = @var{URL}
 @itemx no_proxy = @var{string}
 These startup file variables allow you to override the proxy settings