3 files changed, 5 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c4323d337..8e7e2995b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
      some ClientAlive cleanup; ok markus@
  - (djm) Convert mandoc manpages to man automatically. Patch from Mark D.
    Roth <roth+openssh@feep.net>
+ - (bal) CVS ID fix up and slight manpage fix from OpenBSD tree.
 
 20010415
  - OpenBSD CVS Sync
@@ -5103,4 +5104,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1122 2001/04/16 02:03:49 mouring Exp $
+$Id: ChangeLog,v 1.1123 2001/04/16 02:11:52 mouring Exp $
diff --git a/sshd.8 b/sshd.8
index e8af65a8c..f2a529dd5 100644
--- a/sshd.8
+++ b/sshd.8
@@ -34,7 +34,7 @@
 .\" (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.8,v 1.116 2001/04/15 19:41:21 stevesk Exp $
+.\" $OpenBSD: sshd.8,v 1.118 2001/04/15 21:41:29 deraadt Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -683,7 +683,7 @@ and
 .Dq 2 .
 Multiple versions must be comma-separated.
 The default is
-.Dq 1 .
+.Dq 2,1 .
 .It Cm PubkeyAuthentication
 Specifies whether public key authentication is allowed.
 The default is
diff --git a/sshd_config b/sshd_config
index c131a5868..fda1456e6 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-#       $OpenBSD: sshd_config,v 1.36 2001/04/12 19:15:26 markus Exp $
+#       $OpenBSD: sshd_config,v 1.38 2001/04/15 21:41:29 deraadt Exp $
 
 # This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin