diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-17 23:47:43 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-08-17 23:47:43 -0400 |
| commit | 26ad8fe480056709dacf9e06e8151de167a908ab (patch) | |
| tree | a3d2189ef12f2e7b9ba4ac6d0e26bd62ed2f12d6 | |
| parent | ced3f32242a7f06a6ccb131e7ec500c95441577d (diff) | |
fixing usage for gen-subkey; allowing --help for monkeysphere (to match monkeysphere-server behavior).
| -rw-r--r-- | man/man1/monkeysphere.1 | 14 | ||||
| -rwxr-xr-x | src/monkeysphere | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1 index fe4fd36..db35a38 100644 --- a/man/man1/monkeysphere.1 +++ b/man/man1/monkeysphere.1 @@ -52,12 +52,14 @@ ID, 1 if no matching keys were found at all, and 2 if matching keys were found but none were acceptable. `a' may be used in place of `update-authorized_keys'. .TP -.B gen-subkey KEYID -Generate an authentication subkey. For the primary key with the -specified key ID, generate a subkey with "authentication" capability -that can be used for monkeysphere transactions. An expiration length -can be specified with the `-e' or `--expire' option (prompt -otherwise). `g' may be used in place of `gen-subkey'. +.B gen-subkey [KEYID] +Generate an authentication subkey for a private key in your GnuPG +keyring. For the primary key with the specified key ID, generate a +subkey with "authentication" capability that can be used for +monkeysphere transactions. An expiration length can be specified with +the `-e' or `--expire' option (prompt otherwise). If no key ID is +specified, but only one key exists in the secret keyring, that key +will be used. `g' may be used in place of `gen-subkey'. .TP .B help Output a brief usage summary. `h' or `?' may be used in place of diff --git a/src/monkeysphere b/src/monkeysphere index f959a38..303dc8d 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -39,7 +39,7 @@ MonkeySphere client tool. subcommands: update-known_hosts (k) [HOST]... update known_hosts file update-authorized_keys (a) update authorized_keys file - gen-subkey (g) KEYID generate an 'a' capable subkey + gen-subkey (g) [KEYID] generate an authentication subkey --length (-l) BITS key length in bits (2048) --expire (-e) EXPIRE date to expire help (h,?) this help @@ -288,7 +288,7 @@ case $COMMAND in gen_subkey "$@" ;; - 'help'|'h'|'?') + '--help'|'help'|'-h'|'h'|'?') usage ;; |