From: Micah Anderson <micah@riseup.net>
Date: Wed, 13 Aug 2008 04:31:11 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.8-1~31^2~6
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=4d54f1d8b9a3d9ee4e6bd0b0d9fdccb99e6a6245;hp=68a626b30117bb7c40e3e3eedb8139f1085b8ca2;p=monkeysphere.git

Merge commit 'dkg/master'
---

diff --git a/doc/README b/doc/README
index cf2f396..684f524 100644
--- a/doc/README
+++ b/doc/README
@@ -30,7 +30,7 @@ hosts are.  This can be done with the monkeysphere-ssh-proxycommand
 
 $ monkeysphere update-known_hosts
 
-This will command will check to see if there is an OpenPGP key for
+This command will check to see if there is an OpenPGP key for
 each (non-hashed) host listed in the known_hosts file, and then add
 the key for that host to the known_hosts file if one is found.  This
 command could be added to a crontab as well, if desired.
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 9e025f9..3ca0656 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -56,7 +56,7 @@ subcommands:
 
  gpg-authentication-cmd CMD          gnupg-authentication command
 
- help (h,?)                          this help
+ -h|--help|help (h,?)                this help
 EOF
 }
 
@@ -236,7 +236,7 @@ gen_key() {
     revoker=
 
     # get options
-    TEMP=$(getopt -o l:e:r: -l length:,expire:,revoker: -n "$PGRM" -- "$@")
+    TEMP=$(getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@")
 
     if [ $? != 0 ] ; then
 	exit 1
@@ -712,7 +712,7 @@ case $COMMAND in
 	gpg_authentication_cmd "$@"
 	;;
 
-    'help'|'h'|'?')
+    '--help'|'help'|'-h'|'h'|'?')
         usage
         ;;