diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-get.8.xml | 22 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 6 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 8 |
3 files changed, 35 insertions, 1 deletions
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index cc4e82255..4c050ec03 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -389,6 +389,18 @@ Configuration Item: <literal>APT::Ignore-Hold</literal>.</para></listitem> </varlistentry> + <varlistentry><term><option>--with-new-pkgs</option></term> + <listitem><para>Allow installing new packages when used in + conjunction with <literal>upgrade</literal>. This is useful if + the update of a installed package requires new dependencies to be + installed. Instead of holding the package back <literal>upgrade</literal> + will upgrade the package and install the new dependencies. Note that + <literal>upgrade</literal> with this option will never remove packages, + only allow adding new ones. + Configuration Item: <literal>APT::Get::Upgrade-Allow-New</literal>. + </para></listitem> + </varlistentry> + <varlistentry><term><option>--no-upgrade</option></term> <listitem><para>Do not upgrade packages; when used in conjunction with <literal>install</literal>, <literal>no-upgrade</literal> will prevent packages on the command line @@ -508,7 +520,15 @@ This is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::AllowUnauthenticated</literal>.</para></listitem> </varlistentry> - + + <varlistentry><term><option>--show-progress</option></term> + <listitem><para>Show user friendly progress information in the + terminal window when packages are installed, upgraded or + removed. For a machine parsable version of this data see + README.progress-reporting in the apt doc directory. + <literal>DpkgPM::Progress</literal>.</para></listitem> + </varlistentry> + &apt-commonoptions; 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> |