Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 8 insertions, 8 deletions

diff --git a/sftp-server.0 b/sftp-server.0
index fc57814f5..dad6bda73 100644
--- a/sftp-server.0
+++ b/sftp-server.0
@@ -1,4 +1,4 @@
-SFTP-SERVER(8)            BSD System ManagerM-bM-^@M-^Ys Manual           SFTP-SERVER(8)
+SFTP-SERVER(8)          OpenBSD System Manager's Manual         SFTP-SERVER(8)
 
 NAME
      sftp-server - SFTP server subsystem
@@ -8,20 +8,20 @@ SYNOPSIS
 
 DESCRIPTION
      sftp-server is a program that speaks the server side of SFTP protocol to
-     stdout and expects client requests from stdin.  sftp-server is not
-     intended to be called directly, but from sshd(8) using the Subsystem
-     option.  See sshd(8) for more information.
+     stdout and expects client requests from stdin.  sftp-server is not in-
+     tended to be called directly, but from sshd(8) using the Subsystem op-
+     tion.  See sshd_config(5) for more information.
 
 SEE ALSO
-     sftp(1), ssh(1), sshd(8)
+     sftp(1), ssh(1), sshd_config(5), sshd(8)
 
-     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
+     T. Ylonen, and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
      filexfer-00.txt, January 2001, work in progress material.
 
 AUTHORS
-     Markus Friedl M-bM-^LM-)markus@openbsd.orgM-bM-^LM-*
+     Markus Friedl <markus@openbsd.org>
 
 HISTORY
      sftp-server first appeared in OpenBSD 2.8 .
 
-BSD                             August 30, 2000                            BSD
+OpenBSD 3.4                     August 30, 2000                              1