summaryrefslogtreecommitdiff
path: root/doc/apt.conf.5.xml
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-25 12:23:11 +0200
committerMichael Vogt <mvo@debian.org>2013-10-25 12:23:11 +0200
commitc57805f9d9295541840b5775573ba51d079a11cc (patch)
tree435ac63b53a327677283655380fa2bd89c8dfde2 /doc/apt.conf.5.xml
parent4b9969da40ff1dff2f5787feff5103c873c57f7f (diff)
improve documentation for Acquire::http::Proxy-Auto-Detect (thanks to Francesco Poli)
Diffstat (limited to 'doc/apt.conf.5.xml')
-rw-r--r--doc/apt.conf.5.xml14
1 files changed, 10 insertions, 4 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e8da666c7..428c0d2db 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -398,11 +398,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
only if the client uses a known identifier.</para>
<para><literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to
- specify a external command to discover the http proxy to use. Apt expects
+ specify an external command to discover the http proxy to use. Apt expects
the command to output the proxy on stdout in the style
- <literal>http://proxy:port/</literal>. See the
- &squid-deb-proxy-client; package for a example implementation that
- uses avahi.</para>
+ <literal>http://proxy:port/</literal>. This will override the
+ generic <literal>Acquire::http::Proxy</literal> but not any specific
+ host proxy configuration set via
+ <literal>Acquire::http::Proxy::$HOST</literal>.
+
+ See the &squid-deb-proxy-client; package for an example implementation that
+ uses avahi. This option takes precedence over the legacy option name
+ <literal>ProxyAutoDetect</literal>.
+ </para>
</listitem>
</varlistentry>