Add sshfpr subcommand to monkeysphere

[monkeysphere.git] / man / man8 / monkeysphere-host.8

diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8
index 8968cd7710a11fdcc1e6cdb19926e804a79b77e7..131b8c75ed786cff2027d89734fe36ec45a48a52 100644 (file)
--- a/man/man8/monkeysphere-host.8
+++ b/man/man8/monkeysphere-host.8
@@ -27,7 +27,7 @@ Import a pem-encoded ssh secret host key from file FILE.  If FILE is
 `\-', then the key will be imported from stdin.  Only RSA keys are
 supported at the moment.  NAME[:PORT] is used to specify the
 fully-qualified hostname (and port) used in the user ID of the new
-OpenPGP key.  If PORT is not specified, the no port is added to the
+OpenPGP key.  If PORT is not specified, then no port is added to the
 user ID, which means port 22 is assumed.  `i' may be used in place of
 `import\-key'.
 .TP
@@ -78,12 +78,13 @@ Publish the host's OpenPGP key to the public keyservers.  `p' may be
 used in place of `publish-key'.  Note that there is no way to remove a
 key from the public keyservers once it is published!
 .TP
+.B version
+Show the monkeysphere version number.  `v' may be used in place of
+`version'.
+.TP
 .B help
 Output a brief usage summary.  `h' or `?' may be used in place of
 `help'.
-.TP
-.B version
-show version number
 
 
 Other commands:
@@ -91,7 +92,7 @@ Other commands:
 .B diagnostics
 Review the state of the monkeysphere server host key and report on
 suggested changes.  Among other checks, this includes making sure
-there is a valid host key, that the key is published, that the sshd
+there is a valid host key, that the key is not expired, that the sshd
 configuration points to the right place, etc.  `d' may be used in
 place of `diagnostics'.
 
@@ -100,12 +101,12 @@ place of `diagnostics'.
 To enable host verification via the monkeysphere, an OpenPGP key must
 be made out of the host's ssh key, and the key must be published to
 the Web of Trust.  This is not done by default.  The first step is to
-import the host's ssh key into a monkeysphere OpenPGP key.  This is
-done with the import\-key command.  When importing a key, you must
+import the host's ssh key into a monkeysphere-style OpenPGP key.  This
+is done with the import\-key command.  When importing a key, you must
 specify the path to the host's ssh RSA key to import, and a hostname
 to use as the key's user ID:
 
-$ monkeysphere\-host import\-key /etc/ssh/ssh_host_rsa_key host.example.org
+# monkeysphere\-host import\-key /etc/ssh/ssh_host_rsa_key host.example.org
 
 On most systems, the ssh host RSA key is stored at
 /etc/ssh/ssh_host_rsa_key.
@@ -125,7 +126,7 @@ verify and sign the key, and then re-publish the signature.  Please
 see http://web.monkeysphere.info/signing-host-keys/ for more
 information.  Once an admin's signature is published, users logging
 into the host can use it to validate the host's key without having to
-manually check the hosts key's fingerprint.
+manually check the host key's fingerprint.
 
 .SH ENVIRONMENT
 
@@ -146,7 +147,7 @@ If set to `false', never prompt the user for confirmation. (true)
 
 .TP
 /etc/monkeysphere/monkeysphere\-host.conf
-System monkeysphere-host config file.
+System monkeysphere\-host config file.
 .TP
 /var/lib/monkeysphere/host/ssh_host_rsa_key.pub.gpg
 A world-readable copy of the host's public key in OpenPGP format,
@@ -154,7 +155,7 @@ including all relevant self-signatures.
 
 .SH AUTHOR
 
-Written by:
+This man page was written by:
 Jameson Rollins <jrollins@fifthhorseman.net>,
 Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
 Matthew Goins <mjgoins@openflows.com>
@@ -166,4 +167,4 @@ Matthew Goins <mjgoins@openflows.com>
 .BR monkeysphere (7),
 .BR gpg (1),
 .BR ssh (1),
-.BR sshd (8),
+.BR sshd (8)