Merge commit 'dkg/master'

2 files changed, 3 insertions, 3 deletions

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
         ;;
 
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index fcd3114..6754b23 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -493,7 +493,7 @@ EOF
 
 	show_server_key
 
-	echo "NOTE: User ID revoked, but revokation not published."
+	echo "NOTE: User ID revoked, but revocation not published."
 	echo "Run '$PGRM publish-key' to publish the revocation."
     else
 	failure "Problem revoking user ID."