[ David Kalnischkies ]

* doc/makefile:
  - create doxygen directory to avoid depending on magic (Closes: #628799)
* cmdline/apt-key:
  - explicitly state that net-update is not supported if no url is set
  - require to be root for add, rm, update and net-update
  - clarify update vs. net-update in different distros (Closes: #632043)
* debian/apt.symbols:
  - forgot 'mips' in the list for all architecture dependent symbols
  - comment out gcc-4.5 specific symbols as gcc-4.6 is now default
  - the symbol for PrintStatus() is architecture dependent
* apt-pkg/policy.cc:
  - do not segfault in pinning if a package with this name doesn't exist.
    Thanks to Ferdinand Thommes for the report!
  - Defaults is a vector of Pin not of PkgPin
  - ensure that only the first specific stanza for a package is used
  - save all stanzas which had no effect in Unmatched
  - allow package:architecure in Package:
  - remove invalid pkgcache.bin and rebuild it if possible
  - log reinstall commands in history.log
* apt-pkg/init.cc:
  - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!
* cmdline/apt-config.cc:
  - show Acquire::Languages and APT::Architectures settings
    in 'dump' (Closes: 626739)
* apt-pkg/orderlist.cc:
  - ensure that an old version of a package with a provides can
    never satisfy a dependency of a newer version of this package
[ Michael Vogt ]
* methods/mirror.cc:
  - ignore lines starting with "#" in the mirror file
  - ignore non http urls in the mirrors
  - append the dist (e.g. sid, wheezy) as a query string when
    asking for a suitable mirror 
* apt-pkg/deb/deblistparser.cc:
  - include all known languages when building the apt cache
    (LP: #794907)
* apt-pkg/deb/debindexfile.cc:
  - remove some no longer valid checks for "TranslationsAvailable()"
[ Kenneth Solbø Andersen ]
* apt-pkg/deb/dpkgpm.cc:
  - set permissions of term.log to root.adm and 644 (LP: #404724)

[ Chris Leick ]
* various typo and syntax corrections in doc/*.xml

[Chris Baines]
* Began to fix DepAdd for imediate configuration of all packages

1 files changed, 12 insertions, 9 deletions

diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 9bfab84b6..f17f0c45e 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -128,9 +128,10 @@
      <listitem>
      <para>
 
-       Update the local keyring with the keyring of Debian archive
-       keys and removes from the keyring the archive keys which are no
-       longer valid.
+       Update the local keyring with the archive keyring and remove from
+       the local keyring the archive keys which are no longer valid.
+       The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
+       distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
 
      </para>
 
@@ -141,12 +142,14 @@
      <listitem>
      <para>
 
-       Update the local keyring with the keys of a key server
-       and removes from the keyring the archive keys which are no
-       longer valid. This requires an installed wget and an APT
-       build configured to have a server to fetch from. APT in
-       Debian does not support this command, but Ubuntu's APT
-       does.
+       Work similar to the <command>update</command> command above, but get the
+       archive keyring from an URI instead and validate it against a master key.
+
+       This requires an installed &wget; and an APT build configured to have
+       a server to fetch from and a master keyring to validate.
+
+       APT in Debian does not support this command and relies on
+       <command>update</command> instead, but Ubuntu's APT does.
 
      </para>