summaryrefslogtreecommitdiff
path: root/doc/apt.conf.5.xml
diff options
context:
space:
mode:
authorMatt Zimmerman <matt.zimmerman@canonical.com>2005-02-26 23:22:32 +0000
committerMatt Zimmerman <matt.zimmerman@canonical.com>2005-02-26 23:22:32 +0000
commitf827a9e553ac84e70cba573b071e6a1891ec40d5 (patch)
treef90f98f49affd55d635d9ea729f6dbc3aaa7e754 /doc/apt.conf.5.xml
parentaf45f087e2a08534d1df8ec481d2688d0fbafe7b (diff)
parent872b3d3983839d2d9f14268c5adf976a72ecc5ad (diff)
Merge apt--mvo--0
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-2 * merge with matts tree, added documentation for the gpgv stuff * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-3 * added gpgv::Options to configure-index * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-4 * PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-5 * fix for apt-get update removing the cdroms Release.gpg files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-6 * path scoring changed, the non-symlink path is scored highest
Diffstat (limited to 'doc/apt.conf.5.xml')
-rw-r--r--doc/apt.conf.5.xml11
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index b5d223372..69e212243 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -251,6 +251,13 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
the cdrom block. It is important to have the trailing slash. Unmount
commands can be specified using UMount.</para></listitem>
</varlistentry>
+
+ <varlistentry><term>gpgv</term>
+ <listitem><para>GPGV URIs; the only option for GPGV URIs is the option to pass additional parameters to gpgv.
+ <literal>gpgv::Options</literal> Additional options passed to gpgv.
+ </para></listitem>
+ </varlistentry>
+
</variablelist>
</para>
</refsect1>
@@ -373,7 +380,9 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<literal>Debug::NoLocking</literal> disables file locking so APT can do some
operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the
command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will
- disable the inclusion of statfs data in CDROM IDs.</para>
+ disable the inclusion of statfs data in CDROM IDs.
+ <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
+ </para>
</refsect1>
<refsect1><title>Examples</title>