summaryrefslogtreecommitdiff
path: root/man/man1/monkeysphere.1
diff options
context:
space:
mode:
authorMatthew James Goins <mjgoins@openflows.com>2010-03-20 13:32:22 -0400
committerMatthew James Goins <mjgoins@openflows.com>2010-03-20 13:32:22 -0400
commit072e05ac7a9872edc3a3e18e103bbba2706254bf (patch)
tree32ef564a9d3cf5be28c121a94f66d73944dc3d93 /man/man1/monkeysphere.1
parentdd71f5ec4a69c58f894f4f6961ca3786a192bc62 (diff)
parente9f00652e3503ef2292e6d27df80cbb4c8e09504 (diff)
Merge remote branch 'origin/master'
Diffstat (limited to 'man/man1/monkeysphere.1')
-rw-r--r--man/man1/monkeysphere.19
1 files changed, 4 insertions, 5 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 4d8eab6..25421ce 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -128,14 +128,13 @@ specify the full fingerprints of specific keys to add to the agent
(space separated), instead of adding them all. `s' may be used in
place of `subkey\-to\-ssh\-agent'.
.TP
-.B sshfpr KEYID
-Output the ssh fingerprint of a key in your gpg keyring. `f' may be
-used in place of `fingerprint'.
-.TP
.B keys\-for\-userid USERID
-Output to stdout all acceptable keys for a given user ID literal.
+Output to stdout all acceptable keys for a given user ID.
`u' may be used in place of `keys\-for\-userid'.
.TP
+.B sshfprs\-for\-userid USERID
+Output the ssh fingerprints of acceptable keys for a given user ID.
+.TP
.B version
Show the monkeysphere version number. `v' may be used in place of
`version'.