2 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c941fb892..eb10e1059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,9 @@
      [ssh.1 sshd.8]
      Document the correct permissions for the ~/.ssh/ directory.
      ok jmc
+   - djm@cvs.openbsd.org 2008/02/10 09:55:37
+     [sshd_config.5]
+     mantion that "internal-sftp" is useful with ForceCommand too
 
 20080119
  - (djm) Silence noice from expr in ssh-copy-id; patch from
@@ -3603,4 +3606,4 @@
    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.4835 2008/02/10 11:46:22 djm Exp $
+$Id: ChangeLog,v 1.4836 2008/02/10 11:47:24 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 6fb93a078..2d9126ee4 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.81 2008/02/09 08:04:31 jmc Exp $
-.Dd $Mdocdate: February 9 2008 $
+.\" $OpenBSD: sshd_config.5,v 1.82 2008/02/10 09:55:37 djm Exp $
+.Dd $Mdocdate: February 10 2008 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -333,6 +333,11 @@ block.
 The command originally supplied by the client is available in the
 .Ev SSH_ORIGINAL_COMMAND
 environment variable.
+Specifying a command of
+.Dq internal-sftp
+will force the use of an in-process sftp server that requires no support
+files when used with
+.Cm ChrootDirectory .
 .It Cm GatewayPorts
 Specifies whether remote hosts are allowed to connect to ports
 forwarded for the client.