summaryrefslogtreecommitdiff
path: root/doc/apt-key.8.xml
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-06-30 09:21:55 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-06-30 09:21:55 +0100
commitf5b622ed48fdbe235d81b61b3edd8dbb84d9cc9c (patch)
tree24b7f924f22cd6e5f463ab88c95e6d185d81c5d2 /doc/apt-key.8.xml
parent6f747894998e10649d0237fe5f7b9b85a5266f1f (diff)
parent8d0303273495fc478ae62570ecf1675942cfbc41 (diff)
merged from debian-sid
Diffstat (limited to 'doc/apt-key.8.xml')
-rw-r--r--doc/apt-key.8.xml21
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>