diff options
| author | Dan McGee <dan@archlinux.org> | 2011-09-26 12:41:27 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-05 21:55:53 -0500 |
| commit | ab7d2890a47f051a892b05b4d551de0e5c5c8282 (patch) | |
| tree | 32fe7bbe6d4d930351e6fa6561f6f472f709a3eb /doc | |
| parent | cf0edb92ba349afad02e6bc1ca79da0cb6a72ea3 (diff) | |
| download | pacman-ab7d2890a47f051a892b05b4d551de0e5c5c8282.tar.xz | |
pacman-key: refine and clarify import/import-trustdb behavior
* --import now only imports keys from pubkey.gpg and does not import
owner trust; if you want to have both simply run the operations in
sequence.
* --import-trustdb has been simplified; it will overwrite existing
values in the trust database as before, but there is no need to export
it first as those values are safe if left untouched.
* Fix the manpage referring to a non-existent option.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/pacman-key.8.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt index 103a1fdd..d2da480f 100644 --- a/doc/pacman-key.8.txt +++ b/doc/pacman-key.8.txt @@ -61,11 +61,12 @@ Options Output syntax and command line options. *\--import* <dir(s)>:: - Adds keys from pubring.gpg into pacman's keyring and imports ownertrust - values from trustdb.gpg in the specified directories. + Imports keys from `pubring.gpg` into the public keyring from the specified + directories. -*\--import-dirs* <dir(s)> :: - Imports ownertrust values from trustdb.gpg in the specified directories. +*\--import-trustdb* <dir(s)> :: + Imports ownertrust values from `trustdb.gpg` into the shared trust database + from the specified directories. *\--init*:: Ensure the keyring is properly initialized and has the required access |