From de8d8fe5b70383875b7a6c050af27f3e419226a6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 27 Mar 2008 08:06:37 +0000
Subject: make it clear that proxy.cfg allows to override system global proxy
 settings

---
 pod/proxy.cfg.5.pod | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'pod')

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]
-- 
cgit v1.2.1