From: Daniel Kahn Gillmor Date: Tue, 12 Jan 2010 05:41:13 +0000 (-0500) Subject: touching up the switch to keys-for-userid X-Git-Tag: monkeysphere_0.28~46 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1c1b3a755c34be62ffcb412fd4704d60c74b0a28;p=monkeysphere.git touching up the switch to keys-for-userid --- 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 "$@" ;;