summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-12 00:41:13 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-12 00:41:13 -0500
commit1c1b3a755c34be62ffcb412fd4704d60c74b0a28 (patch)
tree1ccf368155d7895ba7357e822112e638c3c3770f
parentfb1f418bda543af10195828a19a7c8cc2b250f8c (diff)
touching up the switch to keys-for-userid
-rw-r--r--man/man1/monkeysphere.14
-rwxr-xr-xsrc/monkeysphere2
2 files changed, 3 insertions, 3 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 459bfcb..8b73583 100644
--- 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 233e63f..e84ee63 100755
--- 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 "$@"
;;