diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt
index 892f14df..f961bc2e 100644
--- a/doc/pacman-key.8.txt
+++ b/doc/pacman-key.8.txt
@@ -12,65 +12,63 @@ pacman-key - manage pacman's list of trusted keys
 
 Synopsis
 --------
-'pacman-key' [options] <command> [arguments]
+'pacman-key' [options]
 
 
 Description
 -----------
-'pacman-key' is a script used to manage pacman's keyring, which is the collection
-of GnuPG keys used to check signed packages. It provides the ability to import
-and export keys, fetch keys from keyservers and update the key trust database.
+'pacman-key' is a wrapper script for GnuPG used to manage pacman's keyring, which
+is the collection of PGP keys used to check signed packages and databases. It
+provides the ability to import and export keys, fetch keys from keyservers and
+update the key trust database.
+
+More complex keyring management can be achieved using GnuPG directly combined with
+the `--homedir` option pointing at the pacman keyring (located in
++{sysconfdir}/pacman.d/gnupg+ by default).
 
 
 Options
 -------
+*-a, \--add* [file(s)]::
+	Add the key(s) contained in the specified file or files to pacman's
+	keyring. If a key already exists, update it.
+
 *\--config* <file>::
 	Use an alternate config file instead of the +{sysconfdir}/pacman.conf+
 	default.
 
+*-d, \--delete* <keyid(s)>::
+	Remove the key(s) identified by the specified keyid(s) from pacman's
+	keyring.
+
+*-e, \--export* [keyid(s)]::
+	Export key(s) identified by the specified keyid(s) to 'stdout'. If no keyid
+	is specified, all keys will be exported.
+
+*\--edit-key * <keyid(s)>::
+	Present a menu for key management task on the specified keyids. Useful for
+	adjusting a keys trust level.
+
+*-f, \--finger* [keyid(s)]::
+	List a fingerprint for each specified keyid, or for all known keys if no
+	keyids are specified.
+
 *\--gpgdir* <dir>::
 	Set an alternate home directory for GnuPG. If unspecified, the value is
 	read from +{sysconfdir}/pacman.conf+.
 
-
-Commands
--------
-*-a, \--add* file ...::
-	Add the key(s) contained in the specified file or files to pacman's
-	keyring. If a key already exists, update it.
-
-*\--adv* param ...::
-	Use this option to issue particular GnuPG actions to pacman's keyring. This
-	option should be used with care as it can modify pacman's trust in
-	packages' signatures.
-
-*-d, \--del* keyid ...::
-	Remove the key(s) identified by the specified keyid or keyids from pacman's
-	keyring.
-
-*-e, \--export* [keyid ...]::
-	Export key(s) identified by the specified keyid to 'stdout'. If no keyid is
-	specified, all keys will be exported.
-
-*-f, \--finger* [keyid ...]::
-	List a fingerprint for each specified keyid, or for all known keys if no
-	keyids are specified.
-
 *-h, \--help*::
 	Output syntax and command line options.
 
 *-l, \--list*::
 	Equivalent to --list-sigs from GnuPG.
 
-*-r, \--receive* keyserver keyid ...::
+*-r, \--receive* <keyserver> <keyid(s)>::
 	Fetch the specified keyids from the specified key server URL.
 
 *\--reload*::
 	Reloads the keys from the keyring package.
 
-*-t, \--trust* keyid::
-	Set the trust level of the given key.
-
 *-u, \--updatedb*::
 	Equivalent to \--check-trustdb in GnuPG.