diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | doc/apt.conf.5.xml | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index b379313e4..ff1483dfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -93,7 +93,10 @@ apt (0.7.22) UNRELEASED; urgency=low - add "showauto" option to show automatically installed packages * document --install-recommends and --no-install-recommends (thanks to Dereck Wonnacott, LP: #126180) - + * doc/apt.conf.5.xml: + - merged patch from Aurélien Couderc to improve the text + (thanks!) + [ Julian Andres Klode ] * apt-pkg/contrib/configuration.cc: Fix a small memory leak in ReadConfigFile. diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index eece75d28..2b2430c83 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -71,7 +71,7 @@ APT { </programlisting></informalexample> <para>with newlines placed to make it more readable. Lists can be created by - opening a scope and including a single word enclosed in quotes followed by a + opening a scope and including a single string enclosed in quotes followed by a semicolon. Multiple entries can be included, each separated by a semicolon.</para> <informalexample><programlisting> @@ -88,7 +88,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal> <literal>#include</literal> will include the given file, unless the filename ends in a slash, then the whole directory is included. - <literal>#clear</literal> is used to erase a list of names.</para> + <literal>#clear</literal> is used to erase a part of the configuration tree. The + specified element and all its descendents are erased.</para> <para>All of the APT tools take a -o option which allows an arbitrary configuration directive to be specified on the command line. The syntax is a full option @@ -174,7 +175,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <variablelist> <varlistentry><term>PDiffs</term> - <listitem><para>Try do download deltas called <literal>PDiffs</literal> for + <listitem><para>Try to download deltas called <literal>PDiffs</literal> for Packages or Sources files instead of downloading whole ones. True by default.</para></listitem> </varlistentry> @@ -705,7 +706,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <term><literal>Debug::pkgInitConfig</literal></term> <listitem> <para> - Dump the default configuration to standard output on + Dump the default configuration to standard error on startup. </para> </listitem> @@ -799,6 +800,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </listitem> </varlistentry> +<!-- 2009/07/11 Currently used nowhere. The corresponding code +is commented. <varlistentry> <term><literal>Debug::Vendor</literal></term> @@ -808,6 +811,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </para> </listitem> </varlistentry> +--> </variablelist> </refsect1> |