- markus@cvs.openbsd.org 2004/06/18 10:55:43

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 637e05dc3bb92b4b3f54b16a74ad4d9abd548e22..4d43bfc21b0420e59fed3af58de0501ed83439a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,10 @@
      [ssh.c]
      delay signal handler setup until we have finished talking to the master.
      allow interrupting of setup (e.g. if master is stuck); ok markus@
+   - markus@cvs.openbsd.org 2004/06/18 10:55:43
+     [ssh.1 ssh.c]
+     trim synopsis for -S, allow -S and -oControlMaster, -MM means 'ask';
+     ok djm
 
 20040617
  - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some