On Fri, Jul 8, 2011 at 8:31 AM, Allan McRae <[email protected]> wrote: > Update man page to reflect current options. Also add a description > on how to manually interact with the pacman keyring with gpg. > > Signed-off-by: Allan McRae <[email protected]> > --- > doc/pacman-key.8.txt | 57 +++++++++++++++++++++++-------------------------- > 1 files changed, 27 insertions(+), 30 deletions(-) > > diff --git a/doc/pacman-key.8.txt b/doc/pacman-key.8.txt > index 892f14d..c024923 100644 > --- a/doc/pacman-key.8.txt > +++ b/doc/pacman-key.8.txt > @@ -12,65 +12,62 @@ 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 > -------- > -*\--config* <file>:: > - Use an alternate config file instead of the +{sysconfdir}/pacman.conf+ > - default. > > -*\--gpgdir* <dir>:: > - Set an alternate home directory for GnuPG. If unspecified, the value > is > - read from +{sysconfdir}/pacman.conf+. > - > - > -Commands > +Options > ------- > -*-a, \--add* file ...:: > +*-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. > > -*\--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. > +*\--config* <file>:: > + Use an alternate config file instead of the +{sysconfdir}/pacman.conf+ > + default. > > -*-d, \--del* keyid ...:: > - Remove the key(s) identified by the specified keyid or keyids from > pacman's > +*-d, \--del* <keyid(s)>:: > + Remove the key(s) identified by the specified keyid(s) from pacman's > keyring.
Should be --delete instead of --del
