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>

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