- jmc@cvs.openbsd.org 2005/12/20 21:59:43

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 0e31d7ee0fa7ef9bd1f79ba54cd0b52c1c50692e..eae2b13252e669bbde1b5aa35406b0dcd13f073c 100644 (file)
--- 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