improve documentation for Acquire::http::Proxy-Auto-Detect (thanks to Francesco Poli)

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e8da666c7c829b89ffd4b52b903850f9f36a4f39..428c0d2db59c33172a8b25d185bb30329a0c176c 100644 (file)
--- 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
      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
      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>
 
      </listitem>
      </varlistentry>