From: mancha Date: Thu, 2 Aug 2012 13:50:40 +0000 (+0200) Subject: doc: add ENVIRONMENT section to manpage and minor adjustments. X-Git-Tag: v1.14~1 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=3db55372c70baca71c99d292d99bfecd21e89b33 doc: add ENVIRONMENT section to manpage and minor adjustments. Signed-off-by: mancha --- diff --git a/doc/ChangeLog b/doc/ChangeLog index f3af7ea3..df76c53e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2012-08-04 mancha (tiny change) + + * wget.texi: Export ENVIRONMENT to the man page. + 2012-06-09 Giuseppe Scrivano * wget.texi (Logging and Input File Options): Document "--report-speed". diff --git a/doc/wget.texi b/doc/wget.texi index 73341ec6..7efdc725 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -3576,28 +3576,30 @@ internal networks from the rest of Internet. In order to obtain information from the Web, their users connect and retrieve remote data using an authorized proxy. +@c man begin ENVIRONMENT Wget supports proxies for both @sc{http} and @sc{ftp} retrievals. The standard way to specify proxy location, which Wget recognizes, is using the following environment variables: -@table @code +@table @env @item http_proxy @itemx https_proxy -If set, the @code{http_proxy} and @code{https_proxy} variables should +If set, the @env{http_proxy} and @env{https_proxy} variables should contain the @sc{url}s of the proxies for @sc{http} and @sc{https} connections respectively. @item ftp_proxy This variable should contain the @sc{url} of the proxy for @sc{ftp} -connections. It is quite common that @code{http_proxy} and -@code{ftp_proxy} are set to the same @sc{url}. +connections. It is quite common that @env{http_proxy} and +@env{ftp_proxy} are set to the same @sc{url}. @item no_proxy This variable should contain a comma-separated list of domain extensions proxy should @emph{not} be used for. For instance, if the value of -@code{no_proxy} is @samp{.mit.edu}, proxy will not be used to retrieve +@env{no_proxy} is @samp{.mit.edu}, proxy will not be used to retrieve documents from MIT. @end table +@c man end In addition to the environment variables, proxy location and settings may be specified from within Wget itself.