Browse Source

* doc/apt.conf.5.xml:

- merged patch from Aurélien Couderc to improve the text
    (thanks!)
debian/1.8.y
Michael Vogt 13 years ago
parent
commit
d82cdf7391
  1. 7
      debian/changelog
  2. 12
      doc/apt.conf.5.xml

7
debian/changelog

@ -29,10 +29,6 @@ apt (0.7.21) UNRELEASED; urgency=low
- provide DPkg::Chroot-Directory config option (useful for testing)
* Only run Download-Upgradable and Unattended-Upgrades if the initial
update was successful Closes: #341970
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 May 2009 17:51:42 +0200
[ Michael Vogt ]
* apt-pkg/indexcopy.cc:
- support having CDs with no Packages file (just a Packages.gz)
by not forcing a verification on non-existing files
@ -77,6 +73,9 @@ apt (0.7.21) UNRELEASED; urgency=low
* build fixes for g++-4.4
* cmdline/apt-mark:
- add "showauto" option to show automatically installed packages
* doc/apt.conf.5.xml:
- merged patch from Aurélien Couderc to improve the text
(thanks!)
[ Dereck Wonnacott ]
* apt-ftparchive might write corrupt Release files (LP: #46439)

12
doc/apt.conf.5.xml

@ -70,7 +70,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>
@ -87,7 +87,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
@ -173,7 +174,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>
@ -683,7 +684,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>
@ -766,6 +767,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>
@ -775,6 +778,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
</para>
</listitem>
</varlistentry>
-->
</variablelist>
</refsect1>

Loading…
Cancel
Save