summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-25 15:45:38 +0200
committerMichael Vogt <mvo@debian.org>2013-10-25 15:45:38 +0200
commit00354054c15b030b90aca8a79b62b4ab2844e3f0 (patch)
tree0f37e4ad219b300e22b4cd76c21436fae5534ad0 /doc
parent6fad3c240c18dff339d934f2e3bd41c93c417f89 (diff)
parentc57805f9d9295541840b5775573ba51d079a11cc (diff)
Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress-refactor
Diffstat (limited to 'doc')
-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>