From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 2 Mar 2009 19:39:21 +0000 (-0500)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.24~13^2
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=47456afe7d13f6c58b535082b62e888d8e4dc4cb;hp=d86b79c54bca47211511fc18f3d626cf3b30fcb1;p=monkeysphere.git

Merge commit 'jrollins/master'
---

diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8
index c03b675..3e01105 100644
--- a/man/man8/monkeysphere-host.8
+++ b/man/man8/monkeysphere-host.8
@@ -91,7 +91,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'.