From ab7d2890a47f051a892b05b4d551de0e5c5c8282 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 26 Sep 2011 12:41:27 -0500 Subject: 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 --- doc/pacman-key.8.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') 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* :: - 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* :: - Imports ownertrust values from trustdb.gpg in the specified directories. +*\--import-trustdb* :: + 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 -- cgit v1.2.3