From: djm <djm>
Date: Sat, 5 Aug 2006 01:34:51 +0000 (+0000)
Subject:    - jmc@cvs.openbsd.org 2006/07/27 08:00:50
X-Git-Tag: V_4_4_P1~119
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/f0817fbb0efcd463b03d28e5b49333dfbd6d04e7

   - jmc@cvs.openbsd.org 2006/07/27 08:00:50
     [ssh_config.5]
     avoid confusing wording in HashKnownHosts:
     originally spotted by alan amesbury;
     ok deraadt
---

diff --git a/ChangeLog b/ChangeLog
index f98418be..ecd9677f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,11 @@
      [ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh.c sshconnect.c]
      [sshconnect1.c sshd.c xmalloc.c]
      move #include <stdlib.h> out of includes.h
+   - jmc@cvs.openbsd.org 2006/07/27 08:00:50
+     [ssh_config.5]
+     avoid confusing wording in HashKnownHosts:
+     originally spotted by alan amesbury;
+     ok deraadt
 
 20060804
  - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
diff --git a/ssh_config.5 b/ssh_config.5
index 55ca5530..20c58934 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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: ssh_config.5,v 1.96 2006/07/11 18:50:48 markus Exp $
+.\" $OpenBSD: ssh_config.5,v 1.97 2006/07/27 08:00:50 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -497,8 +497,9 @@ but they do not reveal identifying information should the file's contents
 be disclosed.
 The default is
 .Dq no .
-Note that hashing of names and addresses will not be retrospectively applied
-to existing known hosts files, but these may be manually hashed using
+Note that existing names and addresses in known hosts files
+will not be converted automatically,
+but may be manually hashed using
 .Xr ssh-keygen 1 .
 .It Cm HostbasedAuthentication
 Specifies whether to try rhosts based authentication with public key