diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-06-11 15:13:24 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-06-11 15:13:24 -0700 |
| commit | 825098c2740b2d5ebea0c16c43685f55da201315 (patch) | |
| tree | b3a43f792cca021a79f541a9454e0223e4dca9cb /doc/apt-key.8.xml | |
| parent | 310ed3c13d5cfd2a3c46741539f652d69bda5d30 (diff) | |
| parent | e08c5854bb9b5f352b0856533f95c12e858728ca (diff) | |
Merge version 0.9.6 from Debian
Diffstat (limited to 'doc/apt-key.8.xml')
| -rw-r--r-- | doc/apt-key.8.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index fcbc35aae..9d51f4f7b 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -17,7 +17,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2012-05-21T00:00:00Z</date> + <date>2012-06-09T00:00:00Z</date> </refentryinfo> <refmeta> @@ -141,13 +141,13 @@ <listitem> <para> - 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. + Perform an update working similarly to the <command>update</command> command above, + but get the archive keyring from a 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 + APT in Debian does not support this command, relying on <command>update</command> instead, but Ubuntu's APT does. </para> @@ -161,7 +161,7 @@ <para>Note that options need to be defined before the commands described in the previous section.</para> <variablelist> <varlistentry><term><option>--keyring</option> <option>&synopsis-param-filename;</option></term> - <listitem><para>With this option it is possible to specify a specific keyring + <listitem><para>With this option it is possible to specify a particular keyring file the command should operate on. The default is that a command is executed on the <filename>trusted.gpg</filename> file as well as on all parts in the <filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</filename> |