RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   16-Aug-2007 20:33:41
  Branch: HEAD                             Handle: 2007081619334100

  Modified files:
    rpm/tools               rpmkey.c

  Log:
    shorter --help section message.
    add cmd descriptions.

  Summary:
    Revision    Changes     Path
    1.2         +30 -30     rpm/tools/rpmkey.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tools/rpmkey.c
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 rpmkey.c
  --- rpm/tools/rpmkey.c	15 Aug 2007 14:11:48 -0000	1.1
  +++ rpm/tools/rpmkey.c	16 Aug 2007 18:33:41 -0000	1.2
  @@ -1206,66 +1206,66 @@
   	NULL, NULL },
   
     { "show", '\0', POPT_ARG_MAINCALL,	rpmkeyShow, 0,
  -	N_("X"), N_("") },
  +	N_("Show process keyrings"), N_("") },
     { "add", '\0', POPT_ARG_MAINCALL,	rpmkeyAdd, 0,
  -	N_("X"), N_("<type> <desc> <data> <keyring>") },
  +	N_("Add a key to a keyring"), N_("<type> <desc> <data> <keyring>") },
     { "padd", '\0', POPT_ARG_MAINCALL,	rpmkeyPAdd, 0,
  -	N_("X"), N_("<type> <desc> <keyring>") },
  +	N_("Add a key to a keyring"), N_("<type> <desc> <keyring>") },
     { "request", '\0', POPT_ARG_MAINCALL,	rpmkeyRequest, 0,
  -	N_("X"), N_("<type> <desc> [<dest_keyring>]") },
  +	N_("Request a key"), N_("<type> <desc> [<dest_keyring>]") },
     { "request2", '\0', POPT_ARG_MAINCALL,rpmkeyRequest2, 0,
  -	N_("X"), N_("<type> <desc> <info> [<dest_keyring>]") },
  +	N_("Request a key"), N_("<type> <desc> <info> [<dest_keyring>]") },
     { "prequest2", '\0', POPT_ARG_MAINCALL,rpmkeyPRequest2, 0,
  -	N_("X"), N_("<type> <desc> [<dest_keyring>]") },
  +	N_("Request a key"), N_("<type> <desc> [<dest_keyring>]") },
     { "update", '\0', POPT_ARG_MAINCALL,	rpmkeyUpdate, 0,
  -	N_("X"), N_("<key> <data>") },
  +	N_("Update a key"), N_("<key> <data>") },
     { "pupdate", '\0', POPT_ARG_MAINCALL,	rpmkeyPUpdate, 0,
  -	N_("X"), N_("<key>") },
  +	N_("Update a key"), N_("<key>") },
     { "newring", '\0', POPT_ARG_MAINCALL,	rpmkeyNewring, 0,
  -	N_("X"), N_("<name> <keyring>") },
  +	N_("Create a keyring"), N_("<name> <keyring>") },
     { "revoke", '\0', POPT_ARG_MAINCALL,	rpmkeyRevoke, 0,
  -	N_("X"), N_("<key>") },
  +	N_("Revoke a key"), N_("<key>") },
     { "clear", '\0', POPT_ARG_MAINCALL,	rpmkeyClear, 0,
  -	N_("X"), N_("<keyring>") },
  +	N_("Clear a keyring"), N_("<keyring>") },
     { "link", '\0', POPT_ARG_MAINCALL,	rpmkeyLink, 0,
  -	N_("X"), N_("<key> <keyring>") },
  +	N_("Link a key to a keyring"), N_("<key> <keyring>") },
     { "unlink", '\0', POPT_ARG_MAINCALL,	rpmkeyUnlink, 0,
  -	N_("X"), N_("<key> <keyring>") },
  +	N_("Unlink a key from a keyring"), N_("<key> <keyring>") },
     { "search", '\0', POPT_ARG_MAINCALL,	rpmkeySearch, 0,
  -	N_("X"), N_("<keyring> <type> <desc> [<dest_keyring>]") },
  +	N_("Search a keyring"), N_("<keyring> <type> <desc> [<dest_keyring>]") },
     { "read", '\0', POPT_ARG_MAINCALL,	rpmkeyRead, 0,
  -	N_("X"), N_("<key>") },
  +	N_("Read a key"), N_("<key>") },
     { "pipe", '\0', POPT_ARG_MAINCALL,	rpmkeyPipe, 0,
  -	N_("X"), N_("<key>") },
  +	N_("Read a key"), N_("<key>") },
     { "print", '\0', POPT_ARG_MAINCALL,	rpmkeyPrint, 0,
  -	N_("X"), N_("<key>") },
  +	N_("Read a key"), N_("<key>") },
     { "list", '\0', POPT_ARG_MAINCALL,	rpmkeyList, 0,
  -	N_("X"), N_("<keyring>") },
  +	N_("List a keyring"), N_("<keyring>") },
     { "rlist", '\0', POPT_ARG_MAINCALL,	rpmkeyRList, 0,
  -	N_("X"), N_("<keyring>") },
  +	N_("List a keyring"), N_("<keyring>") },
     { "describe", '\0', POPT_ARG_MAINCALL,rpmkeyDescribe, 0,
  -	N_("X"), N_("<keyring>") },
  +	N_("Describe a key"), N_("<keyring>") },
     { "rdescribe", '\0', POPT_ARG_MAINCALL,rpmkeyRDescribe, 0,
  -	N_("X"), N_("<keyring> [sep]") },
  +	N_("Describe a key"), N_("<keyring> [sep]") },
     { "chown", '\0', POPT_ARG_MAINCALL,	rpmkeyChown, 0,
  -	N_("X"), N_("<key> <uid>") },
  +	N_("Change the access controls on a key"), N_("<key> <uid>") },
     { "chgrp", '\0', POPT_ARG_MAINCALL,	rpmkeyChgrp, 0,
  -	N_("X"), N_("<key> <gid>") },
  +	N_("Change the access controls on a key"), N_("<key> <gid>") },
     { "setperm", '\0', POPT_ARG_MAINCALL,	rpmkeySetperm, 0,
  -	N_("X"), N_("<key> <mask>") },
  +	N_("Set the permissions mask on a key"), N_("<key> <mask>") },
     { "session", '\0', POPT_ARG_MAINCALL,	rpmkeySession, 0,
  -	N_("X"), N_("[{-|<name>} [<prog> <arg1> <arg2> ...]]") },
  +	N_("Start a new session with fresh keyrings"), N_("[{-|<name>} [<prog> <arg1> <arg2> ...]]") },
     { "instantiate", '\0', POPT_ARG_MAINCALL,rpmkeyInstantiate, 0,
  -	N_("X"), N_("<key> <data> <keyring>") },
  +	N_("Instantiate a key"), N_("<key> <data> <keyring>") },
     { "pinstantiate", '\0', POPT_ARG_MAINCALL,rpmkeyPInstantiate, 0,
  -	N_("X"), N_("<key> <keyring>") },
  +	N_("Instantiate a key"), N_("<key> <keyring>") },
     { "negate", '\0', POPT_ARG_MAINCALL,	rpmkeyNegate, 0,
  -	N_("X"), N_("<key> <timeout> <keyring>") },
  +	N_("Instantiate a key"), N_("<key> <timeout> <keyring>") },
     { "timeout", '\0', POPT_ARG_MAINCALL,	rpmkeyTimeout, 0,
  -	N_("X"), N_("<key> <timeout>") },
  +	N_("Set the expiry time on a key"), N_("<key> <timeout>") },
   
    { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
  -	N_("Common options for all rpm modes and executables:"),
  +	N_("Common options:"),
   	NULL },
   
       POPT_AUTOALIAS
  @@ .