2 files changed, 11 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 0e20e59a3..e857f566c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,9 @@
    - jmc@cvs.openbsd.org 2006/02/13 10:21:25
      [sshd.8]
      small tweaks for the ssh_known_hosts section;
+   - jmc@cvs.openbsd.org 2006/02/13 11:02:26
+     [sshd.8]
+     turn this into an example ssh_known_hosts file; ok djm
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3998,4 +4001,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4166 2006/03/15 00:32:42 djm Exp $
+$Id: ChangeLog,v 1.4167 2006/03/15 00:33:00 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 1db605c6a..d5f48085e 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.220 2006/02/13 10:21:25 jmc Exp $
+.\" $OpenBSD: sshd.8,v 1.221 2006/02/13 11:02:26 jmc Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -576,12 +576,12 @@ Rather, generate them by a script
 or by taking
 .Pa /etc/ssh/ssh_host_key.pub
 and adding the host names at the front.
-.Ss Examples
-.Bd -literal
-closenet,...,130.233.208.41 1024 37 159...93 closenet.hut.fi
-cvs.openbsd.org,199.185.137.3 ssh-rsa AAAA1234.....=
-.Ed
-.Bd -literal
+.Pp
+An example ssh_known_hosts file:
+.Bd -literal -offset 3n
+# Comments allowed at start of line
+closenet,...,192.0.2.53 1024 37 159...93 closenet.example.net
+cvs.example.net,192.0.2.10 ssh-rsa AAAA1234.....=
 # A hashed hostname
 |1|JfKTdBh7rNbXkVAQCRp4OQoPfmI=|USECr3SWf1JUPsms5AqfD5QfxkM= ssh-rsa
 AAAA1234.....=