summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-27 08:06:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-27 08:06:37 +0000
commitde8d8fe5b70383875b7a6c050af27f3e419226a6 (patch)
tree0da63e16f0ada48453561b6570cb60f89db3b6a6
parentd7def1c2e0c2476eecb4f25682ad7343305b86b7 (diff)
downloadurpmi-de8d8fe5b70383875b7a6c050af27f3e419226a6.tar
urpmi-de8d8fe5b70383875b7a6c050af27f3e419226a6.tar.gz
urpmi-de8d8fe5b70383875b7a6c050af27f3e419226a6.tar.bz2
urpmi-de8d8fe5b70383875b7a6c050af27f3e419226a6.tar.xz
urpmi-de8d8fe5b70383875b7a6c050af27f3e419226a6.zip
make it clear that proxy.cfg allows to override system global proxy settings
-rw-r--r--pod/proxy.cfg.5.pod8
1 files changed, 8 insertions, 0 deletions
diff --git a/pod/proxy.cfg.5.pod b/pod/proxy.cfg.5.pod
index 82e75802..4c12651d 100644
--- a/pod/proxy.cfg.5.pod
+++ b/pod/proxy.cfg.5.pod
@@ -4,6 +4,14 @@ proxy.cfg - urpmi proxy configuration file format.
=head1 DESCRIPTION
+You can override default proxy using proxy.cfg (see the syntax below). You can
+also set proxy on urpmi commands command-line using C<--proxy>.
+
+Note that urpmi will use system global proxy settings (cf environment variable
+C<http_proxy> or C<ftp_proxy>). If you don't want urpmi to use any proxy, you
+can use C<http_proxy=> or C<ftp_proxy=>.
+
+=head1 SYNTAX
The proxy.cfg file contains lines of the form
[media:]http_proxy=[value]