2 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 332dacce3..50cf16d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,13 @@
      [channels.c]
      support SOCKS4A protocol, from dwmw2 AT infradead.org via bz#1482;
      "looks ok" markus@
+   - stevesk@cvs.openbsd.org 2009/01/15 17:38:43
+     [readconf.c]
+     1) use obsolete instead of alias for consistency
+     2) oUserKnownHostsFile not obsolete but oGlobalKnownHostsFile2 is
+        so move the comment.
+     3) reorder so like options are together
+     ok djm@
 
 20090107
  - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5055,5 +5062,5 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5171 2009/01/28 05:24:41 djm Exp $
+$Id: ChangeLog,v 1.5172 2009/01/28 05:27:31 djm Exp $
 
diff --git a/readconf.c b/readconf.c
index ab89e0c05..f63a00c47 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.173 2008/12/09 02:58:16 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.174 2009/01/15 17:38:43 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -172,7 +172,7 @@ static struct {
         { "fallbacktorsh", oDeprecated },
         { "usersh", oDeprecated },
         { "identityfile", oIdentityFile },
-        { "identityfile2", oIdentityFile },                     /* alias */
+        { "identityfile2", oIdentityFile },                     /* obsolete */
         { "identitiesonly", oIdentitiesOnly },
         { "hostname", oHostName },
         { "hostkeyalias", oHostKeyAlias },
@@ -188,8 +188,8 @@ static struct {
         { "host", oHost },
         { "escapechar", oEscapeChar },
         { "globalknownhostsfile", oGlobalKnownHostsFile },
-        { "userknownhostsfile", oUserKnownHostsFile },          /* obsolete */
-        { "globalknownhostsfile2", oGlobalKnownHostsFile2 },
+        { "globalknownhostsfile2", oGlobalKnownHostsFile2 },    /* obsolete */
+        { "userknownhostsfile", oUserKnownHostsFile },
         { "userknownhostsfile2", oUserKnownHostsFile2 },        /* obsolete */
         { "connectionattempts", oConnectionAttempts },
         { "batchmode", oBatchMode },