Merge commit 'dkg/master'

[monkeysphere.git] / man / man1 / monkeysphere-ssh-proxycommand.1

diff --git a/man/man1/monkeysphere-ssh-proxycommand.1 b/man/man1/monkeysphere-ssh-proxycommand.1
index 5a84dc5edf9ab9e74e34077d5b836af5f7f9d7f0..1606a5d2c318cece3d072a32d91c273c22dff33e 100644 (file)
--- a/man/man1/monkeysphere-ssh-proxycommand.1
+++ b/man/man1/monkeysphere-ssh-proxycommand.1
@@ -37,17 +37,17 @@ connection to the host itself.
 .SH KEYSERVER CHECKING
 
 The proxy command has a fairly nuanced policy for when keyservers are
 .SH KEYSERVER CHECKING
 
 The proxy command has a fairly nuanced policy for when keyservers are

-queried when processing host.  If the host userID is not found in
+queried when processing a host.  If the host userID is not found in

 either the user's keyring or in the known_hosts file, then the
 keyserver is queried for the host userID.  If the host userID is found
 in the user's keyring, then the keyserver is not checked.  This
 either the user's keyring or in the known_hosts file, then the
 keyserver is queried for the host userID.  If the host userID is found
 in the user's keyring, then the keyserver is not checked.  This

-assumes that the keyring is kept up-to-date, in a cron job or the
-like, so that revocations are properly handled.  If the host userID is
-not found in the user's keyring, but the host is listed in the
-known_hosts file, then the keyserver is not checked.  This last policy
-might change in the future, possibly by adding a deferred check, so
-that hosts that go from non-monkeysphere-enabled to
-monkeysphere-enabled will be properly checked.
+assumes that the keyring is kept up-to-date, in a cronjob or the like,
+so that revocations are properly handled.  If the host userID is not
+found in the user's keyring, but the host is listed in the known_hosts
+file, then the keyserver is not checked.  This last policy might
+change in the future, possibly by adding a deferred check, so that
+hosts that go from non-monkeysphere-enabled to monkeysphere-enabled
+will be properly checked.

 
 .SH ENVIRONMENT VARIABLES
 
 
 .SH ENVIRONMENT VARIABLES
 


@@ -66,6 +66,7 @@ Written by Jameson Rollins <jrollins@fifthhorseman.net>
 .SH SEE ALSO
 
 .BR monkeysphere (1),
 .SH SEE ALSO
 
 .BR monkeysphere (1),

+.BR monkeysphere (7),

 .BR ssh (1),
 .BR ssh_config (5),
 .BR netcat (1),
 .BR ssh (1),
 .BR ssh_config (5),
 .BR netcat (1),