diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-14 11:20:28 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-14 11:20:28 +0200 |
| commit | cf4904e1e0019fc09b9c53b587f5f4361ed26ec7 (patch) | |
| tree | bb8336111e2088af8fd856861fa3c8f6ffba206c /doc/apt-key.8.xml | |
| parent | 953b348cb02fcdccb597b6988f904bfdb696e92e (diff) | |
| parent | 89c4c588b275d098af33f36eeddea6fd75068342 (diff) | |
merged from debian-sid
Diffstat (limited to 'doc/apt-key.8.xml')
| -rw-r--r-- | doc/apt-key.8.xml | 21 |
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> |