* merged from the debian-sid bzr branch

* apt-pkg/depcache.cc:
  - Really release action groups only once (Closes: #622744)
  - Make purge work again for config-files (LP: #244598) (Closes: #150831)
* debian/apt.cron.daily:
  - Check power after wait, patch by manuel-soto (LP: #705269)
* debian/control:
  - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
    unpacked if a library is too old and thus break upgrades
* doc/apt-key.8.xml:
  - Document apt-key net-update (LP: #192810)
* apt-pkg/acquire-item.cc:
  - Only try to rename existing Release files (Closes: #622912)
* apt-pkg/indexcopy.cc:
  - Use RealFileExists() instead of FileExists(), allows amongst other
    things a directory named Sources to exist on a CD-ROM (LP: #750694).
* apt-pkg/acquire-item.cc:
  - Use Release files even if they cannot be verified (LP: #704595)
* cmdline/apt-get.cc:
  - Do not install recommends for build-dep (Closes: #454479) (LP: #245273)
* apt-pkg/deb/deblistparser.cc:
  - Handle no space before "[" in build-dependencies (LP: #72344)
* apt-pkg/policy.cc:
  - Allow pinning by glob() expressions, and regular expressions
    surrounded by slashes (the "/" character) (LP: #399474)
    (Closes: #121132)
* debian/control:
  - Set Standards-Version to 3.9.2

* mirror method:
  - do not crash if the mirror file fails to download
* apt-pkg/aptconfiguration.cc:
  - fix comparing for a empty string
* debian/apt.cron.daily:
  - run unattended-upgrades even if there was a error during
    the apt-get update (LP: #676295)
* apt-pkg/pkgcache.cc:
  - use the native Architecture stored in the cache header instead of
    loading it from configuration as suggested by Julian Andres Klode

1 files changed, 16 insertions, 0 deletions

diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index f1cc3ac02..9bfab84b6 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -136,6 +136,22 @@
 
      </listitem>
      </varlistentry>
+     
+     <varlistentry><term>net-update</term>
+     <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.
+
+     </para>
+
+     </listitem>
+     </varlistentry>
    </variablelist>
 </refsect1>