doc: add ENVIRONMENT section to manpage and minor adjustments.

Signed-off-by: mancha <mancha@mac.hush.com>
This commit is contained in:
mancha 2012-08-02 15:50:40 +02:00 committed by Giuseppe Scrivano
parent 22f016ca3a
commit 3db55372c7
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,7 @@
2012-08-04 mancha <mancha@mac.hush.com> (tiny change)
* wget.texi: Export ENVIRONMENT to the man page.
2012-06-09 Giuseppe Scrivano <gscrivano@gnu.org>
* wget.texi (Logging and Input File Options): Document "--report-speed".

View File

@ -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.