diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 14:40:28 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-12-19 14:40:28 +0100 |
commit | 0418949ebe9fc886e7794fa1de17c8b6c74e65ea (patch) | |
tree | 51e86475e77acf0ddc96ee419b47d2cd7dddb3d4 /doc/apt-key.8.xml | |
parent | 2f67d29b0c3de8618983055e811e70ee36662f4a (diff) | |
parent | 17e4eb255750033b9fc6c64ad028c19f98ad08ad (diff) |
merged from debian-sid
Diffstat (limited to 'doc/apt-key.8.xml')
-rw-r--r-- | doc/apt-key.8.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml index f17f0c45e..cae2b00a0 100644 --- a/doc/apt-key.8.xml +++ b/doc/apt-key.8.xml @@ -165,7 +165,7 @@ <listitem><para>With this option it is possible to specify a specific 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, through <filename>trusted.gpg</filename> + <filename>trusted.gpg.d</filename> directory, though <filename>trusted.gpg</filename> is the primary keyring which means that e.g. new keys are added to this one. </para></listitem> </varlistentry> |