X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/8918b9060df4bca1e1e61bed903b81d0b40ce2ef..6b0117fd2b2276200404bb7ca63bb937d93239bd:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0e31d7ee..eae2b132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+20051224
+ - (djm) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2005/12/20 21:59:43
+     [ssh.1]
+     merge the sections on protocols 1 and 2 into one section on
+     authentication;
+     feedback djm dtucker
+     ok deraadt markus dtucker
+
 20051220
  - (dtucker) OpenBSD CVS Sync
    - reyk@cvs.openbsd.org 2005/12/13 15:03:02
@@ -19,6 +28,12 @@
    - stevesk@cvs.openbsd.org 2005/12/17 21:13:05
      [ssh_config.5 session.c]
      spelling: fowarding, fowarded
+   - stevesk@cvs.openbsd.org 2005/12/17 21:36:42
+     [ssh_config.5]
+     spelling: intented -> intended
+   - dtucker@cvs.openbsd.org 2005/12/20 04:41:07
+     [ssh.c]
+     exit(255) on error to match description in ssh(1); bz #1137; ok deraadt@
 
 20051219
  - (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac