diff options
| author | Michael Vogt <mvo@debian.org> | 2013-10-22 22:05:15 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-10-22 22:06:24 +0200 |
| commit | 51355387e5a5d4d7275a34b1c22f0ef5a76172d5 (patch) | |
| tree | e40c80a0d5268eb42cf71461e5ef9494658e1b7d /doc | |
| parent | b4017ba767e15dc06c73915efaf36409ee099bf2 (diff) | |
| parent | 4b9969da40ff1dff2f5787feff5103c873c57f7f (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress-refactor
Conflicts:
apt-pkg/deb/dpkgpm.cc
apt-pkg/makefile
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-verbatim.ent | 6 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index c9bb06123..0d0d95c7a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -124,6 +124,12 @@ </citerefentry>" > +<!ENTITY squid-deb-proxy-client "<citerefentry> + <refentrytitle><command>squid-deb-proxy-client</command></refentrytitle> + <manvolnum>1</manvolnum> + </citerefentry>" +> + <!ENTITY debsign "<citerefentry> <refentrytitle><command>debsign</command></refentrytitle> <manvolnum>1</manvolnum> diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 42119baa5..e8da666c7 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -396,6 +396,14 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para><literal>Acquire::http::User-Agent</literal> can be used to set a different User-Agent for the http download method as some proxies allow access for clients 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 + 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> + </listitem> </varlistentry> |