Bug#726597: Please document Acquire::http::ProxyAutoDetect

[Michael Vogt <mvo@debian.org>]

On Mon, Oct 21, 2013 at 07:01:55PM +0200, Francesco Poli wrote:
> On Sat, 19 Oct 2013 18:32:26 +0200 Michael Vogt wrote:
> 
> > On Wed, Oct 16, 2013 at 10:39:06PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote:
> [...]
> > > Saddly it is not documented in apt.conf(5). Being documented would help in
> > > implementations like the one described in #726430.
> > 
> > Indeed, how do you like the attach (mostly) documentation patch? If
> > that covers your needs I will merge it into the debian/sid branch.
> 
> Hello Michael, thanks for preparing a patch so quickly!
> 
> Please let me comment on one aspect: what happens when APT finds
> *both* Acquire::HTTP::Proxy *and* Acquire::http::Proxy-Auto-Detect set?
> Which one takes precedence?
> 
> I think this should be documented...

Good point, thanks. How about this:

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e8da666..87ad30c 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -402,7 +402,10 @@ DPkg::Pre-Install-Pkgs
{"/usr/sbin/dpkg-preconfigure --apt"
      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>
+     uses avahi. 
+     This option take precedence over the legacy option name 
+     <literal>ProxyAutoDetect</literal>.
+     </para>
 
      </listitem>
      </varlistentry>


Thanks,
 Michael