diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-10-21 19:45:27 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-10-21 19:45:27 +0000 |
| commit | efaa82c1941a2f58467c19ad4e6e08bf53e73e35 (patch) | |
| tree | 9fbcd1b208f721b6506b9a352850defe03a23303 /doc | |
| parent | 3708af292b7c6a5a3b08f1acad8e4651fab588a9 (diff) | |
| parent | 4e0ad446347b1f3d70a66001365382db4d8e45f3 (diff) | |
Merge with Michael
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65
* inital support for "apt-get source -t dist" (but no downgrades yet
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66
* full support for apt-get source -t now (and honor pining too)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67
* added APT::Authentication::Trust-CDROM option
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68
* fix a crash in apt-ftparchive
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69
* sparc64 alignment fix
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70
* fix segfault when there is no Archive for a VerFile
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71
* don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72
* corrections in the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73
* init the default ScreenWidth to 79 columns by default (Closes: #324921)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74
apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75
* seting section to "admin" to match override file
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76
* finalized the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77
* renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1
* implemented "TrustCDROM" mode
* michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2
* added APT::Authentication::TrustCDROM to the configure-index
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/apt-cache.8.xml | 2 | ||||
| -rw-r--r-- | doc/examples/configure-index | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml index 34749fd77..0e1d2f8d9 100644 --- a/doc/apt-cache.8.xml +++ b/doc/apt-cache.8.xml @@ -214,7 +214,7 @@ Reverse Provides: </varlistentry> <varlistentry><term>rdepends <replaceable>pkg(s)</replaceable></term> - <listitem><para><literal>rdepends</literal>shows a listing of each reverse dependency a + <listitem><para><literal>rdepends</literal> shows a listing of each reverse dependency a package has.</para></listitem> </varlistentry> diff --git a/doc/examples/configure-index b/doc/examples/configure-index index dee0c06ff..a93b74349 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -72,6 +72,11 @@ APT NoAct "false"; }; + Authentication + { + TrustCDROM "false"; // consider the CDROM always trusted + }; + GPGV { TrustedKeyring "/etc/apt/trusted.gpg"; |