touching up the switch to keys-for-userid

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 459bfcb83da681783d7932b884dd71c026d1576e..8b73583e309ca7a5ef4cc1ccf25ace98452ce377 100644 (file)
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -130,9 +130,9 @@ place of `subkey\-to\-ssh\-agent'.
 Output the ssh fingerprint of a key in your gpg keyring. `f' may be
 used in place of `fingerprint'.
 .TP
-.B keys\-from\-userid USERID
+.B keys\-for\-userid USERID
 Output to stdout all acceptable keys for a given user ID literal.
-`u' may be used in place of `keys\-from\-userid'.
+`u' may be used in place of `keys\-for\-userid'.
 .TP
 .B version
 Show the monkeysphere version number.  `v' may be used in place of

diff --git a/src/monkeysphere b/src/monkeysphere
index 233e63f8e0e56c2faa1a1597b90ce9ae19ad0d70..e84ee63c24254041bd05becd0d0d4b2ce4712099 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -280,7 +280,7 @@ case $COMMAND in
        ;;
 
     'keys-from-userid')
-       echo "Warning: this usage is deprecated.  Please use 'keys-for-userid' instead." >&2
+       echo "Warning: 'keys-from-userid' is deprecated.  Please use 'keys-for-userid' instead." >&2
        keys_for_userid "$@"
        ;;