Merge remote branch 'origin/master'

[monkeysphere.git] / man / man1 / monkeysphere.1

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index e725aa585a56c2ed1f22ccc4a7db1f009dc590bf..25421cef9fcf7580c1826c1315091e7b1ad9aefa 100644 (file)
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -14,8 +14,8 @@ monkeysphere - Monkeysphere client user interface
 for OpenSSH and TLS key-based authentication.  OpenPGP keys are
 tracked via GnuPG, and added to the authorized_keys and known_hosts
 files used by OpenSSH for connection authentication.  Monkeysphere can
-also be used by a monkeysphere validation agent to validate TLS
-connections on the web.
+also be used by a validation agent to validate TLS connections
+(e.g. https).
 
 \fBmonkeysphere\fP is the Monkeysphere client utility.
 
@@ -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'.
@@ -201,7 +200,7 @@ added to the given user's authorized_keys file.
 .SH AUTHOR
 
 Written by:
-Jameson Rollins <jrollins@fifthhorseman.net>,
+Jameson Rollins <jrollins@finestructure.net>,
 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 
 .SH SEE ALSO