diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-03-05 09:28:33 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-03-05 09:28:33 +0000 |
| commit | 2c01f1c077870be1fb00663fc6bb80366498efab (patch) | |
| tree | c7c997e669f03bd240c44cfbb64ed6d5fd7c2f03 /doc/apt.conf.5.xml | |
| parent | 7e360377931dbdea7ec3afe606bca39435353581 (diff) | |
| parent | c8b944492073b938395fd890dfa8ed1e4b55fab4 (diff) | |
Merge with matt
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-59
Open 0.6.32
* apt@packages.debian.org/apt--main--0--patch-60
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-61
Add missing whitespace in new Debug::Acquire::gpgv output
* apt@packages.debian.org/apt--main--0--patch-62
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-63
Open 0.6.34
* apt@packages.debian.org/apt--main--0--patch-64
Add missing semicolon in configure-index (Debian #295773)
* apt@packages.debian.org/apt--main--0--patch-65
Update build-depends on gettext to 0.12
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-12
* star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-13
* commented the ftp no_proxy unseting in methods/ftp.cc
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-14
* starmeged with matt, added some comments to the unsetting of no_proxy in ftp.cc
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-15
* merged with matt's tree
* michael.vogt@canonical.com--2004/apt--mvo--0--patch-16
* added support for "Acquire::gpgv::options" in methods/gpgv.cc
* michael.vogt@ubuntu.com--2005/apt--mvo--0--base-0
tag of michael.vogt@canonical.com--2004/apt--mvo--0--patch-16
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-1
* slightly cosmetic change in methods/gpgv.cc
* 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.xml | 11 |
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> |