diff options
Diffstat (limited to 'doc/apt.conf.5.xml')
| -rw-r--r-- | doc/apt.conf.5.xml | 46 |
1 files changed, 41 insertions, 5 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 4d9e708a8..1fe980d28 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 @@ -110,7 +111,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; <varlistentry><term>Default-Release</term> <listitem><para>Default release to install packages from if more than one - version available. Contains release name or release version. Examples: 'stable', 'testing', 'unstable', '4.0', '5.0*'. Release codenames ('etch', 'lenny' etc.) are not allowed now. See also &apt-preferences;.</para></listitem> + version available. Contains release name, codename or release version. Examples: 'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-preferences;.</para></listitem> </varlistentry> <varlistentry><term>Ignore-Hold</term> @@ -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> @@ -684,12 +685,33 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </listitem> </varlistentry> + <varlistentry> + <term><literal>Debug::pkgDepCache::Marker</literal></term> + <listitem> + <para> + Generate debug messages describing which package is marked + as keep/install/remove while the ProblemResolver does his work. + Each addition or deletion may trigger additional actions; + they are shown indented two additional space under the original entry. + The format for each line is <literal>MarkKeep</literal>, + <literal>MarkDelete</literal> or <literal>MarkInstall</literal> followed by + <literal>package-name <a.b.c -> d.e.f | x.y.z> (section)</literal> + where <literal>a.b.c</literal> is the current version of the package, + <literal>d.e.f</literal> is the version considered for installation and + <literal>x.y.z</literal> is a newer version, but not considered for installation + (because of a low pin score). The later two can be omitted if there is none or if + it is the same version as the installed. + <literal>section</literal> is the name of the section the package appears in. + </para> + </listitem> + </varlistentry> + <!-- Question: why doesn't this do anything? The code says it should. --> <varlistentry> <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> @@ -762,6 +784,17 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </varlistentry> <varlistentry> + <term><literal>Debug::pkgProblemResolver::ShowScores</literal></term> + <listitem> + <para> + Display a list of all installed packages with their calculated score + used by the pkgProblemResolver. The description of the package + is the same as described in <literal>Debug::pkgDepCache::Marker</literal> + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><literal>Debug::sourceList</literal></term> <listitem> @@ -772,6 +805,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> @@ -781,6 +816,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; </para> </listitem> </varlistentry> +--> </variablelist> </refsect1> |