summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/README2
-rwxr-xr-xsrc/monkeysphere-server6
2 files changed, 4 insertions, 4 deletions
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
;;