reorganize shortcuts for monkeysphere-server

diff --git a/man/man8/monkeysphere-server.8 b/man/man8/monkeysphere-server.8
index 527cae791f9b131521f0166a451a761b41a5b0b5..74e9a10109b8353945fec28f3c5c7458eb75a9d0 100644 (file)
--- a/man/man8/monkeysphere-server.8
+++ b/man/man8/monkeysphere-server.8
@@ -68,15 +68,15 @@ domain (e.g. "trust KEYID to certify user identities within the
 @example.org domain").  A certifier trust level can be specified with
 the `-t' or `--trust' option (possible values are `marginal' and
 `full' (default is `full')).  A certifier trust depth can be specified
-with the `-d' or `--depth' option (default is 1).  `a' may be used in
+with the `-d' or `--depth' option (default is 1).  `c+' may be used in
 place of `add-identity-certifier'.
 .TP
 .B remove-identity-certifier KEYID
 Instruct system to ignore user identity certifications made by KEYID.
-`r' may be used in place of `remove-identity-certifier'.
+`c-' may be used in place of `remove-identity-certifier'.
 .TP
 .B list-identity-certifiers
-List key IDs trusted by the system to certify user identities.  `l'
+List key IDs trusted by the system to certify user identities.  `c'
 may be used in place of `list-identity-certifiers'.
 .TP
 .B gpg-authentication-cmd

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index d9b867676f49045da0688fe88a6254781caa172a..21973dd2993c0819618d452499ad12c6de6f1d5a 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -43,16 +43,16 @@ subcommands:
    -l|--length BITS                    key length in bits (2048)
    -e|--expire EXPIRE                  date to expire
    -r|--revoker FINGERPRINT            add a revoker
- show-fingerprint (f)                show server's host key fingerprint
- publish-key (p)                     publish server's host key to keyserver
- diagnostics (d)                     report on the server's monkeysphere status
+ show-fingerprint (f)                show server host key fingerprint
+ publish-key (p)                     publish server host key to keyserver
+ diagnostics (d)                     report on server monkeysphere status
 
- add-identity-certifier (a) KEYID    import and tsign a certification key
-   -n|--domain DOMAIN                  limit ID certifications to IDs in DOMAIN
+ add-id-certifier (c+) KEYID         import and tsign a certification key
+   -n|--domain DOMAIN                  limit ID certifications to DOMAIN
    -t|--trust TRUST                    trust level of certifier (full)
    -d|--depth DEPTH                    trust depth for certifier (1)
- remove-identity-certifier (r) KEYID remove a certification key
- list-identity-certifiers (l)        list certification keys
+ remove-id-certifier (c-) KEYID      remove a certification key
+ list-id-certifiers (c)              list certification keys
 
  gpg-authentication-cmd CMD          gnupg-authentication command
 
@@ -696,15 +696,15 @@ case $COMMAND in
        diagnostics
        ;;
 
-    'add-identity-certifier'|'add-certifier'|'a')
+    'add-identity-certifier'|'add-id-certifier'|'add-certifier'|'c+')
        add_certifier "$1"
        ;;
 
-    'remove-identity-certifier'|'remove-certifier'|'r')
+    'remove-identity-certifier'|'remove-id-certifier'|'remove-certifier'|'c-')
        remove_certifier "$1"
        ;;
 
-    'list-identity-certifiers'|'list-certifiers'|'list-certifier'|'l')
+    'list-identity-certifiers'|'list-id-certifiers'|'list-certifiers'|'list-certifier'|'c')
        list_certifiers "$@"
        ;;
 

diff --git a/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn b/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn
index 5a4b946407a06a312ff0717c671c6bb99966686f..104bda7b5b4eb659217c864ee7aecdbb6e11c490 100644 (file)
--- a/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn
+++ b/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn
@@ -17,3 +17,6 @@ This would let us create new subcommands like:
 * `revoke-host-name` (`n-`)
 * `list-host-names` (`n`)
 
+---
+
+[[bugs/done]] 2008-08-14