2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c522ea36..29f4b599a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
      [channels.c channels.h clientloop.c]
      add channel output filter interface.
      ok djm@, suggested by markus@
+   - jmc@cvs.openbsd.org 2005/12/30 16:59:00
+     [sftp.1]
+     do not suggest that interactive authentication will work
+     with the -b flag;
+     based on a diff from john l. scarfone;
+     ok djm
 
 20051229
  - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd
@@ -3562,4 +3568,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4054 2005/12/31 05:22:32 djm Exp $
+$Id: ChangeLog,v 1.4055 2005/12/31 05:22:55 djm Exp $
diff --git a/sftp.1 b/sftp.1
index c89ffc30f..6b500596c 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.61 2005/03/01 17:19:35 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.62 2005/12/30 16:59:00 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -78,7 +78,7 @@ to start in a remote directory.
 The final usage format allows for automated sessions using the
 .Fl b
 option.
-In such cases, it is usually necessary to configure public key authentication
+In such cases, it is necessary to configure non-interactive authentication
 to obviate the need to enter a password at connection time (see
 .Xr sshd 8
 and