X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c08cf1dc784a98a253296a51433f6de7d16d3125..d269b88d95686b77a170af203d0f4a7e44d28fc8:/doc/apt.conf.5.xml

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e8da666c7..bfc43ba29 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -8,6 +8,8 @@
 <!ENTITY % aptverbatiment SYSTEM "apt-verbatim.ent">
 %aptverbatiment;
 
+<!ENTITY % aptvendor SYSTEM "apt-vendor.ent">
+%aptvendor;
 ]>
 
 <refentry>
@@ -398,11 +400,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>