From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 29 Jun 2011 16:15:44 +0000 (+0200)
Subject: clarify update vs. net-update in different distros (Closes: #632043)
X-Git-Tag: 0.8.15.3~4^2~16
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f7acb21c7eea6f90f8596add1ec9514e14c1f816?ds=inline

clarify update vs. net-update in different distros (Closes: #632043)
---

diff --git a/debian/changelog b/debian/changelog
index 51dda4d0c..395fe121d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ apt (0.8.15.1) unstable; urgency=low
   * 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)
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 29 Jun 2011 17:24:02 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 29 Jun 2011 18:14:52 +0200
 
 apt (0.8.15) unstable; urgency=low
 
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>
 
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a194a9d0d..14cd70e89 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -148,6 +148,12 @@
   </citerefentry>"
 >
 
+<!ENTITY wget "<citerefentry>
+    <refentrytitle><command>wget</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-email "
    <address>