On Thu, 02 Aug 2012 Giuseppe Scrivano <[email protected]> wrote:
>the patch seems ok, would you mind to send it using "git format-
>patch" so to preserve the commit author? (I could do that myself
>but it is not clear from the name you used in the e-mail). Extra
>bonus if you also include the ChangeLog entry.
Hi Giuseppe.
Great news about a new release; Will look out for it.
Attached please find your request. Please write
up the Changelog entry as you find most appropriate.
Note: patch against HEAD@22f016ca3ac.
Cheers,
mancha
From b440de851f3edf1a1b0d594839d474a4fd5bc855 Mon Sep 17 00:00:00 2001
From: mancha <[email protected]>
Date: Thu, 2 Aug 2012 15:50:40
Subject: [PATCH] doc: add ENVIRONMENT section to manpage and minor
adjustments.
Signed-off-by: mancha <[email protected]>
---
doc/wget.texi | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/doc/wget.texi b/doc/wget.texi
index 73341ec..7efdc72 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.
--
1.7.7.3
